diff --git a/InvenTree/InvenTree/api.py b/InvenTree/InvenTree/api.py
index 2fc85ef653..2d04195d42 100644
--- a/InvenTree/InvenTree/api.py
+++ b/InvenTree/InvenTree/api.py
@@ -7,7 +7,7 @@ from __future__ import unicode_literals
 
 import logging
 
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 from django.http import JsonResponse
 
 from django_filters.rest_framework import DjangoFilterBackend
diff --git a/InvenTree/InvenTree/forms.py b/InvenTree/InvenTree/forms.py
index 79cdf49c3d..52d1c8758f 100644
--- a/InvenTree/InvenTree/forms.py
+++ b/InvenTree/InvenTree/forms.py
@@ -123,6 +123,7 @@ class DeleteForm(forms.Form):
     confirm_delete = forms.BooleanField(
         required=False,
         initial=False,
+        label=_('Confirm delete'),
         help_text=_('Confirm item deletion')
     )
 
@@ -155,6 +156,7 @@ class SetPasswordForm(HelperForm):
                                      required=True,
                                      initial='',
                                      widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
+                                     label=_('Enter password'),
                                      help_text=_('Enter new password'))
 
     confirm_password = forms.CharField(max_length=100,
@@ -162,6 +164,7 @@ class SetPasswordForm(HelperForm):
                                        required=True,
                                        initial='',
                                        widget=forms.PasswordInput(attrs={'autocomplete': 'off'}),
+                                       label=_('Confirm password'),
                                        help_text=_('Confirm new password'))
 
     class Meta:
diff --git a/InvenTree/InvenTree/helpers.py b/InvenTree/InvenTree/helpers.py
index 62e50bd52f..930204c58c 100644
--- a/InvenTree/InvenTree/helpers.py
+++ b/InvenTree/InvenTree/helpers.py
@@ -382,17 +382,17 @@ def extract_serial_numbers(serials, expected_quantity):
                     if a < b:
                         for n in range(a, b + 1):
                             if n in numbers:
-                                errors.append(_('Duplicate serial: {n}'.format(n=n)))
+                                errors.append(_('Duplicate serial: {n}').format(n=n))
                             else:
                                 numbers.append(n)
                     else:
-                        errors.append(_("Invalid group: {g}".format(g=group)))
+                        errors.append(_("Invalid group: {g}").format(g=group))
 
                 except ValueError:
-                    errors.append(_("Invalid group: {g}".format(g=group)))
+                    errors.append(_("Invalid group: {g}").format(g=group))
                     continue
             else:
-                errors.append(_("Invalid group: {g}".format(g=group)))
+                errors.append(_("Invalid group: {g}").format(g=group))
                 continue
 
         else:
@@ -409,7 +409,7 @@ def extract_serial_numbers(serials, expected_quantity):
 
     # The number of extracted serial numbers must match the expected quantity
     if not expected_quantity == len(numbers):
-        raise ValidationError([_("Number of unique serial number ({s}) must match quantity ({q})".format(s=len(numbers), q=expected_quantity))])
+        raise ValidationError([_("Number of unique serial number ({s}) must match quantity ({q})").format(s=len(numbers), q=expected_quantity)])
 
     return numbers
 
diff --git a/InvenTree/InvenTree/validators.py b/InvenTree/InvenTree/validators.py
index 70322df062..f8199ef20b 100644
--- a/InvenTree/InvenTree/validators.py
+++ b/InvenTree/InvenTree/validators.py
@@ -60,7 +60,7 @@ def validate_part_ipn(value):
         match = re.search(pattern, value)
 
         if match is None:
-            raise ValidationError(_('IPN must match regex pattern') + " '{pat}'".format(pat=pattern))
+            raise ValidationError(_('IPN must match regex pattern {pat}').format(pat=pattern))
 
 
 def validate_build_order_reference(value):
diff --git a/InvenTree/build/forms.py b/InvenTree/build/forms.py
index 48be9a0ffa..b947e02887 100644
--- a/InvenTree/build/forms.py
+++ b/InvenTree/build/forms.py
@@ -117,6 +117,7 @@ class BuildOutputDeleteForm(HelperForm):
 
     confirm = forms.BooleanField(
         required=False,
+        label=_('Confirm'),
         help_text=_('Confirm deletion of build output')
     )
 
@@ -138,7 +139,7 @@ class UnallocateBuildForm(HelperForm):
     Form for auto-de-allocation of stock from a build
     """
 
-    confirm = forms.BooleanField(required=False, help_text=_('Confirm unallocation of stock'))
+    confirm = forms.BooleanField(required=False, label=_('Confirm'), help_text=_('Confirm unallocation of stock'))
 
     output_id = forms.IntegerField(
         required=False,
@@ -162,7 +163,7 @@ class UnallocateBuildForm(HelperForm):
 class AutoAllocateForm(HelperForm):
     """ Form for auto-allocation of stock to a build """
 
-    confirm = forms.BooleanField(required=True, help_text=_('Confirm stock allocation'))
+    confirm = forms.BooleanField(required=True, label=_('Confirm'), help_text=_('Confirm stock allocation'))
 
     # Keep track of which build output we are interested in
     output = forms.ModelChoiceField(
@@ -209,15 +210,17 @@ class CompleteBuildOutputForm(HelperForm):
 
     location = forms.ModelChoiceField(
         queryset=StockLocation.objects.all(),
+        label = _('Location'),
         help_text=_('Location of completed parts'),
     )
 
     confirm_incomplete = forms.BooleanField(
         required=False,
+        label=_('Confirm incomplete'),
         help_text=_("Confirm completion with incomplete stock allocation")
     )
 
-    confirm = forms.BooleanField(required=True, help_text=_('Confirm build completion'))
+    confirm = forms.BooleanField(required=True, label=_('Confirm'), help_text=_('Confirm build completion'))
 
     output = forms.ModelChoiceField(
         queryset=StockItem.objects.all(),  # Queryset is narrowed in the view
@@ -237,7 +240,7 @@ class CompleteBuildOutputForm(HelperForm):
 class CancelBuildForm(HelperForm):
     """ Form for cancelling a build """
 
-    confirm_cancel = forms.BooleanField(required=False, help_text=_('Confirm build cancellation'))
+    confirm_cancel = forms.BooleanField(required=False, label=_('Confirm cancel'), help_text=_('Confirm build cancellation'))
 
     class Meta:
         model = Build
@@ -251,7 +254,7 @@ class EditBuildItemForm(HelperForm):
     Form for creating (or editing) a BuildItem object.
     """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, help_text=_('Select quantity of stock to allocate'))
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'), help_text=_('Select quantity of stock to allocate'))
 
     part_id = forms.IntegerField(required=False, widget=forms.HiddenInput())
 
diff --git a/InvenTree/build/migrations/0027_auto_20210403_1210.py b/InvenTree/build/migrations/0027_auto_20210404_2016.py
similarity index 60%
rename from InvenTree/build/migrations/0027_auto_20210403_1210.py
rename to InvenTree/build/migrations/0027_auto_20210404_2016.py
index 4f5947f70e..f4a2c1afde 100644
--- a/InvenTree/build/migrations/0027_auto_20210403_1210.py
+++ b/InvenTree/build/migrations/0027_auto_20210404_2016.py
@@ -1,7 +1,8 @@
-# Generated by Django 3.0.7 on 2021-04-03 12:10
+# Generated by Django 3.0.7 on 2021-04-04 20:16
 
 import InvenTree.models
 from django.conf import settings
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 
@@ -9,8 +10,9 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('stock', '0058_stockitem_packaging'),
         ('users', '0005_owner_model'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('build', '0026_auto_20210216_1539'),
     ]
 
@@ -25,6 +27,11 @@ class Migration(migrations.Migration):
             name='completion_date',
             field=models.DateField(blank=True, null=True, verbose_name='Completion Date'),
         ),
+        migrations.AlterField(
+            model_name='build',
+            name='creation_date',
+            field=models.DateField(auto_now_add=True, verbose_name='Creation Date'),
+        ),
         migrations.AlterField(
             model_name='build',
             name='issued_by',
@@ -35,6 +42,26 @@ class Migration(migrations.Migration):
             name='responsible',
             field=models.ForeignKey(blank=True, help_text='User responsible for this build order', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='builds_responsible', to='users.Owner', verbose_name='Responsible'),
         ),
+        migrations.AlterField(
+            model_name='builditem',
+            name='build',
+            field=models.ForeignKey(help_text='Build to allocate parts', on_delete=django.db.models.deletion.CASCADE, related_name='allocated_stock', to='build.Build', verbose_name='Build'),
+        ),
+        migrations.AlterField(
+            model_name='builditem',
+            name='install_into',
+            field=models.ForeignKey(blank=True, help_text='Destination stock item', limit_choices_to={'is_building': True}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='items_to_install', to='stock.StockItem', verbose_name='Install into'),
+        ),
+        migrations.AlterField(
+            model_name='builditem',
+            name='quantity',
+            field=models.DecimalField(decimal_places=5, default=1, help_text='Stock quantity to allocate to build', max_digits=15, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'),
+        ),
+        migrations.AlterField(
+            model_name='builditem',
+            name='stock_item',
+            field=models.ForeignKey(help_text='Source stock item', limit_choices_to={'belongs_to': None, 'sales_order': None}, on_delete=django.db.models.deletion.CASCADE, related_name='allocations', to='stock.StockItem', verbose_name='Stock Item'),
+        ),
         migrations.AlterField(
             model_name='buildorderattachment',
             name='attachment',
diff --git a/InvenTree/build/models.py b/InvenTree/build/models.py
index ad0149ed48..4ee8de0d73 100644
--- a/InvenTree/build/models.py
+++ b/InvenTree/build/models.py
@@ -216,7 +216,7 @@ class Build(MPTTModel):
         help_text=_('Batch code for this build output')
     )
     
-    creation_date = models.DateField(auto_now_add=True, editable=False)
+    creation_date = models.DateField(auto_now_add=True, editable=False, verbose_name=_('Creation Date'))
     
     target_date = models.DateField(
         null=True, blank=True,
@@ -1020,14 +1020,14 @@ class BuildItem(models.Model):
         try:
             # Allocated part must be in the BOM for the master part
             if self.stock_item.part not in self.build.part.getRequiredParts(recursive=False):
-                errors['stock_item'] = [_("Selected stock item not found in BOM for part '{p}'".format(p=self.build.part.full_name))]
+                errors['stock_item'] = [_("Selected stock item not found in BOM for part '{p}'").format(p=self.build.part.full_name)]
             
             # Allocated quantity cannot exceed available stock quantity
             if self.quantity > self.stock_item.quantity:
-                errors['quantity'] = [_("Allocated quantity ({n}) must not exceed available quantity ({q})".format(
+                errors['quantity'] = [_("Allocated quantity ({n}) must not exceed available quantity ({q})").format(
                     n=normalize(self.quantity),
                     q=normalize(self.stock_item.quantity)
-                ))]
+                )]
 
             # Allocated quantity cannot cause the stock item to be over-allocated
             if self.stock_item.quantity - self.stock_item.allocation_count() + self.quantity < self.quantity:
@@ -1079,6 +1079,7 @@ class BuildItem(models.Model):
         Build,
         on_delete=models.CASCADE,
         related_name='allocated_stock',
+        verbose_name=_('Build'),
         help_text=_('Build to allocate parts')
     )
 
@@ -1086,6 +1087,7 @@ class BuildItem(models.Model):
         'stock.StockItem',
         on_delete=models.CASCADE,
         related_name='allocations',
+        verbose_name=_('Stock Item'),
         help_text=_('Source stock item'),
         limit_choices_to={
             'sales_order': None,
@@ -1098,6 +1100,7 @@ class BuildItem(models.Model):
         max_digits=15,
         default=1,
         validators=[MinValueValidator(0)],
+        verbose_name=_('Quantity'),
         help_text=_('Stock quantity to allocate to build')
     )
 
@@ -1106,6 +1109,7 @@ class BuildItem(models.Model):
         on_delete=models.SET_NULL,
         blank=True, null=True,
         related_name='items_to_install',
+        verbose_name=_('Install into'),
         help_text=_('Destination stock item'),
         limit_choices_to={
             'is_building': True,
diff --git a/InvenTree/company/migrations/0032_auto_20210403_1210.py b/InvenTree/company/migrations/0032_auto_20210403_1837.py
similarity index 61%
rename from InvenTree/company/migrations/0032_auto_20210403_1210.py
rename to InvenTree/company/migrations/0032_auto_20210403_1837.py
index e3572eb3b6..41b6977d31 100644
--- a/InvenTree/company/migrations/0032_auto_20210403_1210.py
+++ b/InvenTree/company/migrations/0032_auto_20210403_1837.py
@@ -1,7 +1,12 @@
-# Generated by Django 3.0.7 on 2021-04-03 12:10
+# Generated by Django 3.0.7 on 2021-04-03 18:37
 
+import InvenTree.fields
+import company.models
 import django.core.validators
 from django.db import migrations, models
+import django.db.models.deletion
+import markdownx.models
+import stdimage.models
 
 
 class Migration(migrations.Migration):
@@ -11,6 +16,11 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name='company',
+            name='image',
+            field=stdimage.models.StdImageField(blank=True, null=True, upload_to=company.models.rename_company_image, verbose_name='Image'),
+        ),
         migrations.AlterField(
             model_name='company',
             name='is_customer',
@@ -26,6 +36,16 @@ class Migration(migrations.Migration):
             name='is_supplier',
             field=models.BooleanField(default=True, help_text='Do you purchase items from this company?', verbose_name='is supplier'),
         ),
+        migrations.AlterField(
+            model_name='company',
+            name='link',
+            field=InvenTree.fields.InvenTreeURLField(blank=True, help_text='Link to external company information', verbose_name='Link'),
+        ),
+        migrations.AlterField(
+            model_name='company',
+            name='notes',
+            field=markdownx.models.MarkdownxField(blank=True, verbose_name='Notes'),
+        ),
         migrations.AlterField(
             model_name='supplierpart',
             name='base_cost',
@@ -41,4 +61,9 @@ class Migration(migrations.Migration):
             name='packaging',
             field=models.CharField(blank=True, help_text='Part packaging', max_length=50, null=True, verbose_name='Packaging'),
         ),
+        migrations.AlterField(
+            model_name='supplierpricebreak',
+            name='part',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='pricebreaks', to='company.SupplierPart', verbose_name='Part'),
+        ),
     ]
diff --git a/InvenTree/company/models.py b/InvenTree/company/models.py
index e05d81a16a..17091dcbc3 100644
--- a/InvenTree/company/models.py
+++ b/InvenTree/company/models.py
@@ -114,7 +114,7 @@ class Company(models.Model):
                                verbose_name=_('Contact'),
                                blank=True, help_text=_('Point of contact'))
 
-    link = InvenTreeURLField(blank=True, help_text=_('Link to external company information'))
+    link = InvenTreeURLField(blank=True, verbose_name=_('Link'), help_text=_('Link to external company information'))
 
     image = StdImageField(
         upload_to=rename_company_image,
@@ -122,9 +122,10 @@ class Company(models.Model):
         blank=True,
         variations={'thumbnail': (128, 128)},
         delete_orphans=True,
+        verbose_name=_('Image'),
     )
 
-    notes = MarkdownxField(blank=True)
+    notes = MarkdownxField(blank=True, verbose_name=_('Notes'))
 
     is_customer = models.BooleanField(default=False, verbose_name=_('is customer'), help_text=_('Do you sell items to this company?'))
 
@@ -366,11 +367,11 @@ class SupplierPart(models.Model):
         help_text=_('Notes')
     )
 
-    base_cost = models.DecimalField(max_digits=10, decimal_places=3, default=0, validators=[MinValueValidator(0)], verbose_name=('base cost'), help_text=_('Minimum charge (e.g. stocking fee)'))
+    base_cost = models.DecimalField(max_digits=10, decimal_places=3, default=0, validators=[MinValueValidator(0)], verbose_name=_('base cost'), help_text=_('Minimum charge (e.g. stocking fee)'))
 
     packaging = models.CharField(max_length=50, blank=True, null=True, verbose_name=_('Packaging'), help_text=_('Part packaging'))
     
-    multiple = models.PositiveIntegerField(default=1, validators=[MinValueValidator(1)], verbose_name=_('multiple'), help_text=('Order multiple'))
+    multiple = models.PositiveIntegerField(default=1, validators=[MinValueValidator(1)], verbose_name=_('multiple'), help_text=_('Order multiple'))
 
     # TODO - Reimplement lead-time as a charfield with special validation (pattern matching).
     # lead_time = models.DurationField(blank=True, null=True)
@@ -530,7 +531,7 @@ class SupplierPriceBreak(common.models.PriceBreak):
         currency: Reference to the currency of this pricebreak (leave empty for base currency)
     """
 
-    part = models.ForeignKey(SupplierPart, on_delete=models.CASCADE, related_name='pricebreaks')
+    part = models.ForeignKey(SupplierPart, on_delete=models.CASCADE, related_name='pricebreaks', verbose_name=_('Part'),)
 
     class Meta:
         unique_together = ("part", "quantity")
diff --git a/InvenTree/company/templates/company/delete.html b/InvenTree/company/templates/company/delete.html
index 191e07c2f3..3236a7a58d 100644
--- a/InvenTree/company/templates/company/delete.html
+++ b/InvenTree/company/templates/company/delete.html
@@ -1,14 +1,16 @@
 {% extends "modal_delete_form.html" %}
 
+{% load i18n %}
+
 {% block pre_form_content %}
 
-Are you sure you want to delete company '{{ company.name }}'?
+{% blocktrans with company.name as name %}Are you sure you want to delete company '{{ name }}'?{% endblocktrans %}
 
 <br>
 
 {% if company.supplied_part_count > 0 %}
-<p>There are {{ company.supplied_part_count }} parts sourced from this company.<br>
-If this supplier is deleted, these supplier part entries will also be deleted.</p>
+<p>{% blocktrans with company.supplied_part_count as count %}There are {{ count }} parts sourced from this company.<br>
+If this supplier is deleted, these supplier part entries will also be deleted.{% endblocktrans %}</p>
 <ul class='list-group'>
 {% for part in company.parts.all %}
 <li class='list-group-item'><b>{{ part.SKU }}</b> - <i>{{ part.part.full_name }}</i></li>
diff --git a/InvenTree/company/templates/company/detail_part.html b/InvenTree/company/templates/company/detail_part.html
index b12322353a..05aaf78955 100644
--- a/InvenTree/company/templates/company/detail_part.html
+++ b/InvenTree/company/templates/company/detail_part.html
@@ -15,7 +15,7 @@
 {% if roles.purchase_order.change %}
 <div id='button-toolbar'>
     <div class='button-toolbar container-fluid'>
-        <div class='btn-group role='group'>
+        <div class='btn-group' role='group'>
             {% if roles.purchase_order.add %}
             <button class="btn btn-success" id='part-create' title='{% trans "Create new supplier part" %}'>
                 <span class='fas fa-plus-circle'></span> {% trans "New Supplier Part" %}
diff --git a/InvenTree/label/models.py b/InvenTree/label/models.py
index 0c6a108f31..c76b3f80c8 100644
--- a/InvenTree/label/models.py
+++ b/InvenTree/label/models.py
@@ -126,7 +126,7 @@ class LabelTemplate(models.Model):
 
     width = models.FloatField(
         default=50,
-        verbose_name=('Width [mm]'),
+        verbose_name=_('Width [mm]'),
         help_text=_('Label width, specified in mm'),
         validators=[MinValueValidator(2)]
     )
diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index ced6299586..fef729ffa5 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -6,9 +6,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-03 02:10+0000\n"
+"POT-Creation-Date: 2021-04-04 20:22+0000\n"
 "PO-Revision-Date: 2021-03-28 17:47+0200\n"
-"Last-Translator: Andreas Kaiser <kaiser.vocote@gmail.com>, Matthias MAIR<matmair@live.de>\n"
+"Last-Translator: Andreas Kaiser <kaiser.vocote@gmail.com>, Matthias "
+"MAIR<matmair@live.de>\n"
 "Language-Team: C <kde-i18n-doc@kde.org>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
@@ -33,32 +34,51 @@ msgstr "Keine passende Aktion gefunden"
 msgid "Enter date"
 msgstr "Datum eingeben"
 
-#: InvenTree/forms.py:110 build/forms.py:99 build/forms.py:187
+#: InvenTree/forms.py:110 build/forms.py:99 build/forms.py:120
+#: build/forms.py:142 build/forms.py:166 build/forms.py:188 build/forms.py:223
+#: order/forms.py:27 order/forms.py:38 order/forms.py:49 order/forms.py:60
+#: order/forms.py:71 part/forms.py:132
 msgid "Confirm"
 msgstr "Bestätigen"
 
 #: InvenTree/forms.py:126
+#, fuzzy
+#| msgid "Confirm item deletion"
+msgid "Confirm delete"
+msgstr "Löschung von Position bestätigen"
+
+#: InvenTree/forms.py:127
 msgid "Confirm item deletion"
 msgstr "Löschung von Position bestätigen"
 
-#: InvenTree/forms.py:158
+#: InvenTree/forms.py:159 templates/registration/login.html:76
+msgid "Enter password"
+msgstr "Passwort eingeben"
+
+#: InvenTree/forms.py:160
 msgid "Enter new password"
 msgstr "Neues Passwort eingeben"
 
-#: InvenTree/forms.py:165
+#: InvenTree/forms.py:167
+#, fuzzy
+#| msgid "Confirm new password"
+msgid "Confirm password"
+msgstr "Neues Passwort bestätigen"
+
+#: InvenTree/forms.py:168
 msgid "Confirm new password"
 msgstr "Neues Passwort bestätigen"
 
-#: InvenTree/forms.py:200
+#: InvenTree/forms.py:203
 msgid "Apply Theme"
 msgstr "Thema anwenden"
 
-#: InvenTree/forms.py:230
+#: InvenTree/forms.py:233
 msgid "Select Category"
 msgstr "Kategorie auswählen"
 
-#: InvenTree/helpers.py:361 order/models.py:242 order/models.py:341
-#: stock/views.py:1762
+#: InvenTree/helpers.py:361 order/models.py:245 order/models.py:344
+#: stock/views.py:1763
 msgid "Invalid quantity provided"
 msgstr "Keine gültige Menge"
 
@@ -92,7 +112,7 @@ msgstr ""
 "Anzahl der eindeutigen Seriennummern ({s}) muss mit der Anzahl ({q}) "
 "übereinstimmen"
 
-#: InvenTree/models.py:59 stock/models.py:1657
+#: InvenTree/models.py:59 stock/models.py:1659
 msgid "Attachment"
 msgstr "Anhang"
 
@@ -108,7 +128,7 @@ msgstr "Kommentar"
 msgid "File comment"
 msgstr "Datei-Kommentar"
 
-#: InvenTree/models.py:68 InvenTree/models.py:69
+#: InvenTree/models.py:68 InvenTree/models.py:69 part/models.py:1888
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:960
 msgid "User"
@@ -119,20 +139,21 @@ msgid "upload date"
 msgstr "Hochladedatum"
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:101
-#: part/models.py:686 part/templates/part/params.html:27 report/models.py:179
-#: templates/InvenTree/search.html:136 templates/InvenTree/search.html:273
-#: templates/js/part.js:109
+#: part/models.py:686 part/models.py:2029 part/templates/part/params.html:27
+#: report/models.py:179 templates/InvenTree/search.html:136
+#: templates/InvenTree/search.html:273 templates/js/part.js:109
 msgid "Name"
 msgstr "Name"
 
 #: InvenTree/models.py:114 build/models.py:134
-#: build/templates/build/detail.html:21 company/models.py:359
+#: build/templates/build/detail.html:21 company/models.py:361
 #: company/templates/company/detail.html:26
 #: company/templates/company/supplier_part_base.html:70
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:108
-#: order/templates/order/purchase_order_detail.html:168 part/models.py:710
-#: part/templates/part/detail.html:54 part/templates/part/set_category.html:14
-#: report/models.py:192
+#: order/models.py:101 order/templates/order/purchase_order_detail.html:168
+#: part/models.py:710 part/templates/part/detail.html:54
+#: part/templates/part/set_category.html:14 report/models.py:192
+#: report/models.py:505 report/models.py:544
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:143 templates/InvenTree/search.html:208
 #: templates/InvenTree/search.html:280
@@ -247,7 +268,9 @@ msgid "Invalid character in part name"
 msgstr "Ungültiger Buchstabe im Teilenamen"
 
 #: InvenTree/validators.py:63
-msgid "IPN must match regex pattern"
+#, fuzzy, python-brace-format
+#| msgid "IPN must match regex pattern"
+msgid "IPN must match regex pattern {pat}"
 msgstr "IPN muss zu Regex-Muster passen"
 
 #: InvenTree/validators.py:77 InvenTree/validators.py:91
@@ -345,7 +368,7 @@ msgid "Order target date"
 msgstr "geplantes Bestelldatum"
 
 #: build/forms.py:39 build/templates/build/build_base.html:104
-#: build/templates/build/detail.html:121
+#: build/templates/build/detail.html:121 order/forms.py:109 order/forms.py:144
 #: order/templates/order/order_base.html:124
 #: order/templates/order/sales_order_base.html:117
 #: report/templates/report/inventree_build_order_base.html:126
@@ -359,15 +382,20 @@ msgid ""
 "Target date for build completion. Build will be overdue after this date."
 msgstr "Zieldatum für Bauauftrag-Fertigstellung."
 
-#: build/forms.py:45 build/forms.py:87
+#: build/forms.py:45 build/forms.py:87 build/forms.py:257 build/models.py:1103
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:91
 #: build/templates/build/detail.html:31 common/models.py:696
 #: company/forms.py:131 company/templates/company/supplier_part_pricing.html:77
-#: order/forms.py:237 order/templates/order/order_wizard/select_parts.html:32
+#: order/forms.py:188 order/forms.py:205 order/forms.py:239 order/forms.py:261
+#: order/forms.py:278 order/models.py:593 order/models.py:784
+#: order/templates/order/order_wizard/select_parts.html:32
 #: order/templates/order/purchase_order_detail.html:193
+#: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:159
+#: order/templates/order/sales_order_detail.html:224 part/forms.py:340
+#: part/forms.py:369 part/forms.py:385 part/models.py:2158
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
 #: part/templates/part/part_pricing.html:12
@@ -377,7 +405,8 @@ msgstr "Zieldatum für Bauauftrag-Fertigstellung."
 #: report/templates/report/inventree_po_report.html:91
 #: report/templates/report/inventree_so_report.html:91
 #: report/templates/report/inventree_test_report_base.html:77
-#: stock/forms.py:307 stock/templates/stock/item_base.html:51
+#: stock/forms.py:175 stock/forms.py:308 stock/models.py:1563
+#: stock/templates/stock/item_base.html:51
 #: stock/templates/stock/item_base.html:57
 #: stock/templates/stock/item_base.html:240
 #: stock/templates/stock/stock_adjust.html:18 templates/js/barcode.js:364
@@ -394,7 +423,7 @@ msgstr "Anzahl der zu bauenden Teile"
 msgid "Enter quantity for build output"
 msgstr "Menge für den Bau-Ausgabe angeben"
 
-#: build/forms.py:92 order/forms.py:231 stock/forms.py:117
+#: build/forms.py:92 order/forms.py:233 stock/forms.py:118
 msgid "Serial Numbers"
 msgstr "Seriennummer"
 
@@ -406,39 +435,61 @@ msgstr "Seriennummer für dieses hergestelltes Teil eingeben"
 msgid "Confirm creation of build output"
 msgstr "Anlage Baufertigstellung bestätigen"
 
-#: build/forms.py:120
+#: build/forms.py:121
 msgid "Confirm deletion of build output"
 msgstr "Löschen des Endprodukt bestätigen"
 
-#: build/forms.py:141
+#: build/forms.py:142
 msgid "Confirm unallocation of stock"
 msgstr "Aufhebung der BestandsZuordnung bestätigen"
 
-#: build/forms.py:165
+#: build/forms.py:166
 msgid "Confirm stock allocation"
 msgstr "Bestandszuordnung bestätigen"
 
-#: build/forms.py:188
+#: build/forms.py:189
 msgid "Mark build as complete"
 msgstr "Bau als vollständig markieren"
 
-#: build/forms.py:212
+#: build/forms.py:213 build/templates/build/auto_allocate.html:18
+#: order/forms.py:82 stock/forms.py:347
+#: stock/templates/stock/item_base.html:270
+#: stock/templates/stock/stock_adjust.html:17
+#: templates/InvenTree/search.html:244 templates/js/barcode.js:363
+#: templates/js/barcode.js:531 templates/js/build.js:434
+#: templates/js/stock.js:637
+msgid "Location"
+msgstr "Lagerort"
+
+#: build/forms.py:214
 msgid "Location of completed parts"
 msgstr "Lagerort der fertigen Teile"
 
-#: build/forms.py:217
+#: build/forms.py:219
+#, fuzzy
+#| msgid "Confirm build completion"
+msgid "Confirm incomplete"
+msgstr "Bau-Fertigstellung bestätigen"
+
+#: build/forms.py:220
 msgid "Confirm completion with incomplete stock allocation"
 msgstr "Fertigstellung mit nicht kompletter Bestandszuordnung bestätigen"
 
-#: build/forms.py:220
+#: build/forms.py:223
 msgid "Confirm build completion"
 msgstr "Bau-Fertigstellung bestätigen"
 
-#: build/forms.py:240 build/views.py:66
+#: build/forms.py:243
+#, fuzzy
+#| msgid "Confirm build cancellation"
+msgid "Confirm cancel"
+msgstr "Bauabbruch bestätigen"
+
+#: build/forms.py:243 build/views.py:66
 msgid "Confirm build cancellation"
 msgstr "Bauabbruch bestätigen"
 
-#: build/forms.py:254
+#: build/forms.py:257
 msgid "Select quantity of stock to allocate"
 msgstr "Menge der BestandsObjekt für Zuordnung auswählen"
 
@@ -463,7 +514,9 @@ msgstr "Bauaufträge"
 msgid "Build Order Reference"
 msgstr "Bauauftragsreferenz"
 
-#: build/models.py:127 order/templates/order/purchase_order_detail.html:188
+#: build/models.py:127 order/models.py:99 order/models.py:595
+#: order/templates/order/purchase_order_detail.html:188
+#: order/templates/order/sales_order_detail.html:219 part/models.py:2167
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:509 templates/js/build.js:948
@@ -485,11 +538,15 @@ msgstr "Bauauftrag, zu dem dieser Bau zugwiesen ist"
 
 #: build/models.py:152 build/templates/build/auto_allocate.html:16
 #: build/templates/build/build_base.html:86
-#: build/templates/build/detail.html:26 order/models.py:662
+#: build/templates/build/detail.html:26 company/models.py:535
+#: order/models.py:637 order/models.py:669
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:156
-#: order/templates/order/receive_parts.html:19 part/models.py:321
-#: part/models.py:2054 part/templates/part/part_app_base.html:7
+#: order/templates/order/receive_parts.html:19
+#: order/templates/order/sales_order_detail.html:207 part/models.py:321
+#: part/models.py:1856 part/models.py:1868 part/models.py:1886
+#: part/models.py:1961 part/models.py:2057 part/models.py:2142
+#: part/templates/part/part_app_base.html:7
 #: part/templates/part/part_pricing.html:15 part/templates/part/related.html:29
 #: part/templates/part/set_category.html:13
 #: part/templates/part/subcategories.html:17
@@ -561,7 +618,7 @@ msgstr "Bau-Status"
 msgid "Build status code"
 msgstr "Bau-Statuscode"
 
-#: build/models.py:212 stock/models.py:429
+#: build/models.py:212 stock/models.py:430
 msgid "Batch Code"
 msgstr "Losnummer"
 
@@ -569,11 +626,16 @@ msgstr "Losnummer"
 msgid "Batch code for this build output"
 msgstr "Losnummer für dieses Endprodukt"
 
-#: build/models.py:223 order/models.py:447
+#: build/models.py:219 order/models.py:105 part/models.py:882
+#: part/templates/part/detail.html:126 templates/js/order.js:293
+msgid "Creation Date"
+msgstr "Erstelldatum"
+
+#: build/models.py:223 order/models.py:451
 msgid "Target completion date"
 msgstr "geplantes Fertigstellungsdatum"
 
-#: build/models.py:227 order/models.py:215
+#: build/models.py:227 order/models.py:218
 msgid "Completion Date"
 msgstr "Fertigstellungsdatum"
 
@@ -590,9 +652,9 @@ msgid "User who issued this build order"
 msgstr "Nutzer der diesen Bauauftrag erstellt hat"
 
 #: build/models.py:250 build/templates/build/build_base.html:142
-#: build/templates/build/detail.html:105 order/models.py:118
+#: build/templates/build/detail.html:105 order/models.py:119
 #: order/templates/order/order_base.html:138
-#: order/templates/order/sales_order_base.html:138 part/models.py:885
+#: order/templates/order/sales_order_base.html:138 part/models.py:886
 #: report/templates/report/inventree_build_order_base.html:159
 msgid "Responsible"
 msgstr "Verantwortlicher Benutzer"
@@ -605,26 +667,28 @@ msgstr "Nutzer der für diesen Bauauftrag zuständig ist"
 #: company/templates/company/supplier_part_base.html:77
 #: company/templates/company/supplier_part_detail.html:28
 #: part/templates/part/detail.html:83 part/templates/part/part_base.html:100
-#: stock/models.py:423 stock/templates/stock/item_base.html:330
+#: stock/models.py:424 stock/templates/stock/item_base.html:330
 msgid "External Link"
 msgstr "Externer Link"
 
-#: build/models.py:257 part/models.py:744 stock/models.py:425
+#: build/models.py:257 part/models.py:744 stock/models.py:426
 msgid "Link to external URL"
 msgstr "Link zu einer externen URL"
 
 #: build/models.py:261 build/templates/build/navbar.html:59
-#: company/models.py:366 company/templates/company/navbar.html:59
-#: company/templates/company/navbar.html:62
-#: order/templates/order/po_navbar.html:29
+#: company/models.py:129 company/models.py:368
+#: company/templates/company/navbar.html:59
+#: company/templates/company/navbar.html:62 order/models.py:123
+#: order/models.py:597 order/templates/order/po_navbar.html:29
 #: order/templates/order/po_navbar.html:32
 #: order/templates/order/purchase_order_detail.html:227
+#: order/templates/order/sales_order_detail.html:264
 #: order/templates/order/so_navbar.html:33
-#: order/templates/order/so_navbar.html:36 part/models.py:870
+#: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:122
 #: report/templates/report/inventree_build_order_base.html:173
-#: stock/forms.py:316 stock/forms.py:348 stock/forms.py:376 stock/models.py:495
-#: stock/models.py:1553 stock/models.py:1663
+#: stock/forms.py:173 stock/forms.py:317 stock/forms.py:349 stock/forms.py:377
+#: stock/models.py:496 stock/models.py:1555 stock/models.py:1665
 #: stock/templates/stock/navbar.html:57 templates/js/barcode.js:37
 #: templates/js/bom.js:329 templates/js/stock.js:128 templates/js/stock.js:667
 msgid "Notes"
@@ -672,11 +736,11 @@ msgstr ""
 "Reserviermenge ({n}) muss kleiner Bestandsmenge ({q}) sein. Zugewiesene "
 "Anzahl ({n}) darf nicht die verfügbare ({q}) Anzahl überschreiten"
 
-#: build/models.py:1034 order/models.py:751
+#: build/models.py:1034 order/models.py:758
 msgid "StockItem is over-allocated"
 msgstr "Zu viele BestandsObjekt zugewiesen"
 
-#: build/models.py:1038 order/models.py:754
+#: build/models.py:1038 order/models.py:761
 msgid "Allocation quantity must be greater than zero"
 msgstr "Reserviermenge muss größer null sein"
 
@@ -684,19 +748,43 @@ msgstr "Reserviermenge muss größer null sein"
 msgid "Quantity must be 1 for serialized stock"
 msgstr "Anzahl muss 1 für Objekte mit Seriennummer sein"
 
-#: build/models.py:1082
+#: build/models.py:1082 stock/templates/stock/item_base.html:302
+#: templates/InvenTree/search.html:167 templates/js/build.js:655
+#: templates/navbar.html:29
+msgid "Build"
+msgstr "Bauauftrag"
+
+#: build/models.py:1083
 msgid "Build to allocate parts"
 msgstr "Bau starten um Teile zuzuweisen"
 
-#: build/models.py:1089
+#: build/models.py:1090 part/templates/part/allocation.html:18
+#: part/templates/part/allocation.html:24
+#: part/templates/part/allocation.html:31
+#: part/templates/part/allocation.html:49
+#: stock/templates/stock/item_base.html:8
+#: stock/templates/stock/item_base.html:89
+#: stock/templates/stock/item_base.html:324
+#: stock/templates/stock/stock_adjust.html:16 templates/js/build.js:771
+#: templates/js/stock.js:923 templates/js/stock.js:1181
+msgid "Stock Item"
+msgstr "BestandsObjekt"
+
+#: build/models.py:1091
 msgid "Source stock item"
 msgstr "Quell-BestandsObjekt"
 
-#: build/models.py:1101
+#: build/models.py:1104
 msgid "Stock quantity to allocate to build"
 msgstr "BestandsObjekt-Anzahl dem Bau zuweisen"
 
-#: build/models.py:1109
+#: build/models.py:1112
+#, fuzzy
+#| msgid "Install item"
+msgid "Install into"
+msgstr "Installiere Objekt"
+
+#: build/models.py:1113
 msgid "Destination stock item"
 msgstr "Ziel-BestandsObjekt"
 
@@ -765,15 +853,6 @@ msgid ""
 msgstr ""
 "Die folgenden BestandsObjekte werden den ausgewählten Endprodukten zugeordnet"
 
-#: build/templates/build/auto_allocate.html:18 stock/forms.py:346
-#: stock/templates/stock/item_base.html:270
-#: stock/templates/stock/stock_adjust.html:17
-#: templates/InvenTree/search.html:244 templates/js/barcode.js:363
-#: templates/js/barcode.js:531 templates/js/build.js:434
-#: templates/js/stock.js:637
-msgid "Location"
-msgstr "Lagerort"
-
 #: build/templates/build/auto_allocate.html:37
 msgid "No stock items found that can be automatically allocated to this build"
 msgstr ""
@@ -846,7 +925,7 @@ msgid "Build Details"
 msgstr "Bau-Status"
 
 #: build/templates/build/build_base.html:96
-#: build/templates/build/detail.html:59
+#: build/templates/build/detail.html:59 order/models.py:445
 #: order/templates/order/receive_parts.html:24
 #: stock/templates/stock/item_base.html:376 templates/InvenTree/search.html:236
 #: templates/js/barcode.js:119 templates/js/build.js:710
@@ -865,7 +944,7 @@ msgid "Progress"
 msgstr "Fortschritt"
 
 #: build/templates/build/build_base.html:128
-#: build/templates/build/detail.html:84 order/models.py:660
+#: build/templates/build/detail.html:84 order/models.py:667
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:33
 #: order/templates/order/sales_order_ship.html:25
@@ -979,7 +1058,7 @@ msgstr "Ausgangs-Lager"
 msgid "Stock can be taken from any available location."
 msgstr "Bestand kann jedem verfügbaren Lagerort entnommen werden."
 
-#: build/templates/build/detail.html:46 stock/forms.py:374
+#: build/templates/build/detail.html:46 stock/forms.py:169 stock/forms.py:375
 msgid "Destination"
 msgstr "Ziel"
 
@@ -1115,7 +1194,7 @@ msgstr "Bestand dem Endprodukt zuweisen"
 msgid "Create Build Output"
 msgstr "Endprodukt anlegen"
 
-#: build/views.py:203 stock/models.py:964 stock/views.py:1788
+#: build/views.py:203 stock/models.py:966 stock/views.py:1789
 msgid "Serial numbers already exist"
 msgstr "Seriennummern existieren bereits"
 
@@ -1255,7 +1334,7 @@ msgstr "InvenTree Instanzname"
 msgid "String descriptor for the server instance"
 msgstr "Kurze Beschreibung der Instanz"
 
-#: common/models.py:62 company/models.py:95 company/models.py:96
+#: common/models.py:62 company/models.py:96 company/models.py:97
 msgid "Company name"
 msgstr "Firmenname"
 
@@ -1359,8 +1438,8 @@ msgstr "Aktuelle Teile-Stände"
 msgid "Number of recent parts to display on index page"
 msgstr "Anzahl der neusten Teile auf der Startseite"
 
-#: common/models.py:150 part/models.py:2056 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:258 templates/js/table_filters.js:24
+#: common/models.py:150 part/models.py:2059 part/templates/part/detail.html:160
+#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:24
 #: templates/js/table_filters.js:288
 msgid "Template"
 msgstr "Vorlage"
@@ -1369,7 +1448,7 @@ msgstr "Vorlage"
 msgid "Parts are templates by default"
 msgstr "Teile sind standardmäßig Vorlagen"
 
-#: common/models.py:157 part/models.py:833 part/templates/part/detail.html:170
+#: common/models.py:157 part/models.py:834 part/templates/part/detail.html:170
 #: templates/js/table_filters.js:101 templates/js/table_filters.js:300
 msgid "Assembly"
 msgstr "Baugruppe"
@@ -1378,7 +1457,7 @@ msgstr "Baugruppe"
 msgid "Parts can be assembled from other components by default"
 msgstr "Teile können standardmäßig aus anderen Teilen angefertigt werden"
 
-#: common/models.py:164 part/models.py:839 part/templates/part/detail.html:180
+#: common/models.py:164 part/models.py:840 part/templates/part/detail.html:180
 #: templates/js/table_filters.js:304
 msgid "Component"
 msgstr "Komponente"
@@ -1387,7 +1466,7 @@ msgstr "Komponente"
 msgid "Parts can be used as sub-components by default"
 msgstr "Teile können standardmäßig in Baugruppen benutzt werden"
 
-#: common/models.py:171 part/models.py:850 part/templates/part/detail.html:200
+#: common/models.py:171 part/models.py:851 part/templates/part/detail.html:200
 msgid "Purchaseable"
 msgstr "Kaufbar"
 
@@ -1395,7 +1474,7 @@ msgstr "Kaufbar"
 msgid "Parts are purchaseable by default"
 msgstr "Artikel sind grundsätzlich kaufbar"
 
-#: common/models.py:178 part/models.py:855 part/templates/part/detail.html:210
+#: common/models.py:178 part/models.py:856 part/templates/part/detail.html:210
 #: templates/js/table_filters.js:312
 msgid "Salable"
 msgstr "Verkäuflich"
@@ -1404,7 +1483,7 @@ msgstr "Verkäuflich"
 msgid "Parts are salable by default"
 msgstr "Artikel sind grundsätzlich verkaufbar"
 
-#: common/models.py:185 part/models.py:845 part/templates/part/detail.html:190
+#: common/models.py:185 part/models.py:846 part/templates/part/detail.html:190
 #: templates/js/table_filters.js:32 templates/js/table_filters.js:316
 msgid "Trackable"
 msgstr "nachverfolgbar"
@@ -1413,7 +1492,7 @@ msgstr "nachverfolgbar"
 msgid "Parts are trackable by default"
 msgstr "Artikel sind grundsätzlich verfolgbar"
 
-#: common/models.py:192 part/models.py:865 part/templates/part/detail.html:150
+#: common/models.py:192 part/models.py:866 part/templates/part/detail.html:150
 #: templates/js/table_filters.js:28
 msgid "Virtual"
 msgstr "Virtuell"
@@ -1607,12 +1686,12 @@ msgstr "Angegebener Wert nicht erlaubt"
 msgid "Supplied value must be a boolean"
 msgstr "Angegebener Wert muss ein Wahrheitswert sein"
 
-#: company/forms.py:37 company/models.py:137
+#: company/forms.py:37 company/models.py:139
 #: company/templates/company/detail.html:40
 msgid "Currency"
 msgstr "Währung"
 
-#: company/forms.py:38 company/models.py:139
+#: company/forms.py:38 company/models.py:141
 msgid "Default currency used for this company"
 msgstr "Standard-Währung für diese Firma"
 
@@ -1632,95 +1711,108 @@ msgstr "Einzelpreis"
 msgid "Single quantity price"
 msgstr "Einzelpreis"
 
-#: company/models.py:98
+#: company/models.py:99
 msgid "Company description"
 msgstr "Firmenbeschreibung"
 
-#: company/models.py:98
+#: company/models.py:99
 msgid "Description of the company"
 msgstr "Firmenbeschreibung"
 
-#: company/models.py:100 company/templates/company/company_base.html:70
+#: company/models.py:101 company/templates/company/company_base.html:70
 #: company/templates/company/detail.html:31 templates/js/company.js:60
 msgid "Website"
 msgstr "Website"
 
-#: company/models.py:100
+#: company/models.py:101
 msgid "Company website URL"
 msgstr "Firmenwebsite Adresse/URL"
 
-#: company/models.py:103 company/templates/company/company_base.html:77
+#: company/models.py:104 company/templates/company/company_base.html:77
 msgid "Address"
 msgstr "Adresse"
 
-#: company/models.py:104
+#: company/models.py:105
 msgid "Company address"
 msgstr "Firmenadresse"
 
-#: company/models.py:107
+#: company/models.py:108
 msgid "Phone number"
 msgstr "Kontakt-Tel."
 
-#: company/models.py:108
+#: company/models.py:109
 msgid "Contact phone number"
 msgstr "Kontakt-Telefon"
 
-#: company/models.py:111 company/templates/company/company_base.html:91
+#: company/models.py:112 company/templates/company/company_base.html:91
 msgid "Email"
 msgstr "Email"
 
-#: company/models.py:111
+#: company/models.py:112
 msgid "Contact email address"
 msgstr "Kontakt-Email"
 
-#: company/models.py:114 company/templates/company/company_base.html:98
+#: company/models.py:115 company/templates/company/company_base.html:98
 msgid "Contact"
 msgstr "Kontakt"
 
-#: company/models.py:115
+#: company/models.py:116
 msgid "Point of contact"
 msgstr "Anlaufstelle"
 
-#: company/models.py:117
+#: company/models.py:118 company/models.py:355 order/models.py:103
+#: part/models.py:743
+#: report/templates/report/inventree_build_order_base.html:165
+#: stock/models.py:1557 templates/js/company.js:208 templates/js/part.js:430
+msgid "Link"
+msgstr "Link"
+
+#: company/models.py:118
 msgid "Link to external company information"
 msgstr "Link auf externe Firmeninformation"
 
-#: company/models.py:129
+#: company/models.py:126 part/models.py:753
+#, fuzzy
+#| msgid "Image URL"
+msgid "Image"
+msgstr "Bild-URL"
+
+#: company/models.py:131
 msgid "is customer"
 msgstr "ist Kunde"
 
-#: company/models.py:129
+#: company/models.py:131
 msgid "Do you sell items to this company?"
 msgstr "Verkaufen Sie Teile an diese Firma?"
 
-#: company/models.py:131
+#: company/models.py:133
 msgid "is supplier"
 msgstr "ist Zulieferer"
 
-#: company/models.py:131
+#: company/models.py:133
 msgid "Do you purchase items from this company?"
 msgstr "Kaufen Sie Teile von dieser Firma?"
 
-#: company/models.py:133
+#: company/models.py:135
 msgid "is manufacturer"
 msgstr "ist Hersteller"
 
-#: company/models.py:133
+#: company/models.py:135
 msgid "Does this company manufacture parts?"
 msgstr "Produziert diese Firma Teile?"
 
-#: company/models.py:313 stock/models.py:370
+#: company/models.py:315 stock/models.py:371
 #: stock/templates/stock/item_base.html:220
 msgid "Base Part"
 msgstr "Basisteil"
 
-#: company/models.py:317 order/views.py:1372
+#: company/models.py:319 order/views.py:1372
 msgid "Select part"
 msgstr "Teil auswählen"
 
-#: company/models.py:323 company/templates/company/detail.html:60
+#: company/models.py:325 company/templates/company/detail.html:60
 #: company/templates/company/supplier_part_base.html:83
-#: company/templates/company/supplier_part_detail.html:25
+#: company/templates/company/supplier_part_detail.html:25 order/models.py:190
 #: order/templates/order/order_base.html:92
 #: order/templates/order/order_wizard/select_pos.html:30 part/bom.py:170
 #: stock/templates/stock/item_base.html:337 templates/js/company.js:48
@@ -1728,81 +1820,85 @@ msgstr "Teil auswählen"
 msgid "Supplier"
 msgstr "Zulieferer"
 
-#: company/models.py:324
+#: company/models.py:326
 msgid "Select supplier"
 msgstr "Zulieferer auswählen"
 
-#: company/models.py:329 company/templates/company/supplier_part_base.html:87
+#: company/models.py:331 company/templates/company/supplier_part_base.html:87
 #: company/templates/company/supplier_part_detail.html:26
 #: order/templates/order/purchase_order_detail.html:174 part/bom.py:171
 msgid "SKU"
 msgstr "SKU (Lagerbestandseinheit)"
 
-#: company/models.py:330
+#: company/models.py:332
 msgid "Supplier stock keeping unit"
 msgstr "Lagerbestandseinheit (SKU) des Zulieferers"
 
-#: company/models.py:340 company/templates/company/detail.html:55
+#: company/models.py:342 company/templates/company/detail.html:55
 #: company/templates/company/supplier_part_base.html:93
 #: company/templates/company/supplier_part_detail.html:34 part/bom.py:172
 #: templates/js/company.js:44 templates/js/company.js:188
 msgid "Manufacturer"
 msgstr "Hersteller"
 
-#: company/models.py:341
+#: company/models.py:343
 msgid "Select manufacturer"
 msgstr "Hersteller auswählen"
 
-#: company/models.py:347 company/templates/company/supplier_part_base.html:99
+#: company/models.py:349 company/templates/company/supplier_part_base.html:99
 #: company/templates/company/supplier_part_detail.html:35
 #: order/templates/order/purchase_order_detail.html:183 part/bom.py:173
 #: templates/js/company.js:204
 msgid "MPN"
 msgstr "MPN"
 
-#: company/models.py:348
+#: company/models.py:350
 msgid "Manufacturer part number"
 msgstr "Hersteller-Teilenummer"
 
-#: company/models.py:353 part/models.py:743
-#: report/templates/report/inventree_build_order_base.html:165
-#: stock/models.py:1555 templates/js/company.js:208 templates/js/part.js:430
-msgid "Link"
-msgstr "Link"
-
-#: company/models.py:354
+#: company/models.py:356
 msgid "URL for external supplier part link"
 msgstr "Teil-URL des Zulieferers"
 
-#: company/models.py:360
+#: company/models.py:362
 msgid "Supplier part description"
 msgstr "Zuliefererbeschreibung des Teils"
 
-#: company/models.py:365 company/templates/company/supplier_part_base.html:113
-#: company/templates/company/supplier_part_detail.html:38
+#: company/models.py:367 company/templates/company/supplier_part_base.html:113
+#: company/templates/company/supplier_part_detail.html:38 part/models.py:2170
 #: report/templates/report/inventree_po_report.html:93
 #: report/templates/report/inventree_so_report.html:93
 msgid "Note"
 msgstr "Notiz"
 
-#: company/models.py:369
+#: company/models.py:371
+msgid "base cost"
+msgstr ""
+
+#: company/models.py:371
 msgid "Minimum charge (e.g. stocking fee)"
 msgstr "Mindestpreis"
 
-#: company/models.py:371 company/templates/company/supplier_part_base.html:106
-#: stock/models.py:394 stock/templates/stock/item_base.html:295
+#: company/models.py:373 company/templates/company/supplier_part_base.html:106
+#: stock/models.py:395 stock/templates/stock/item_base.html:295
 #: templates/js/stock.js:663
 msgid "Packaging"
 msgstr "Verpackungen"
 
-#: company/models.py:371
+#: company/models.py:373
 msgid "Part packaging"
 msgstr "Teile-Verpackungen"
 
-#: company/models.py:373
+#: company/models.py:375
 msgid "multiple"
 msgstr "Vielfache"
 
+#: company/models.py:375
+#, fuzzy
+#| msgid "multiple"
+msgid "Order multiple"
+msgstr "Vielfache"
+
 #: company/templates/company/assigned_stock.html:10
 #: company/templates/company/navbar.html:51
 #: company/templates/company/navbar.html:54 templates/js/build.js:411
@@ -1847,6 +1943,20 @@ msgstr "Firmendetails"
 msgid "Phone"
 msgstr "Telefon"
 
+#: company/templates/company/delete.html:7
+#, fuzzy, python-format
+#| msgid "Are you sure you want to delete category"
+msgid "Are you sure you want to delete company '%(name)s'?"
+msgstr "Sind Sie sicher, dass Sie diese Kategorie löschen wollen"
+
+#: company/templates/company/delete.html:12
+#, python-format
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
+"If this supplier is deleted, these supplier part entries will also be "
+"deleted."
+msgstr ""
+
 #: company/templates/company/detail.html:21
 msgid "Company Name"
 msgstr "Firmenname"
@@ -1859,9 +1969,9 @@ msgstr "Keine Website angegeben"
 msgid "Uses default currency"
 msgstr "verwendet Standard-Währung"
 
-#: company/templates/company/detail.html:65
-#: order/templates/order/sales_order_base.html:92 stock/models.py:412
-#: stock/models.py:413 stock/templates/stock/item_base.html:247
+#: company/templates/company/detail.html:65 order/models.py:440
+#: order/templates/order/sales_order_base.html:92 stock/models.py:413
+#: stock/models.py:414 stock/templates/stock/item_base.html:247
 #: templates/js/company.js:40 templates/js/order.js:267
 msgid "Customer"
 msgstr "Kunde"
@@ -1872,6 +1982,7 @@ msgid "Supplier Parts"
 msgstr "Zulieferer-Teile"
 
 #: company/templates/company/detail_part.html:20
+#: order/templates/order/order_wizard/select_parts.html:42
 #: order/templates/order/purchase_order_detail.html:75
 msgid "Create new supplier part"
 msgstr "Neues Zulieferer-Teil anlegen"
@@ -1911,13 +2022,13 @@ msgid "Create new Part"
 msgstr "Neues Teil hinzufügen"
 
 #: company/templates/company/detail_part.html:72 company/views.py:62
-#: order/templates/order/purchase_orders.html:182
+#: order/templates/order/purchase_orders.html:183
 #: part/templates/part/supplier.html:50
 msgid "New Supplier"
 msgstr "Neuer Zulieferer"
 
 #: company/templates/company/detail_part.html:73 company/views.py:279
-#: order/templates/order/purchase_orders.html:183
+#: order/templates/order/purchase_orders.html:184
 msgid "Create new Supplier"
 msgstr "Neuen Zulieferer anlegen"
 
@@ -2058,7 +2169,7 @@ msgid "New Sales Order"
 msgstr "Neuer Auftrag"
 
 #: company/templates/company/supplier_part_base.html:6
-#: company/templates/company/supplier_part_base.html:19 stock/models.py:379
+#: company/templates/company/supplier_part_base.html:19 stock/models.py:380
 #: stock/templates/stock/item_base.html:342 templates/js/company.js:180
 msgid "Supplier Part"
 msgstr "Zulieferer-Teil"
@@ -2132,7 +2243,7 @@ msgstr "Hersteller"
 msgid "Customers"
 msgstr "Kunden"
 
-#: company/views.py:76 order/templates/order/sales_orders.html:184
+#: company/views.py:76 order/templates/order/sales_orders.html:185
 msgid "New Customer"
 msgstr "Neuer Kunde"
 
@@ -2172,7 +2283,7 @@ msgstr "Firma bearbeiten"
 msgid "Edited company information"
 msgstr "Firmeninformation bearbeitet"
 
-#: company/views.py:285 order/templates/order/sales_orders.html:185
+#: company/views.py:285 order/templates/order/sales_orders.html:186
 msgid "Create new Customer"
 msgstr "Neuen Kunden anlegen"
 
@@ -2224,7 +2335,7 @@ msgstr "Label Name"
 msgid "Label description"
 msgstr "Label Beschreibung"
 
-#: label/models.py:116 stock/forms.py:201
+#: label/models.py:116 stock/forms.py:202
 msgid "Label"
 msgstr "Label"
 
@@ -2240,6 +2351,12 @@ msgstr "Aktiviert"
 msgid "Label template is enabled"
 msgstr "Label-Vorlage ist aktiviert"
 
+#: label/models.py:129
+#, fuzzy
+#| msgid "Height [mm]"
+msgid "Width [mm]"
+msgstr "Höhe [mm]"
+
 #: label/models.py:130
 msgid "Label width, specified in mm"
 msgstr "Label-Breite in mm"
@@ -2286,24 +2403,24 @@ msgstr "Teile in diesen Lagerort empfangen"
 msgid "Purchase Order reference"
 msgstr "Bestellungs-Referenz"
 
-#: order/forms.py:109
+#: order/forms.py:110
 msgid "Target date for order delivery. Order will be overdue after this date."
 msgstr "Zieldatum für Auftrags-Lieferung."
 
-#: order/forms.py:137
+#: order/forms.py:138
 msgid "Enter sales order number"
 msgstr "Auftrag-Nummer eingeben"
 
-#: order/forms.py:143 order/models.py:448
+#: order/forms.py:145 order/models.py:452
 msgid ""
 "Target date for order completion. Order will be overdue after this date."
 msgstr "Zieldatum für Auftrags-Fertigstellung."
 
-#: order/forms.py:233
+#: order/forms.py:235
 msgid "Enter stock item serial numbers"
 msgstr "Seriennummern für BestandsObjekt eingeben"
 
-#: order/forms.py:239
+#: order/forms.py:241
 msgid "Enter quantity of stock items"
 msgstr "Menge der BestandsObjekt eingeben"
 
@@ -2319,137 +2436,191 @@ msgstr "Bestellungs-Beschreibung"
 msgid "Link to external page"
 msgstr "Link auf externe Seite"
 
-#: order/models.py:117
+#: order/models.py:111 part/templates/part/detail.html:132
+msgid "Created By"
+msgstr "Erstellt von"
+
+#: order/models.py:118
 msgid "User or group responsible for this order"
 msgstr "Nutzer oder Gruppe der/die für diesen Auftrag zuständig ist/sind"
 
-#: order/models.py:122
+#: order/models.py:123
 msgid "Order notes"
 msgstr "Bestell-Notizen"
 
-#: order/models.py:181 order/models.py:441
+#: order/models.py:182 order/models.py:445
 msgid "Purchase order status"
 msgstr "Bestellungs-Status"
 
-#: order/models.py:189
+#: order/models.py:191
 msgid "Company from which the items are being ordered"
 msgstr "Firma bei der die Teile bestellt werden"
 
-#: order/models.py:192
+#: order/models.py:194 order/templates/order/order_base.html:98
+#: templates/js/order.js:179
+msgid "Supplier Reference"
+msgstr "Zulieferer-Referenz"
+
+#: order/models.py:194
 msgid "Supplier order reference code"
 msgstr "Zulieferer Bestellreferenz"
 
-#: order/models.py:203
+#: order/models.py:201
+#, fuzzy
+#| msgid "Received"
+msgid "received by"
+msgstr "Empfangen"
+
+#: order/models.py:206
 msgid "Issue Date"
 msgstr "Aufgabedatum"
 
-#: order/models.py:204
+#: order/models.py:207
 msgid "Date order was issued"
 msgstr "Datum an dem die Bestellung aufgegeben wurde"
 
-#: order/models.py:209
+#: order/models.py:212
 msgid "Target Delivery Date"
 msgstr "Ziel-Versanddatum"
 
-#: order/models.py:210
+#: order/models.py:213
 msgid ""
 "Expected date for order delivery. Order will be overdue after this date."
 msgstr "Geplantes Lieferdatum für Auftrag."
 
-#: order/models.py:216
+#: order/models.py:219
 msgid "Date order was completed"
 msgstr "Datum an dem der Auftrag fertigstellt wurde"
 
-#: order/models.py:240 order/models.py:339 part/views.py:1586
-#: stock/models.py:269 stock/models.py:948
+#: order/models.py:243 order/models.py:342 part/views.py:1586
+#: stock/models.py:270 stock/models.py:950
 msgid "Quantity must be greater than zero"
 msgstr "Anzahl muss größer Null sein"
 
-#: order/models.py:245
+#: order/models.py:248
 msgid "Part supplier must match PO supplier"
 msgstr "Teile-Zulieferer muss dem Zulieferer der Bestellung entsprechen"
 
-#: order/models.py:334
+#: order/models.py:337
 msgid "Lines can only be received against an order marked as 'Placed'"
 msgstr "Nur Teile aufgegebener Bestllungen können empfangen werden"
 
-#: order/models.py:356
+#: order/models.py:359
 msgid "Received items"
 msgstr "Elemente empfangen"
 
-#: order/models.py:437
+#: order/models.py:441
 msgid "Company to which the items are being sold"
 msgstr "Firma an die die Teile verkauft werden"
 
-#: order/models.py:443
+#: order/models.py:447
+#, fuzzy
+#| msgid "Customer Reference"
+msgid "Customer Reference "
+msgstr "Kundenreferenz"
+
+#: order/models.py:447
 msgid "Customer order reference code"
 msgstr "Bestellreferenz"
 
-#: order/models.py:501
+#: order/models.py:455 templates/js/order.js:303
+msgid "Shipment Date"
+msgstr "Versanddatum"
+
+#: order/models.py:462
+#, fuzzy
+#| msgid "Shipped"
+msgid "shipped by"
+msgstr "Versendet"
+
+#: order/models.py:506
 msgid "SalesOrder cannot be shipped as it is not currently pending"
 msgstr "Bestellung kann nicht versendet werden weil er nicht anhängig ist"
 
-#: order/models.py:588
+#: order/models.py:593
 msgid "Item quantity"
 msgstr "Anzahl"
 
-#: order/models.py:590
+#: order/models.py:595
 msgid "Line item reference"
 msgstr "Position - Referenz"
 
-#: order/models.py:592
+#: order/models.py:597
 msgid "Line item notes"
 msgstr "Position - Notizen"
 
-#: order/models.py:618 order/templates/order/order_base.html:9
+#: order/models.py:623 order/models.py:667
+#: part/templates/part/allocation.html:17
+#: part/templates/part/allocation.html:45
+msgid "Order"
+msgstr "Bestellung"
+
+#: order/models.py:624 order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:24
 #: report/templates/report/inventree_po_report.html:77
 #: stock/templates/stock/item_base.html:309 templates/js/order.js:148
 msgid "Purchase Order"
 msgstr "Bestellung"
 
-#: order/models.py:631
+#: order/models.py:638
 msgid "Supplier part"
 msgstr "Zulieferer-Teil"
 
-#: order/models.py:634
+#: order/models.py:641 order/templates/order/order_base.html:131
+#: order/templates/order/purchase_order_detail.html:207
+#: order/templates/order/receive_parts.html:22
+#: order/templates/order/sales_order_base.html:131
+msgid "Received"
+msgstr "Empfangen"
+
+#: order/models.py:641
 msgid "Number of items received"
 msgstr "Empfangene Objekt-Anzahl"
 
-#: order/models.py:641 stock/models.py:505
+#: order/models.py:648 stock/models.py:506
 #: stock/templates/stock/item_base.html:316
 msgid "Purchase Price"
 msgstr "EK-Preis"
 
-#: order/models.py:642
+#: order/models.py:649
 msgid "Unit purchase price"
 msgstr "EK-Preis pro Einheit"
 
-#: order/models.py:736 order/models.py:738
+#: order/models.py:743 order/models.py:745
 msgid "Stock item has not been assigned"
 msgstr "BestandsObjekt wurde nicht zugewiesen"
 
-#: order/models.py:742
+#: order/models.py:749
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr "Kann BestandsObjekt keiner Zeile mit einem anderen Teil hinzufügen"
 
-#: order/models.py:744
+#: order/models.py:751
 msgid "Cannot allocate stock to a line without a part"
 msgstr "Kann BestandsObjekt keiner Zeile ohne Teil hinzufügen"
 
-#: order/models.py:747
+#: order/models.py:754
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "Die zugeordnete Anzahl darf nicht die verfügbare Anzahl überschreiten"
 
-#: order/models.py:757
+#: order/models.py:764
 msgid "Quantity must be 1 for serialized stock item"
 msgstr "Anzahl für BestandsObjekt mit Seriennummer muss 1 sein"
 
-#: order/models.py:773
+#: order/models.py:769
+msgid "Line"
+msgstr "Position"
+
+#: order/models.py:780
+#, fuzzy
+#| msgid "Items"
+msgid "Item"
+msgstr "Positionen"
+
+#: order/models.py:781
 msgid "Select stock item to allocate"
 msgstr "BestandsObjekt für Zuordnung auswählen"
 
-#: order/models.py:776
+#: order/models.py:784
 msgid "Enter stock allocation quantity"
 msgstr "Anzahl für Bestandszuordnung eingeben"
 
@@ -2492,28 +2663,32 @@ msgstr "Bestellreferenz"
 msgid "Order Status"
 msgstr "Bestellstatus"
 
-#: order/templates/order/order_base.html:98 templates/js/order.js:179
-msgid "Supplier Reference"
-msgstr "Zulieferer-Referenz"
-
 #: order/templates/order/order_base.html:117
 #: report/templates/report/inventree_build_order_base.html:122
 msgid "Issued"
 msgstr "Aufgegeben"
 
-#: order/templates/order/order_base.html:131
-#: order/templates/order/purchase_order_detail.html:207
-#: order/templates/order/receive_parts.html:22
-#: order/templates/order/sales_order_base.html:131
-msgid "Received"
-msgstr "Empfangen"
-
 #: order/templates/order/order_cancel.html:7
 #: order/templates/order/sales_order_cancel.html:9
 msgid "Cancelling this order means that the order will no longer be editable."
 msgstr ""
 "Abbruch dieser Bestellung bedeutet, dass sie nicht länger bearbeitbar ist."
 
+#: order/templates/order/order_complete.html:7
+#, fuzzy
+#| msgid "Mark order as complete"
+msgid "Mark this order as complete?"
+msgstr "Bestellung als vollständig markieren"
+
+#: order/templates/order/order_issue.html:7
+#, fuzzy
+#| msgid ""
+#| "Cancelling this order means that the order will no longer be editable."
+msgid ""
+"After placing this purchase order, line items will no longer be editable."
+msgstr ""
+"Abbruch dieser Bestellung bedeutet, dass sie nicht länger bearbeitbar ist."
+
 #: order/templates/order/order_notes.html:13
 msgid "Order Notes"
 msgstr "Notizen zur Bestellung"
@@ -2692,11 +2867,16 @@ msgstr "Auftrags-Positionen"
 #: order/templates/order/sales_order_detail.html:75
 #: order/templates/order/sales_order_detail.html:157
 #: report/templates/report/inventree_test_report_base.html:75
-#: stock/models.py:417 stock/templates/stock/item_base.html:234
+#: stock/models.py:418 stock/templates/stock/item_base.html:234
 #: templates/js/build.js:418
 msgid "Serial Number"
 msgstr "Seriennummer"
 
+#: order/templates/order/sales_order_detail.html:92 templates/js/bom.js:338
+#: templates/js/build.js:571 templates/js/build.js:984
+msgid "Actions"
+msgstr "Aktionen"
+
 #: order/templates/order/sales_order_detail.html:99 templates/js/build.js:459
 #: templates/js/build.js:789
 msgid "Edit stock allocation"
@@ -2707,8 +2887,18 @@ msgstr "Bestands-Zuordnung bearbeiten"
 msgid "Delete stock allocation"
 msgstr "Bestands-Zuordnung löschen"
 
-#: order/templates/order/sales_order_detail.html:229 order/views.py:1351
-#: templates/js/build.js:523 templates/js/build.js:785
+#: order/templates/order/sales_order_detail.html:170
+#, fuzzy
+#| msgid "No matching results"
+msgid "No matching line items"
+msgstr "Keine passenden Ergebnisse gefunden"
+
+#: order/templates/order/sales_order_detail.html:199
+msgid "ID"
+msgstr ""
+
+#: order/templates/order/sales_order_detail.html:229 templates/js/build.js:523
+#: templates/js/build.js:785
 msgid "Allocated"
 msgstr "Zugeordnet"
 
@@ -2880,6 +3070,12 @@ msgstr "Anzahl kleiner null empfangen"
 msgid "No lines specified"
 msgstr "Keine Zeilen angegeben"
 
+#: order/views.py:1060
+#, fuzzy, python-brace-format
+#| msgid "Order parts"
+msgid "Ordered {n} parts"
+msgstr "Teile bestellen"
+
 #: order/views.py:1117
 msgid "Supplier part must be specified"
 msgstr "Zulieferer-Teil muss ausgewählt werden"
@@ -2905,8 +3101,10 @@ msgid "Allocate Serial Numbers"
 msgstr "Seriennummern zuweisen"
 
 #: order/views.py:1351
-msgid "items"
-msgstr "Teile"
+#, fuzzy, python-brace-format
+#| msgid "Allocated to Orders"
+msgid "Allocated {n} items"
+msgstr "zu Bauaufträgen zugeordnet"
 
 #: order/views.py:1367
 msgid "Select line item"
@@ -2936,7 +3134,7 @@ msgstr "Zuordnung bearbeiten"
 msgid "Remove allocation"
 msgstr "Zuordnung entfernen"
 
-#: part/bom.py:138 part/models.py:72 part/models.py:761
+#: part/bom.py:138 part/models.py:72 part/models.py:762
 #: part/templates/part/category.html:62 part/templates/part/detail.html:90
 msgid "Default Location"
 msgstr "Standard-Lagerort"
@@ -2958,11 +3156,11 @@ msgstr "Fehler beim Lesen der Stückliste (ungültige Daten)"
 msgid "Error reading BOM file (incorrect row size)"
 msgstr "Fehler beim Lesen der Stückliste (ungültige Zeilengröße)"
 
-#: part/forms.py:89 stock/forms.py:264
+#: part/forms.py:89 stock/forms.py:265
 msgid "File Format"
 msgstr "Dateiformat"
 
-#: part/forms.py:89 stock/forms.py:264
+#: part/forms.py:89 stock/forms.py:265
 msgid "Select output file format"
 msgstr "Ausgabe-Dateiformat auswählen"
 
@@ -3007,7 +3205,7 @@ msgstr "Zulieferer einschließen"
 msgid "Include part supplier data in exported BOM"
 msgstr "Zulieferer-Daten in Stückliste-Export einschließen"
 
-#: part/forms.py:120 part/models.py:2054
+#: part/forms.py:120 part/models.py:2057
 msgid "Parent Part"
 msgstr "Ausgangsteil"
 
@@ -3019,63 +3217,81 @@ msgstr "Teil für Stücklisten-Kopie auswählen"
 msgid "Clear existing BOM items"
 msgstr "Stücklisten-Position(en) löschen"
 
-#: part/forms.py:132
+#: part/forms.py:133
 msgid "Confirm BOM duplication"
 msgstr "Kopie von Stückliste bestätigen"
 
-#: part/forms.py:150
+#: part/forms.py:151
+#, fuzzy
+#| msgid "Validate BOM"
+msgid "validate"
+msgstr "BOM validieren"
+
+#: part/forms.py:151
 msgid "Confirm that the BOM is correct"
 msgstr "Bestätigen, dass die Stückliste korrekt ist"
 
-#: part/forms.py:162
+#: part/forms.py:163
+#, fuzzy
+#| msgid "BOM Item"
+msgid "BOM file"
+msgstr "Stücklisten-Position"
+
+#: part/forms.py:163
 msgid "Select BOM file to upload"
 msgstr "Stücklisten-Datei zum Upload auswählen"
 
-#: part/forms.py:181
+#: part/forms.py:182
 msgid "Related Part"
 msgstr "verknüpftes Teil"
 
-#: part/forms.py:200
+#: part/forms.py:201
 msgid "Select part category"
 msgstr "Teilekategorie wählen"
 
-#: part/forms.py:217
+#: part/forms.py:218
 msgid "Duplicate all BOM data for this part"
 msgstr "Stückliste für dieses Teil kopieren"
 
-#: part/forms.py:218
+#: part/forms.py:219
 msgid "Copy BOM"
 msgstr "Stückliste kopieren"
 
-#: part/forms.py:223
+#: part/forms.py:224
 msgid "Duplicate all parameter data for this part"
 msgstr "Alle Parameter-Daten für dieses Teil kopieren"
 
-#: part/forms.py:224
+#: part/forms.py:225
 msgid "Copy Parameters"
 msgstr "Parameter kopieren"
 
-#: part/forms.py:229
+#: part/forms.py:230
 msgid "Confirm part creation"
 msgstr "Erstellen des Teils bestätigen"
 
-#: part/forms.py:234
+#: part/forms.py:235
 msgid "Include category parameter templates"
 msgstr "Kategorie Parameter-Vorlage einschließen"
 
-#: part/forms.py:239
+#: part/forms.py:240
 msgid "Include parent categories parameter templates"
 msgstr "Über-Kategorie Parameter-Vorlage einschließen"
 
-#: part/forms.py:319
+#: part/forms.py:320
 msgid "Add parameter template to same level categories"
 msgstr "Parameter-Vorlage zu Kategorien dieser Ebene hinzufügen"
 
-#: part/forms.py:323
+#: part/forms.py:324
 msgid "Add parameter template to all categories"
 msgstr "Parameter-Vorlage zu allen Kategorien hinzufügen"
 
-#: part/forms.py:368
+#: part/forms.py:342 part/models.py:2151
+#, fuzzy
+#| msgid "Buy parts"
+msgid "Sub part"
+msgstr "Teile kaufen"
+
+#: part/forms.py:370
 msgid "Input quantity for price calculation"
 msgstr "Eintragsmenge zur Preisberechnung"
 
@@ -3091,7 +3307,7 @@ msgstr "Standard Stichwörter"
 msgid "Default keywords for parts in this category"
 msgstr "Standard-Stichworte für Teile dieser Kategorie"
 
-#: part/models.py:82 part/models.py:2099
+#: part/models.py:82 part/models.py:2103
 #: part/templates/part/part_app_base.html:9
 msgid "Part Category"
 msgstr "Teilkategorie"
@@ -3161,7 +3377,7 @@ msgstr "Schlüsselwörter"
 msgid "Part keywords to improve visibility in search results"
 msgstr "Schlüsselworte um die Sichtbarkeit in Suchergebnissen zu verbessern"
 
-#: part/models.py:724 part/templates/part/detail.html:73
+#: part/models.py:724 part/models.py:2102 part/templates/part/detail.html:73
 #: part/templates/part/set_category.html:15 templates/js/part.js:384
 msgid "Category"
 msgstr "Kategorie"
@@ -3188,246 +3404,273 @@ msgstr "Revisions- oder Versionsnummer"
 msgid "Revision"
 msgstr "Revision"
 
-#: part/models.py:759
+#: part/models.py:760
 msgid "Where is this item normally stored?"
 msgstr "Wo wird dieses Teil normalerweise gelagert?"
 
-#: part/models.py:806 part/templates/part/detail.html:97
+#: part/models.py:807 part/templates/part/detail.html:97
 msgid "Default Supplier"
 msgstr "Standard Zulieferer"
 
-#: part/models.py:807
+#: part/models.py:808
 msgid "Default supplier part"
 msgstr "Standard Zulieferer-Teil"
 
-#: part/models.py:814
+#: part/models.py:815
 msgid "Default Expiry"
 msgstr "Standard Ablaufzeit"
 
-#: part/models.py:815
+#: part/models.py:816
 msgid "Expiry time (in days) for stock items of this part"
 msgstr "Ablauf-Zeit (in Tagen) für Lagerbestand dieses Teils"
 
-#: part/models.py:820 part/templates/part/detail.html:113
+#: part/models.py:821 part/templates/part/detail.html:113
 msgid "Minimum Stock"
 msgstr "Minimaler Lagerbestand"
 
-#: part/models.py:821
+#: part/models.py:822
 msgid "Minimum allowed stock level"
 msgstr "Minimal zulässiger Lagerbestand"
 
-#: part/models.py:827 part/templates/part/detail.html:106
+#: part/models.py:828 part/models.py:2031 part/templates/part/detail.html:106
 #: part/templates/part/params.html:29
 msgid "Units"
 msgstr "Einheiten"
 
-#: part/models.py:828
+#: part/models.py:829
 msgid "Stock keeping units for this part"
 msgstr "Stock Keeping Units (SKU) für dieses Teil"
 
-#: part/models.py:834
+#: part/models.py:835
 msgid "Can this part be built from other parts?"
 msgstr "Kann dieses Teil aus anderen Teilen angefertigt werden?"
 
-#: part/models.py:840
+#: part/models.py:841
 msgid "Can this part be used to build other parts?"
 msgstr "Kann dieses Teil zum Bau von anderen genutzt werden?"
 
-#: part/models.py:846
+#: part/models.py:847
 msgid "Does this part have tracking for unique items?"
 msgstr "Hat dieses Teil Tracking für einzelne Objekte?"
 
-#: part/models.py:851
+#: part/models.py:852
 msgid "Can this part be purchased from external suppliers?"
 msgstr "Kann dieses Teil von externen Zulieferern gekauft werden?"
 
-#: part/models.py:856
+#: part/models.py:857
 msgid "Can this part be sold to customers?"
 msgstr "Kann dieses Teil an Kunden verkauft werden?"
 
-#: part/models.py:860 part/templates/part/detail.html:227
+#: part/models.py:861 part/templates/part/detail.html:227
 #: templates/js/table_filters.js:20 templates/js/table_filters.js:60
 #: templates/js/table_filters.js:214 templates/js/table_filters.js:283
 msgid "Active"
 msgstr "Aktiv"
 
-#: part/models.py:861
+#: part/models.py:862
 msgid "Is this part active?"
 msgstr "Ist dieses Teil aktiv?"
 
-#: part/models.py:866
+#: part/models.py:867
 msgid "Is this a virtual part, such as a software product or license?"
 msgstr "Ist dieses Teil virtuell, wie zum Beispiel eine Software oder Lizenz?"
 
-#: part/models.py:871
+#: part/models.py:872
 msgid "Part notes - supports Markdown formatting"
 msgstr "Bemerkungen - unterstüzt Markdown-Formatierung"
 
-#: part/models.py:874
+#: part/models.py:875
 msgid "BOM checksum"
 msgstr "Prüfsumme der Stückliste"
 
-#: part/models.py:874
+#: part/models.py:875
 msgid "Stored BOM checksum"
 msgstr "Prüfsumme der Stückliste gespeichert"
 
-#: part/models.py:877
+#: part/models.py:878
 msgid "BOM checked by"
 msgstr "Stückliste kontrolliert von"
 
-#: part/models.py:879
+#: part/models.py:880
 msgid "BOM checked date"
 msgstr "BOM Kontrolldatum"
 
-#: part/models.py:881 part/templates/part/detail.html:126
-#: templates/js/order.js:293
-msgid "Creation Date"
-msgstr "Erstelldatum"
-
-#: part/models.py:883
+#: part/models.py:884
 msgid "Creation User"
 msgstr "Erstellungs-Nutzer"
 
-#: part/models.py:1927
+#: part/models.py:1929
 msgid "Test templates can only be created for trackable parts"
 msgstr "Test-Vorlagen können nur für verfolgbare Teile angelegt werden"
 
-#: part/models.py:1944
+#: part/models.py:1946
 msgid "Test with this name already exists for this part"
 msgstr "Ein Test mit diesem Namen besteht bereits für dieses Teil"
 
-#: part/models.py:1963 templates/js/part.js:561 templates/js/stock.js:104
+#: part/models.py:1966 templates/js/part.js:561 templates/js/stock.js:104
 msgid "Test Name"
 msgstr "Test-Name"
 
-#: part/models.py:1964
+#: part/models.py:1967
 msgid "Enter a name for the test"
 msgstr "Namen für diesen Test eingeben"
 
-#: part/models.py:1969
+#: part/models.py:1972
 msgid "Test Description"
 msgstr "Test-Beschreibung"
 
-#: part/models.py:1970
+#: part/models.py:1973
 msgid "Enter description for this test"
 msgstr "Beschreibung für diesen Test eingeben"
 
-#: part/models.py:1975 templates/js/part.js:570
+#: part/models.py:1978 templates/js/part.js:570
 #: templates/js/table_filters.js:200
 msgid "Required"
 msgstr "benötigt"
 
-#: part/models.py:1976
+#: part/models.py:1979
 msgid "Is this test required to pass?"
 msgstr "Muss dieser Test erfolgreich sein?"
 
-#: part/models.py:1981 templates/js/part.js:578
+#: part/models.py:1984 templates/js/part.js:578
 msgid "Requires Value"
 msgstr "verpflichtender Wert"
 
-#: part/models.py:1982
+#: part/models.py:1985
 msgid "Does this test require a value when adding a test result?"
 msgstr ""
 "Muss für diesen Test ein Wert für das Test-Ergebnis eingetragen werden?"
 
-#: part/models.py:1987 templates/js/part.js:585
+#: part/models.py:1990 templates/js/part.js:585
 msgid "Requires Attachment"
 msgstr "Anhang muss eingegeben werden"
 
-#: part/models.py:1988
+#: part/models.py:1991
 msgid "Does this test require a file attachment when adding a test result?"
 msgstr ""
 "Muss für diesen Test ein Anhang für das Test-Ergebnis hinzugefügt werden?"
 
-#: part/models.py:2021
+#: part/models.py:2024
 msgid "Parameter template name must be unique"
 msgstr "Vorlagen-Name des Parameters muss eindeutig sein"
 
-#: part/models.py:2026
+#: part/models.py:2029
 msgid "Parameter Name"
 msgstr "Name des Parameters"
 
-#: part/models.py:2028
+#: part/models.py:2031
 msgid "Parameter Units"
 msgstr "Parameter Einheit"
 
-#: part/models.py:2056 part/models.py:2104
+#: part/models.py:2059 part/models.py:2108 part/models.py:2109
 #: templates/InvenTree/settings/category.html:62
 msgid "Parameter Template"
 msgstr "Parameter Vorlage"
 
-#: part/models.py:2058
+#: part/models.py:2061
 msgid "Data"
 msgstr "Wert"
 
-#: part/models.py:2058
+#: part/models.py:2061
 msgid "Parameter Value"
 msgstr "Parameter Wert"
 
-#: part/models.py:2108
+#: part/models.py:2113 templates/InvenTree/settings/category.html:67
+msgid "Default Value"
+msgstr "Standard-Wert"
+
+#: part/models.py:2114
 msgid "Default Parameter Value"
 msgstr "Standard Parameter Wert"
 
-#: part/models.py:2136
+#: part/models.py:2143
 msgid "Select parent part"
 msgstr "Ausgangsteil auswählen"
 
-#: part/models.py:2144
+#: part/models.py:2152
 msgid "Select part to be used in BOM"
 msgstr "Teil für die Nutzung in der Stückliste auswählen"
 
-#: part/models.py:2150
+#: part/models.py:2158
 msgid "BOM quantity for this BOM item"
 msgstr "Stücklisten-Anzahl für dieses Stücklisten-Teil"
 
-#: part/models.py:2152
+#: part/models.py:2160 templates/js/bom.js:216 templates/js/bom.js:269
+msgid "Optional"
+msgstr "Optional"
+
+#: part/models.py:2160
 msgid "This BOM item is optional"
 msgstr "Diese Stücklisten-Position ist optional"
 
-#: part/models.py:2155
+#: part/models.py:2163
+#, fuzzy
+#| msgid "Overdue"
+msgid "Overage"
+msgstr "Überfällig"
+
+#: part/models.py:2164
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr "Geschätzter Ausschuss (absolut oder prozentual)"
 
-#: part/models.py:2158
+#: part/models.py:2167
 msgid "BOM item reference"
 msgstr "Referenz der Postion auf der Stückliste"
 
-#: part/models.py:2161
+#: part/models.py:2170
 msgid "BOM item notes"
 msgstr "Notizen zur Stücklisten-Position"
 
-#: part/models.py:2163
+#: part/models.py:2172
+#, fuzzy
+#| msgid "BOM checksum"
+msgid "Checksum"
+msgstr "Prüfsumme der Stückliste"
+
+#: part/models.py:2172
 msgid "BOM line checksum"
 msgstr "Prüfsumme der Stückliste"
 
-#: part/models.py:2167 templates/js/bom.js:275 templates/js/bom.js:282
+#: part/models.py:2176 templates/js/bom.js:275 templates/js/bom.js:282
 #: templates/js/table_filters.js:50
 msgid "Inherited"
 msgstr "Geerbt"
 
-#: part/models.py:2168
+#: part/models.py:2177
 msgid "This BOM item is inherited by BOMs for variant parts"
 msgstr ""
 "Diese Stücklisten-Position wird in dei Stücklisten von Teil-Varianten vererbt"
 
-#: part/models.py:2244 part/views.py:1592 part/views.py:1644
-#: stock/models.py:259
+#: part/models.py:2253 part/views.py:1592 part/views.py:1644
+#: stock/models.py:260
 msgid "Quantity must be integer value for trackable parts"
 msgstr "Menge muss eine Ganzzahl sein"
 
-#: part/models.py:2253 part/models.py:2255
+#: part/models.py:2262 part/models.py:2264
 msgid "Sub part must be specified"
 msgstr "Zulieferer-Teil muss festgelegt sein"
 
-#: part/models.py:2258
+#: part/models.py:2267
 msgid "BOM Item"
 msgstr "Stücklisten-Position"
 
-#: part/models.py:2379
+#: part/models.py:2384
+#, fuzzy
+#| msgid "Part"
+msgid "Part 1"
+msgstr "Teil"
+
+#: part/models.py:2388
+#, fuzzy
+#| msgid "Part"
+msgid "Part 2"
+msgstr "Teil"
+
+#: part/models.py:2388
 msgid "Select Related Part"
 msgstr "verknüpftes Teil auswählen"
 
-#: part/models.py:2411
+#: part/models.py:2420
 msgid ""
 "Error creating relationship: check that the part is not related to itself "
 "and that the relationship is unique"
@@ -3439,23 +3682,6 @@ msgstr ""
 msgid "Part Stock Allocations"
 msgstr "Teil-Bestandszuordnungen"
 
-#: part/templates/part/allocation.html:17
-#: part/templates/part/allocation.html:45
-msgid "Order"
-msgstr "Bestellung"
-
-#: part/templates/part/allocation.html:18
-#: part/templates/part/allocation.html:24
-#: part/templates/part/allocation.html:31
-#: part/templates/part/allocation.html:49
-#: stock/templates/stock/item_base.html:8
-#: stock/templates/stock/item_base.html:89
-#: stock/templates/stock/item_base.html:324
-#: stock/templates/stock/stock_adjust.html:16 templates/js/build.js:771
-#: templates/js/stock.js:923 templates/js/stock.js:1181
-msgid "Stock Item"
-msgstr "BestandsObjekt"
-
 #: part/templates/part/attachments.html:10
 msgid "Part Attachments"
 msgstr "Anhänge"
@@ -3475,6 +3701,23 @@ msgstr ""
 msgid "Bill of Materials"
 msgstr "Stückliste"
 
+#: part/templates/part/bom.html:19
+#, python-format
+msgid "The BOM for <i>%(part)s</i> has changed, and must be validated.<br>"
+msgstr ""
+
+#: part/templates/part/bom.html:21
+#, python-format
+msgid ""
+"The BOM for <i>%(part)s</i> was last checked by %(checker)s on %(check_date)s"
+msgstr ""
+
+#: part/templates/part/bom.html:25
+#, fuzzy, python-format
+#| msgid "This line has been validated"
+msgid "The BOM for <i>%(part)s</i> has not been validated."
+msgstr "Diese Position wurde validiert"
+
 #: part/templates/part/bom.html:32
 msgid "Remove selected BOM items"
 msgstr "Ausgewählte Stücklistenpositionen entfernen"
@@ -3614,6 +3857,22 @@ msgstr "Vorlage für Stückliste"
 msgid "Each part must already exist in the database"
 msgstr "Jedes Teil muss bereits in der Datenbank bestehen"
 
+#: part/templates/part/bom_upload/upload_file.html:27
+#, fuzzy
+#| msgid "Uploaded"
+msgid "Upload File"
+msgstr "Hochgeladen"
+
+#: part/templates/part/bom_validate.html:6
+#, python-format
+msgid ""
+"Confirm that the Bill of Materials (BOM) is valid for:<br><i>%(part)s</i>"
+msgstr ""
+
+#: part/templates/part/bom_validate.html:9
+msgid "This will validate each line in the BOM."
+msgstr ""
+
 #: part/templates/part/build.html:10
 msgid "Part Builds"
 msgstr "gefertigte Teile"
@@ -3691,7 +3950,7 @@ msgstr "Teil-Kategorie anlegen"
 msgid "Create new Part Category"
 msgstr "Neue Teil-Kategorie anlegen"
 
-#: part/templates/part/category.html:240 stock/views.py:1358
+#: part/templates/part/category.html:240 stock/views.py:1359
 msgid "Create new Stock Location"
 msgstr "Neuen Lagerort erstellen"
 
@@ -3790,10 +4049,6 @@ msgstr "Keine Seriennummern gefunden"
 msgid "Stock Expiry Time"
 msgstr "Bestands-Ablauf Zeit"
 
-#: part/templates/part/detail.html:132
-msgid "Created By"
-msgstr "Erstellt von"
-
 #: part/templates/part/detail.html:139
 msgid "Responsible User"
 msgstr "Verantwortlicher Benutzer"
@@ -3915,7 +4170,7 @@ msgstr "Neuer Parameter"
 
 #: part/templates/part/params.html:28
 #: report/templates/report/inventree_test_report_base.html:90
-#: stock/models.py:1650 templates/InvenTree/settings/header.html:8
+#: stock/models.py:1652 templates/InvenTree/settings/header.html:8
 #: templates/js/stock.js:124
 msgid "Value"
 msgstr "Wert"
@@ -3925,7 +4180,7 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: part/templates/part/params.html:44 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 users/models.py:175
+#: part/templates/part/supplier.html:22 stock/views.py:1002 users/models.py:175
 msgid "Delete"
 msgstr "Löschen"
 
@@ -4419,18 +4674,30 @@ msgid "Sales order query filters"
 msgstr "Auftrags-Abfragefilter"
 
 #: report/models.py:500
+#, fuzzy
+#| msgid "Shipped"
+msgid "Snippet"
+msgstr "Versendet"
+
+#: report/models.py:501
 msgid "Report snippet file"
 msgstr "Berichts-Snippet"
 
-#: report/models.py:504
+#: report/models.py:505
 msgid "Snippet file description"
 msgstr "Snippet-Beschreibung"
 
-#: report/models.py:539
+#: report/models.py:540
+#, fuzzy
+#| msgid "Assembly"
+msgid "Asset"
+msgstr "Baugruppe"
+
+#: report/models.py:541
 msgid "Report asset file"
 msgstr "Berichts-Ressource"
 
-#: report/models.py:542
+#: report/models.py:544
 msgid "Asset file description"
 msgstr "Ressource-Beschreibung"
 
@@ -4452,12 +4719,12 @@ msgid "Test Results"
 msgstr "Testergebnisse"
 
 #: report/templates/report/inventree_test_report_base.html:88
-#: stock/models.py:1638
+#: stock/models.py:1640
 msgid "Test"
 msgstr "Test"
 
 #: report/templates/report/inventree_test_report_base.html:89
-#: stock/models.py:1644
+#: stock/models.py:1646
 msgid "Result"
 msgstr "Ergebnis"
 
@@ -4474,304 +4741,360 @@ msgstr "bestanden"
 msgid "Fail"
 msgstr "fehlgeschlagen"
 
-#: stock/forms.py:117
+#: stock/api.py:199
+#, fuzzy, python-brace-format
+#| msgid "Counted stock for {n} items"
+msgid "Updated stock for {n} items"
+msgstr "Bestand für {n} Objekte erfasst"
+
+#: stock/api.py:268
+#, fuzzy, python-brace-format
+#| msgid "Moved {n} items to {dest}"
+msgid "Moved {n} parts to {loc}"
+msgstr "{n} Teile nach {dest} bewegt"
+
+#: stock/forms.py:114 stock/forms.py:406 stock/models.py:473
+#: stock/templates/stock/item_base.html:349 templates/js/stock.js:652
+msgid "Expiry Date"
+msgstr "Ablaufdatum"
+
+#: stock/forms.py:115 stock/forms.py:407
+#, fuzzy
+#| msgid "Batch code for this stock item"
+msgid "Expiration date for this stock item"
+msgstr "Losnummer für dieses BestandsObjekt"
+
+#: stock/forms.py:118
 msgid "Enter unique serial numbers (or leave blank)"
 msgstr "Eindeutige Seriennummern eingeben (oder leer lassen)"
 
-#: stock/forms.py:202 stock/forms.py:258
-msgid "Select test report template"
-msgstr "Test Bericht Vorlage auswählen"
+#: stock/forms.py:169
+msgid ""
+"Destination for serialized stock (by default, will remain in current "
+"location)"
+msgstr ""
 
-#: stock/forms.py:266
-msgid "Include stock items in sub locations"
-msgstr "BestandsObjekt in untergeordneten Lagerorten einschließen"
+#: stock/forms.py:171
+msgid "Serial numbers"
+msgstr "Seriennummern"
 
-#: stock/forms.py:301
-msgid "Stock item to install"
-msgstr "BestandsObjekt zum verbauen"
+#: stock/forms.py:171
+#, fuzzy
+#| msgid "Number of unique serial number ({s}) must match quantity ({q})"
+msgid "Unique serial numbers (must match quantity)"
+msgstr ""
+"Anzahl der eindeutigen Seriennummern ({s}) muss mit der Anzahl ({q}) "
+"übereinstimmen"
 
-#: stock/forms.py:308
-msgid "Stock quantity to assign"
-msgstr "Bestandmenge zum Zuweisen"
-
-#: stock/forms.py:336
-msgid "Must not exceed available quantity"
-msgstr "Anzahl darf die verfügbare Anzahl nicht überschreiten"
-
-#: stock/forms.py:346
-msgid "Destination location for uninstalled items"
-msgstr "Ziel Lagerort für unverbaute Objekte"
-
-#: stock/forms.py:348
+#: stock/forms.py:173 stock/forms.py:349
 msgid "Add transaction note (optional)"
 msgstr "hinzufügen Transaktionsnotizen (optional)"
 
-#: stock/forms.py:350
+#: stock/forms.py:203 stock/forms.py:259
+msgid "Select test report template"
+msgstr "Test Bericht Vorlage auswählen"
+
+#: stock/forms.py:267 templates/js/table_filters.js:111
+msgid "Include sublocations"
+msgstr "Unter-Lagerorte einschließen"
+
+#: stock/forms.py:267
+msgid "Include stock items in sub locations"
+msgstr "BestandsObjekt in untergeordneten Lagerorten einschließen"
+
+#: stock/forms.py:302
+msgid "Stock item to install"
+msgstr "BestandsObjekt zum verbauen"
+
+#: stock/forms.py:309
+msgid "Stock quantity to assign"
+msgstr "Bestandmenge zum Zuweisen"
+
+#: stock/forms.py:337
+msgid "Must not exceed available quantity"
+msgstr "Anzahl darf die verfügbare Anzahl nicht überschreiten"
+
+#: stock/forms.py:347
+msgid "Destination location for uninstalled items"
+msgstr "Ziel Lagerort für unverbaute Objekte"
+
+#: stock/forms.py:351
 msgid "Confirm uninstall"
 msgstr "nicht mehr verbauen bestätigen"
 
-#: stock/forms.py:350
+#: stock/forms.py:351
 msgid "Confirm removal of installed stock items"
 msgstr "Entfernen der verbauten BestandsObjekt bestätigen"
 
-#: stock/forms.py:374
+#: stock/forms.py:375
 msgid "Destination stock location"
 msgstr "Ziel-Lagerbestand"
 
-#: stock/forms.py:376
+#: stock/forms.py:377
 msgid "Add note (required)"
 msgstr "Notiz hinzufügen (erforderlich)"
 
-#: stock/forms.py:380 stock/views.py:852 stock/views.py:1050
+#: stock/forms.py:381 stock/views.py:852 stock/views.py:1051
 msgid "Confirm stock adjustment"
 msgstr "Bestands-Anpassung bestätigen"
 
-#: stock/forms.py:380
+#: stock/forms.py:381
 msgid "Confirm movement of stock items"
 msgstr "Verschieben der BestandsObjekt bestätigen"
 
-#: stock/forms.py:382
+#: stock/forms.py:383
 msgid "Set Default Location"
 msgstr "Standard-Lagerort ändern"
 
-#: stock/forms.py:382
+#: stock/forms.py:383
 msgid "Set the destination as the default location for selected parts"
 msgstr "Setze das Ziel als Standard-Lagerort für ausgewählte Teile"
 
-#: stock/models.py:204
+#: stock/models.py:54 stock/models.py:511
+msgid "Owner"
+msgstr ""
+
+#: stock/models.py:55 stock/models.py:512
+#, fuzzy
+#| msgid "Select filter"
+msgid "Select Owner"
+msgstr "Filter auswählen"
+
+#: stock/models.py:205
 msgid "Created stock item"
 msgstr "Neues BestandsObjekt erstellt"
 
-#: stock/models.py:240
+#: stock/models.py:241
 msgid "StockItem with this serial number already exists"
 msgstr "Ein BestandsObjekt mit dieser Seriennummer existiert bereits"
 
-#: stock/models.py:276
+#: stock/models.py:277
 #, python-brace-format
 msgid "Part type ('{pf}') must be {pe}"
 msgstr "Teile-Typ ('{pf}') muss {pe} sein"
 
-#: stock/models.py:286 stock/models.py:295
+#: stock/models.py:287 stock/models.py:296
 msgid "Quantity must be 1 for item with a serial number"
 msgstr "Anzahl muss für Objekte mit Seriennummer 1 sein"
 
-#: stock/models.py:287
+#: stock/models.py:288
 msgid "Serial number cannot be set if quantity greater than 1"
 msgstr ""
 "Seriennummer kann nicht gesetzt werden wenn die Anzahl größer als 1 ist"
 
-#: stock/models.py:309
+#: stock/models.py:310
 msgid "Item cannot belong to itself"
 msgstr "Teil kann nicht zu sich selbst gehören"
 
-#: stock/models.py:315
+#: stock/models.py:316
 msgid "Item must have a build reference if is_building=True"
 msgstr "Teil muss eine Referenz haben wenn is_building wahr ist"
 
-#: stock/models.py:322
+#: stock/models.py:323
 msgid "Build reference does not point to the same part object"
 msgstr "Referenz verweist nicht auf das gleiche Teil"
 
-#: stock/models.py:362
+#: stock/models.py:363
 msgid "Parent Stock Item"
 msgstr "Eltern-BestandsObjekt"
 
-#: stock/models.py:371
+#: stock/models.py:372
 msgid "Base part"
 msgstr "Basis-Teil"
 
-#: stock/models.py:380
+#: stock/models.py:381
 msgid "Select a matching supplier part for this stock item"
 msgstr "Passendes Zulieferer-Teil für dieses BestandsObjekt auswählen"
 
-#: stock/models.py:385 stock/templates/stock/stock_app_base.html:7
+#: stock/models.py:386 stock/templates/stock/stock_app_base.html:7
 msgid "Stock Location"
 msgstr "Bestand-Lagerort"
 
-#: stock/models.py:388
+#: stock/models.py:389
 msgid "Where is this stock item located?"
 msgstr "Wo wird dieses Teil normalerweise gelagert?"
 
-#: stock/models.py:395
+#: stock/models.py:396
 msgid "Packaging this stock item is stored in"
 msgstr "Die Verpackung dieses BestandsObjekt ist gelagert in"
 
-#: stock/models.py:400 stock/templates/stock/item_base.html:255
+#: stock/models.py:401 stock/templates/stock/item_base.html:255
 msgid "Installed In"
 msgstr "verbaut in"
 
-#: stock/models.py:403
+#: stock/models.py:404
 msgid "Is this item installed in another item?"
 msgstr "Ist dieses Teil in einem anderen verbaut?"
 
-#: stock/models.py:419
+#: stock/models.py:420
 msgid "Serial number for this item"
 msgstr "Seriennummer für dieses Teil"
 
-#: stock/models.py:431
+#: stock/models.py:432
 msgid "Batch code for this stock item"
 msgstr "Losnummer für dieses BestandsObjekt"
 
-#: stock/models.py:435
+#: stock/models.py:436
 msgid "Stock Quantity"
 msgstr "Bestand"
 
-#: stock/models.py:444
+#: stock/models.py:445
 msgid "Source Build"
 msgstr "Quellbau"
 
-#: stock/models.py:446
+#: stock/models.py:447
 msgid "Build for this stock item"
 msgstr "Bau für dieses BestandsObjekt"
 
-#: stock/models.py:457
+#: stock/models.py:458
 msgid "Source Purchase Order"
 msgstr "Quelle Bestellung"
 
-#: stock/models.py:460
+#: stock/models.py:461
 msgid "Purchase order for this stock item"
 msgstr "Bestellung für dieses BestandsObjekt"
 
-#: stock/models.py:466
+#: stock/models.py:467
 msgid "Destination Sales Order"
 msgstr "Ziel-Auftrag"
 
-#: stock/models.py:472 stock/templates/stock/item_base.html:349
-#: templates/js/stock.js:652
-msgid "Expiry Date"
-msgstr "Ablaufdatum"
-
-#: stock/models.py:473
+#: stock/models.py:474
 msgid ""
 "Expiry date for stock item. Stock will be considered expired after this date"
 msgstr ""
 "Ablaufdatum für BestandsObjekt. Bestand wird danach als abgelaufen "
 "gekennzeichnet"
 
-#: stock/models.py:486
+#: stock/models.py:487
+#, fuzzy
+#| msgid "Delete Template"
+msgid "Delete on deplete"
+msgstr "Vorlage löschen"
+
+#: stock/models.py:487
 msgid "Delete this Stock Item when stock is depleted"
 msgstr "Dieses BestandsObjekt löschen wenn Bestand aufgebraucht"
 
-#: stock/models.py:496 stock/templates/stock/item_notes.html:13
+#: stock/models.py:497 stock/templates/stock/item_notes.html:13
 #: stock/templates/stock/navbar.html:54
 msgid "Stock Item Notes"
 msgstr "BestandsObjekt-Notizen"
 
-#: stock/models.py:506
+#: stock/models.py:507
 msgid "Single unit purchase price at time of purchase"
 msgstr "EK-Preis für eine Einheit bei EK-Datum"
 
-#: stock/models.py:610
+#: stock/models.py:612
 msgid "Assigned to Customer"
 msgstr "zugewiesen zum Kunden"
 
-#: stock/models.py:612
+#: stock/models.py:614
 msgid "Manually assigned to customer"
 msgstr "manuell zugewiesen zum Kunden"
 
-#: stock/models.py:625
+#: stock/models.py:627
 msgid "Returned from customer"
 msgstr "zurück vom Kunden"
 
-#: stock/models.py:627
+#: stock/models.py:629
 msgid "Returned to location"
 msgstr "zurück ins Lager"
 
-#: stock/models.py:787
+#: stock/models.py:789
 msgid "Installed into stock item"
 msgstr "In BestandsObjekt verbaut"
 
-#: stock/models.py:795
+#: stock/models.py:797
 msgid "Installed stock item"
 msgstr "verbautes BestandsObjekt"
 
-#: stock/models.py:819
+#: stock/models.py:821
 msgid "Uninstalled stock item"
 msgstr "BestandsObjekt ausgebaut"
 
-#: stock/models.py:838
+#: stock/models.py:840
 msgid "Uninstalled into location"
 msgstr "ausgebaut nach Lagerort"
 
-#: stock/models.py:939
+#: stock/models.py:941
 msgid "Part is not set as trackable"
 msgstr "Teil ist nicht verfolgbar"
 
-#: stock/models.py:945
+#: stock/models.py:947
 msgid "Quantity must be integer"
 msgstr "Anzahl muss eine Ganzzahl sein"
 
-#: stock/models.py:951
+#: stock/models.py:953
 #, python-brace-format
 msgid "Quantity must not exceed available stock quantity ({n})"
 msgstr "Anzahl darf nicht die verfügbare Anzahl überschreiten ({n})"
 
-#: stock/models.py:954
+#: stock/models.py:956
 msgid "Serial numbers must be a list of integers"
 msgstr "Seriennummern muss eine Liste von Ganzzahlen sein"
 
-#: stock/models.py:957
+#: stock/models.py:959
 msgid "Quantity does not match serial numbers"
 msgstr "Anzahl stimmt nicht mit den Seriennummern überein"
 
-#: stock/models.py:989
+#: stock/models.py:991
 msgid "Add serial number"
 msgstr "Seriennummer hinzufügen"
 
-#: stock/models.py:992
+#: stock/models.py:994
 #, python-brace-format
 msgid "Serialized {n} items"
 msgstr "{n} Teile serialisiert"
 
-#: stock/models.py:1070
+#: stock/models.py:1072
 msgid "Split from existing stock"
 msgstr "aufteilen vom vorhandenen Bestand"
 
-#: stock/models.py:1108
+#: stock/models.py:1110
 msgid "StockItem cannot be moved as it is not in stock"
 msgstr "BestandsObjekt kann nicht bewegt werden, da kein Bestand vorhanden ist"
 
-#: stock/models.py:1551
+#: stock/models.py:1553
 msgid "Title"
 msgstr "Titel"
 
-#: stock/models.py:1551
+#: stock/models.py:1553
 msgid "Tracking entry title"
 msgstr "Objektverfolgung - Name des Eintrags"
 
-#: stock/models.py:1553
+#: stock/models.py:1555
 msgid "Entry notes"
 msgstr "Eintrags-Notizen"
 
-#: stock/models.py:1555
+#: stock/models.py:1557
 msgid "Link to external page for further information"
 msgstr "Link auf externe Seite für weitere Informationen"
 
-#: stock/models.py:1615
+#: stock/models.py:1617
 msgid "Value must be provided for this test"
 msgstr "Wert muss für diesen Test angegeben werden"
 
-#: stock/models.py:1621
+#: stock/models.py:1623
 msgid "Attachment must be uploaded for this test"
 msgstr "Anhang muss für diesen Test hochgeladen werden"
 
-#: stock/models.py:1639
+#: stock/models.py:1641
 msgid "Test name"
 msgstr "Name des Tests"
 
-#: stock/models.py:1645 templates/js/table_filters.js:190
+#: stock/models.py:1647 templates/js/table_filters.js:190
 msgid "Test result"
 msgstr "Testergebnis"
 
-#: stock/models.py:1651
+#: stock/models.py:1653
 msgid "Test output value"
 msgstr "Test Ausgabe Wert"
 
-#: stock/models.py:1658
+#: stock/models.py:1660
 msgid "Test result attachment"
 msgstr "Test Ergebnis Anhang"
 
-#: stock/models.py:1664
+#: stock/models.py:1666
 msgid "Test notes"
 msgstr "Test Notizen"
 
@@ -4941,11 +5264,6 @@ msgstr "Kein Lagerort gesetzt"
 msgid "Barcode Identifier"
 msgstr "Barcode-Bezeichner"
 
-#: stock/templates/stock/item_base.html:302 templates/InvenTree/search.html:167
-#: templates/js/build.js:655 templates/navbar.html:29
-msgid "Build"
-msgstr "Bauauftrag"
-
 #: stock/templates/stock/item_base.html:323
 msgid "Parent Item"
 msgstr "Elternposition"
@@ -5129,7 +5447,7 @@ msgstr "Lade..."
 msgid "The following stock items will be uninstalled"
 msgstr "Die folgenden BestandsObjekte werden nicht mehr verbaut"
 
-#: stock/templates/stock/stockitem_convert.html:7 stock/views.py:1331
+#: stock/templates/stock/stockitem_convert.html:7 stock/views.py:1332
 msgid "Convert Stock Item"
 msgstr "BestandsObjekt umwandeln"
 
@@ -5149,8 +5467,8 @@ msgstr "Diese Aktion kann nicht einfach rückgängig gemacht werden"
 msgid "Edit Stock Location"
 msgstr "BestandsObjekt-Lagerort bearbeiten"
 
-#: stock/views.py:230 stock/views.py:1321 stock/views.py:1432
-#: stock/views.py:1797
+#: stock/views.py:230 stock/views.py:1322 stock/views.py:1433
+#: stock/views.py:1798
 msgid "Owner is required (ownership control is enabled)"
 msgstr "Eigentümer notwendig (Eigentümerkontrolle aktiv)"
 
@@ -5238,95 +5556,123 @@ msgstr "Lagerbestand anpassen"
 msgid "Move Stock Items"
 msgstr "BestandsObjekte bewegen"
 
+#: stock/views.py:998
+msgid "Move"
+msgstr ""
+
 #: stock/views.py:999
 msgid "Count Stock Items"
 msgstr "BestandsObjekte zählen"
 
+#: stock/views.py:999
+#, fuzzy
+#| msgid "Account"
+msgid "Count"
+msgstr "Konto"
+
 #: stock/views.py:1000
 msgid "Remove From Stock"
 msgstr "Aus Lagerbestand entfernen"
 
+#: stock/views.py:1000
+msgid "Take"
+msgstr ""
+
 #: stock/views.py:1001
 msgid "Add Stock Items"
 msgstr "BestandsObjekte hinzufügen"
 
+#: stock/views.py:1001 users/models.py:171
+msgid "Add"
+msgstr "Hinzufügen"
+
 #: stock/views.py:1002
 msgid "Delete Stock Items"
 msgstr "BestandsObjekte löschen"
 
-#: stock/views.py:1030
+#: stock/views.py:1031
 msgid "Must enter integer value"
 msgstr "Nur Ganzzahl eingeben"
 
-#: stock/views.py:1035
+#: stock/views.py:1036
 msgid "Quantity must be positive"
 msgstr "Anzahl muss positiv sein"
 
-#: stock/views.py:1042
+#: stock/views.py:1043
 #, python-brace-format
 msgid "Quantity must not exceed {x}"
 msgstr "Anzahl darf {x} nicht überschreiten"
 
-#: stock/views.py:1106
+#: stock/views.py:1107
 msgid "No action performed"
 msgstr "Keine Aktion durchgeführt"
 
-#: stock/views.py:1149
+#: stock/views.py:1122
+#, python-brace-format
+msgid "Added stock to {n} items"
+msgstr "Vorrat zu {n} BestandsObjekten hinzugefügt"
+
+#: stock/views.py:1137
+#, python-brace-format
+msgid "Removed stock from {n} items"
+msgstr "Vorrat von {n} BestandsObjekten entfernt"
+
+#: stock/views.py:1150
 #, python-brace-format
 msgid "Counted stock for {n} items"
 msgstr "Bestand für {n} Objekte erfasst"
 
-#: stock/views.py:1189
+#: stock/views.py:1190
 msgid "No items were moved"
 msgstr "Keine BestandsObjekt wurden bewegt"
 
-#: stock/views.py:1192
+#: stock/views.py:1193
 #, python-brace-format
 msgid "Moved {n} items to {dest}"
 msgstr "{n} Teile nach {dest} bewegt"
 
-#: stock/views.py:1211
+#: stock/views.py:1212
 #, python-brace-format
 msgid "Deleted {n} stock items"
 msgstr "{n} BestandsObjekte gelöscht"
 
-#: stock/views.py:1223
+#: stock/views.py:1224
 msgid "Edit Stock Item"
 msgstr "BestandsObjekt bearbeiten"
 
-#: stock/views.py:1449
+#: stock/views.py:1450
 msgid "Serialize Stock"
 msgstr "Lagerbestand erfassen"
 
-#: stock/views.py:1542 templates/js/build.js:210
+#: stock/views.py:1543 templates/js/build.js:210
 msgid "Create new Stock Item"
 msgstr "Neues BestandsObjekt hinzufügen"
 
-#: stock/views.py:1684
+#: stock/views.py:1685
 msgid "Duplicate Stock Item"
 msgstr "Bestand duplizieren"
 
-#: stock/views.py:1766
+#: stock/views.py:1767
 msgid "Quantity cannot be negative"
 msgstr "Anzahl kann nicht negativ sein"
 
-#: stock/views.py:1866
+#: stock/views.py:1867
 msgid "Delete Stock Location"
 msgstr "Bestand-Lagerort löschen"
 
-#: stock/views.py:1879
+#: stock/views.py:1880
 msgid "Delete Stock Item"
 msgstr "BestandsObjekt löschen"
 
-#: stock/views.py:1890
+#: stock/views.py:1891
 msgid "Delete Stock Tracking Entry"
 msgstr "Lagerbestands-Tracking-Eintrag löschen"
 
-#: stock/views.py:1897
+#: stock/views.py:1898
 msgid "Edit Stock Tracking Entry"
 msgstr "Lagerbestands-Tracking-Eintrag bearbeiten"
 
-#: stock/views.py:1906
+#: stock/views.py:1907
 msgid "Add Stock Tracking Entry"
 msgstr "Lagerbestands-Tracking-Eintrag hinzufügen"
 
@@ -5430,10 +5776,6 @@ msgstr "Kategorie-Parametervorlagen"
 msgid "No category parameter templates found"
 msgstr "Keine Kategorie-Parametervorlagen gefunden"
 
-#: templates/InvenTree/settings/category.html:67
-msgid "Default Value"
-msgstr "Standard-Wert"
-
 #: templates/InvenTree/settings/category.html:70
 #: templates/InvenTree/settings/part.html:81
 msgid "Edit Template"
@@ -5749,10 +6091,6 @@ msgstr "Barcode entspricht keinem Lagerort"
 msgid "Open subassembly"
 msgstr "Unterbaugruppe öffnen"
 
-#: templates/js/bom.js:216 templates/js/bom.js:269
-msgid "Optional"
-msgstr "Optional"
-
 #: templates/js/bom.js:261
 msgid "No pricing available"
 msgstr "Keine Preisinformation verfügbar"
@@ -5761,10 +6099,6 @@ msgstr "Keine Preisinformation verfügbar"
 msgid "View BOM"
 msgstr "Stückliste anzeigen"
 
-#: templates/js/bom.js:338 templates/js/build.js:571 templates/js/build.js:984
-msgid "Actions"
-msgstr "Aktionen"
-
 #: templates/js/bom.js:346
 msgid "Validate BOM Item"
 msgstr "Stücklisten-Position validieren"
@@ -6026,10 +6360,6 @@ msgstr "Bestellung überfällig"
 msgid "No sales orders found"
 msgstr "Keine Aufträge gefunden"
 
-#: templates/js/order.js:303
-msgid "Shipment Date"
-msgstr "Versanddatum"
-
 #: templates/js/part.js:51 templates/js/part.js:136
 msgid "Trackable part"
 msgstr "nachverfolgbares Teil"
@@ -6349,10 +6679,6 @@ msgstr "Ist zugeordnet"
 msgid "Item has been allocated"
 msgstr "Teil wurde zugeordnet"
 
-#: templates/js/table_filters.js:111
-msgid "Include sublocations"
-msgstr "Unter-Lagerorte einschließen"
-
 #: templates/js/table_filters.js:112
 msgid "Include stock in sublocations"
 msgstr "Bestand in Unter-Lagerorten einschließen"
@@ -6550,10 +6876,6 @@ msgstr "Benutzername eingeben"
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/registration/login.html:76
-msgid "Enter password"
-msgstr "Passwort eingeben"
-
 #: templates/registration/login.html:83
 msgid "Username / password combination is incorrect"
 msgstr "Benutzername / Passwort Kombination ist falsch"
@@ -6690,10 +7012,6 @@ msgstr "Ansicht"
 msgid "Permission to view items"
 msgstr "Berechtigung Einträge anzuzeigen"
 
-#: users/models.py:171
-msgid "Add"
-msgstr "Hinzufügen"
-
 #: users/models.py:171
 msgid "Permission to add items"
 msgstr "Berechtigung Einträge zu erstellen"
@@ -6710,6 +7028,9 @@ msgstr "Berechtigungen Einträge zu ändern"
 msgid "Permission to delete items"
 msgstr "Berechtigung Einträge zu löschen"
 
+#~ msgid "items"
+#~ msgstr "Teile"
+
 #~ msgid "Create purchase order"
 #~ msgstr "Neue Bestellung anlegen"
 
@@ -6721,9 +7042,6 @@ msgstr "Berechtigung Einträge zu löschen"
 #~ msgid "Show QR code"
 #~ msgstr "QR-Code anzeigen"
 
-#~ msgid "Serial numbers"
-#~ msgstr "Seriennummern"
-
 #~ msgid "name"
 #~ msgstr "Name"
 
@@ -6798,9 +7116,6 @@ msgstr "Berechtigung Einträge zu löschen"
 #~ msgid "Default_location"
 #~ msgstr "Standard-Lagerort"
 
-#~ msgid "Buy parts"
-#~ msgstr "Teile kaufen"
-
 #~ msgid "Build parts"
 #~ msgstr "Bauteile"
 
@@ -6896,17 +7211,6 @@ msgstr "Berechtigung Einträge zu löschen"
 #~ msgid "Finished"
 #~ msgstr "Bearbeitung beenden"
 
-#, fuzzy
-#~| msgid "Validate BOM"
-#~ msgid "Validate"
-#~ msgstr "BOM validieren"
-
-#~ msgid "Added stock to {n} items"
-#~ msgstr "Vorrat zu {n} BestandsObjekten hinzugefügt"
-
-#~ msgid "Removed stock from {n} items"
-#~ msgstr "Vorrat von {n} BestandsObjekten entfernt"
-
 #, fuzzy
 #~| msgid "Confirm stock adjustment"
 #~ msgid "Document actions"
@@ -7201,6 +7505,3 @@ msgstr "Berechtigung Einträge zu löschen"
 
 #~ msgid "Allocate"
 #~ msgstr "zuweisen"
-
-#~ msgid "Line"
-#~ msgstr "Position"
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index 7fe67bf929..bb954c049d 100644
--- a/InvenTree/locale/en/LC_MESSAGES/django.po
+++ b/InvenTree/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-03 02:10+0000\n"
+"POT-Creation-Date: 2021-04-04 20:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,32 +34,47 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:110 build/forms.py:99 build/forms.py:187
+#: InvenTree/forms.py:110 build/forms.py:99 build/forms.py:120
+#: build/forms.py:142 build/forms.py:166 build/forms.py:188 build/forms.py:223
+#: order/forms.py:27 order/forms.py:38 order/forms.py:49 order/forms.py:60
+#: order/forms.py:71 part/forms.py:132
 msgid "Confirm"
 msgstr ""
 
 #: InvenTree/forms.py:126
+msgid "Confirm delete"
+msgstr ""
+
+#: InvenTree/forms.py:127
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:158
+#: InvenTree/forms.py:159 templates/registration/login.html:76
+msgid "Enter password"
+msgstr ""
+
+#: InvenTree/forms.py:160
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:165
+#: InvenTree/forms.py:167
+msgid "Confirm password"
+msgstr ""
+
+#: InvenTree/forms.py:168
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:200
+#: InvenTree/forms.py:203
 msgid "Apply Theme"
 msgstr ""
 
-#: InvenTree/forms.py:230
+#: InvenTree/forms.py:233
 msgid "Select Category"
 msgstr ""
 
-#: InvenTree/helpers.py:361 order/models.py:242 order/models.py:341
-#: stock/views.py:1762
+#: InvenTree/helpers.py:361 order/models.py:245 order/models.py:344
+#: stock/views.py:1763
 msgid "Invalid quantity provided"
 msgstr ""
 
@@ -91,7 +106,7 @@ msgstr ""
 msgid "Number of unique serial number ({s}) must match quantity ({q})"
 msgstr ""
 
-#: InvenTree/models.py:59 stock/models.py:1657
+#: InvenTree/models.py:59 stock/models.py:1659
 msgid "Attachment"
 msgstr ""
 
@@ -107,7 +122,7 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:68 InvenTree/models.py:69
+#: InvenTree/models.py:68 InvenTree/models.py:69 part/models.py:1888
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:960
 msgid "User"
@@ -118,20 +133,21 @@ msgid "upload date"
 msgstr ""
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:101
-#: part/models.py:686 part/templates/part/params.html:27 report/models.py:179
-#: templates/InvenTree/search.html:136 templates/InvenTree/search.html:273
-#: templates/js/part.js:109
+#: part/models.py:686 part/models.py:2029 part/templates/part/params.html:27
+#: report/models.py:179 templates/InvenTree/search.html:136
+#: templates/InvenTree/search.html:273 templates/js/part.js:109
 msgid "Name"
 msgstr ""
 
 #: InvenTree/models.py:114 build/models.py:134
-#: build/templates/build/detail.html:21 company/models.py:359
+#: build/templates/build/detail.html:21 company/models.py:361
 #: company/templates/company/detail.html:26
 #: company/templates/company/supplier_part_base.html:70
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:108
-#: order/templates/order/purchase_order_detail.html:168 part/models.py:710
-#: part/templates/part/detail.html:54 part/templates/part/set_category.html:14
-#: report/models.py:192
+#: order/models.py:101 order/templates/order/purchase_order_detail.html:168
+#: part/models.py:710 part/templates/part/detail.html:54
+#: part/templates/part/set_category.html:14 report/models.py:192
+#: report/models.py:505 report/models.py:544
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:143 templates/InvenTree/search.html:208
 #: templates/InvenTree/search.html:280
@@ -246,7 +262,8 @@ msgid "Invalid character in part name"
 msgstr ""
 
 #: InvenTree/validators.py:63
-msgid "IPN must match regex pattern"
+#, python-brace-format
+msgid "IPN must match regex pattern {pat}"
 msgstr ""
 
 #: InvenTree/validators.py:77 InvenTree/validators.py:91
@@ -344,7 +361,7 @@ msgid "Order target date"
 msgstr ""
 
 #: build/forms.py:39 build/templates/build/build_base.html:104
-#: build/templates/build/detail.html:121
+#: build/templates/build/detail.html:121 order/forms.py:109 order/forms.py:144
 #: order/templates/order/order_base.html:124
 #: order/templates/order/sales_order_base.html:117
 #: report/templates/report/inventree_build_order_base.html:126
@@ -358,15 +375,20 @@ msgid ""
 "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/forms.py:45 build/forms.py:87
+#: build/forms.py:45 build/forms.py:87 build/forms.py:257 build/models.py:1103
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:91
 #: build/templates/build/detail.html:31 common/models.py:696
 #: company/forms.py:131 company/templates/company/supplier_part_pricing.html:77
-#: order/forms.py:237 order/templates/order/order_wizard/select_parts.html:32
+#: order/forms.py:188 order/forms.py:205 order/forms.py:239 order/forms.py:261
+#: order/forms.py:278 order/models.py:593 order/models.py:784
+#: order/templates/order/order_wizard/select_parts.html:32
 #: order/templates/order/purchase_order_detail.html:193
+#: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:159
+#: order/templates/order/sales_order_detail.html:224 part/forms.py:340
+#: part/forms.py:369 part/forms.py:385 part/models.py:2158
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
 #: part/templates/part/part_pricing.html:12
@@ -376,7 +398,8 @@ msgstr ""
 #: report/templates/report/inventree_po_report.html:91
 #: report/templates/report/inventree_so_report.html:91
 #: report/templates/report/inventree_test_report_base.html:77
-#: stock/forms.py:307 stock/templates/stock/item_base.html:51
+#: stock/forms.py:175 stock/forms.py:308 stock/models.py:1563
+#: stock/templates/stock/item_base.html:51
 #: stock/templates/stock/item_base.html:57
 #: stock/templates/stock/item_base.html:240
 #: stock/templates/stock/stock_adjust.html:18 templates/js/barcode.js:364
@@ -393,7 +416,7 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/forms.py:92 order/forms.py:231 stock/forms.py:117
+#: build/forms.py:92 order/forms.py:233 stock/forms.py:118
 msgid "Serial Numbers"
 msgstr ""
 
@@ -405,39 +428,57 @@ msgstr ""
 msgid "Confirm creation of build output"
 msgstr ""
 
-#: build/forms.py:120
+#: build/forms.py:121
 msgid "Confirm deletion of build output"
 msgstr ""
 
-#: build/forms.py:141
+#: build/forms.py:142
 msgid "Confirm unallocation of stock"
 msgstr ""
 
-#: build/forms.py:165
+#: build/forms.py:166
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: build/forms.py:188
+#: build/forms.py:189
 msgid "Mark build as complete"
 msgstr ""
 
-#: build/forms.py:212
+#: build/forms.py:213 build/templates/build/auto_allocate.html:18
+#: order/forms.py:82 stock/forms.py:347
+#: stock/templates/stock/item_base.html:270
+#: stock/templates/stock/stock_adjust.html:17
+#: templates/InvenTree/search.html:244 templates/js/barcode.js:363
+#: templates/js/barcode.js:531 templates/js/build.js:434
+#: templates/js/stock.js:637
+msgid "Location"
+msgstr ""
+
+#: build/forms.py:214
 msgid "Location of completed parts"
 msgstr ""
 
-#: build/forms.py:217
-msgid "Confirm completion with incomplete stock allocation"
+#: build/forms.py:219
+msgid "Confirm incomplete"
 msgstr ""
 
 #: build/forms.py:220
+msgid "Confirm completion with incomplete stock allocation"
+msgstr ""
+
+#: build/forms.py:223
 msgid "Confirm build completion"
 msgstr ""
 
-#: build/forms.py:240 build/views.py:66
+#: build/forms.py:243
+msgid "Confirm cancel"
+msgstr ""
+
+#: build/forms.py:243 build/views.py:66
 msgid "Confirm build cancellation"
 msgstr ""
 
-#: build/forms.py:254
+#: build/forms.py:257
 msgid "Select quantity of stock to allocate"
 msgstr ""
 
@@ -462,7 +503,9 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:127 order/templates/order/purchase_order_detail.html:188
+#: build/models.py:127 order/models.py:99 order/models.py:595
+#: order/templates/order/purchase_order_detail.html:188
+#: order/templates/order/sales_order_detail.html:219 part/models.py:2167
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:509 templates/js/build.js:948
@@ -484,11 +527,15 @@ msgstr ""
 
 #: build/models.py:152 build/templates/build/auto_allocate.html:16
 #: build/templates/build/build_base.html:86
-#: build/templates/build/detail.html:26 order/models.py:662
+#: build/templates/build/detail.html:26 company/models.py:535
+#: order/models.py:637 order/models.py:669
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:156
-#: order/templates/order/receive_parts.html:19 part/models.py:321
-#: part/models.py:2054 part/templates/part/part_app_base.html:7
+#: order/templates/order/receive_parts.html:19
+#: order/templates/order/sales_order_detail.html:207 part/models.py:321
+#: part/models.py:1856 part/models.py:1868 part/models.py:1886
+#: part/models.py:1961 part/models.py:2057 part/models.py:2142
+#: part/templates/part/part_app_base.html:7
 #: part/templates/part/part_pricing.html:15 part/templates/part/related.html:29
 #: part/templates/part/set_category.html:13
 #: part/templates/part/subcategories.html:17
@@ -558,7 +605,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:212 stock/models.py:429
+#: build/models.py:212 stock/models.py:430
 msgid "Batch Code"
 msgstr ""
 
@@ -566,11 +613,16 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:223 order/models.py:447
+#: build/models.py:219 order/models.py:105 part/models.py:882
+#: part/templates/part/detail.html:126 templates/js/order.js:293
+msgid "Creation Date"
+msgstr ""
+
+#: build/models.py:223 order/models.py:451
 msgid "Target completion date"
 msgstr ""
 
-#: build/models.py:227 order/models.py:215
+#: build/models.py:227 order/models.py:218
 msgid "Completion Date"
 msgstr ""
 
@@ -587,9 +639,9 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:250 build/templates/build/build_base.html:142
-#: build/templates/build/detail.html:105 order/models.py:118
+#: build/templates/build/detail.html:105 order/models.py:119
 #: order/templates/order/order_base.html:138
-#: order/templates/order/sales_order_base.html:138 part/models.py:885
+#: order/templates/order/sales_order_base.html:138 part/models.py:886
 #: report/templates/report/inventree_build_order_base.html:159
 msgid "Responsible"
 msgstr ""
@@ -602,26 +654,28 @@ msgstr ""
 #: company/templates/company/supplier_part_base.html:77
 #: company/templates/company/supplier_part_detail.html:28
 #: part/templates/part/detail.html:83 part/templates/part/part_base.html:100
-#: stock/models.py:423 stock/templates/stock/item_base.html:330
+#: stock/models.py:424 stock/templates/stock/item_base.html:330
 msgid "External Link"
 msgstr ""
 
-#: build/models.py:257 part/models.py:744 stock/models.py:425
+#: build/models.py:257 part/models.py:744 stock/models.py:426
 msgid "Link to external URL"
 msgstr ""
 
 #: build/models.py:261 build/templates/build/navbar.html:59
-#: company/models.py:366 company/templates/company/navbar.html:59
-#: company/templates/company/navbar.html:62
-#: order/templates/order/po_navbar.html:29
+#: company/models.py:129 company/models.py:368
+#: company/templates/company/navbar.html:59
+#: company/templates/company/navbar.html:62 order/models.py:123
+#: order/models.py:597 order/templates/order/po_navbar.html:29
 #: order/templates/order/po_navbar.html:32
 #: order/templates/order/purchase_order_detail.html:227
+#: order/templates/order/sales_order_detail.html:264
 #: order/templates/order/so_navbar.html:33
-#: order/templates/order/so_navbar.html:36 part/models.py:870
+#: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:122
 #: report/templates/report/inventree_build_order_base.html:173
-#: stock/forms.py:316 stock/forms.py:348 stock/forms.py:376 stock/models.py:495
-#: stock/models.py:1553 stock/models.py:1663
+#: stock/forms.py:173 stock/forms.py:317 stock/forms.py:349 stock/forms.py:377
+#: stock/models.py:496 stock/models.py:1555 stock/models.py:1665
 #: stock/templates/stock/navbar.html:57 templates/js/barcode.js:37
 #: templates/js/bom.js:329 templates/js/stock.js:128 templates/js/stock.js:667
 msgid "Notes"
@@ -665,11 +719,11 @@ msgstr ""
 msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
 msgstr ""
 
-#: build/models.py:1034 order/models.py:751
+#: build/models.py:1034 order/models.py:758
 msgid "StockItem is over-allocated"
 msgstr ""
 
-#: build/models.py:1038 order/models.py:754
+#: build/models.py:1038 order/models.py:761
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -677,19 +731,41 @@ msgstr ""
 msgid "Quantity must be 1 for serialized stock"
 msgstr ""
 
-#: build/models.py:1082
+#: build/models.py:1082 stock/templates/stock/item_base.html:302
+#: templates/InvenTree/search.html:167 templates/js/build.js:655
+#: templates/navbar.html:29
+msgid "Build"
+msgstr ""
+
+#: build/models.py:1083
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1089
+#: build/models.py:1090 part/templates/part/allocation.html:18
+#: part/templates/part/allocation.html:24
+#: part/templates/part/allocation.html:31
+#: part/templates/part/allocation.html:49
+#: stock/templates/stock/item_base.html:8
+#: stock/templates/stock/item_base.html:89
+#: stock/templates/stock/item_base.html:324
+#: stock/templates/stock/stock_adjust.html:16 templates/js/build.js:771
+#: templates/js/stock.js:923 templates/js/stock.js:1181
+msgid "Stock Item"
+msgstr ""
+
+#: build/models.py:1091
 msgid "Source stock item"
 msgstr ""
 
-#: build/models.py:1101
+#: build/models.py:1104
 msgid "Stock quantity to allocate to build"
 msgstr ""
 
-#: build/models.py:1109
+#: build/models.py:1112
+msgid "Install into"
+msgstr ""
+
+#: build/models.py:1113
 msgid "Destination stock item"
 msgstr ""
 
@@ -757,15 +833,6 @@ msgid ""
 "The following stock items will be allocated to the specified build output"
 msgstr ""
 
-#: build/templates/build/auto_allocate.html:18 stock/forms.py:346
-#: stock/templates/stock/item_base.html:270
-#: stock/templates/stock/stock_adjust.html:17
-#: templates/InvenTree/search.html:244 templates/js/barcode.js:363
-#: templates/js/barcode.js:531 templates/js/build.js:434
-#: templates/js/stock.js:637
-msgid "Location"
-msgstr ""
-
 #: build/templates/build/auto_allocate.html:37
 msgid "No stock items found that can be automatically allocated to this build"
 msgstr ""
@@ -836,7 +903,7 @@ msgid "Build Details"
 msgstr ""
 
 #: build/templates/build/build_base.html:96
-#: build/templates/build/detail.html:59
+#: build/templates/build/detail.html:59 order/models.py:445
 #: order/templates/order/receive_parts.html:24
 #: stock/templates/stock/item_base.html:376 templates/InvenTree/search.html:236
 #: templates/js/barcode.js:119 templates/js/build.js:710
@@ -855,7 +922,7 @@ msgid "Progress"
 msgstr ""
 
 #: build/templates/build/build_base.html:128
-#: build/templates/build/detail.html:84 order/models.py:660
+#: build/templates/build/detail.html:84 order/models.py:667
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:33
 #: order/templates/order/sales_order_ship.html:25
@@ -966,7 +1033,7 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:46 stock/forms.py:374
+#: build/templates/build/detail.html:46 stock/forms.py:169 stock/forms.py:375
 msgid "Destination"
 msgstr ""
 
@@ -1099,7 +1166,7 @@ msgstr ""
 msgid "Create Build Output"
 msgstr ""
 
-#: build/views.py:203 stock/models.py:964 stock/views.py:1788
+#: build/views.py:203 stock/models.py:966 stock/views.py:1789
 msgid "Serial numbers already exist"
 msgstr ""
 
@@ -1237,7 +1304,7 @@ msgstr ""
 msgid "String descriptor for the server instance"
 msgstr ""
 
-#: common/models.py:62 company/models.py:95 company/models.py:96
+#: common/models.py:62 company/models.py:96 company/models.py:97
 msgid "Company name"
 msgstr ""
 
@@ -1341,8 +1408,8 @@ msgstr ""
 msgid "Number of recent parts to display on index page"
 msgstr ""
 
-#: common/models.py:150 part/models.py:2056 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:258 templates/js/table_filters.js:24
+#: common/models.py:150 part/models.py:2059 part/templates/part/detail.html:160
+#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:24
 #: templates/js/table_filters.js:288
 msgid "Template"
 msgstr ""
@@ -1351,7 +1418,7 @@ msgstr ""
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:157 part/models.py:833 part/templates/part/detail.html:170
+#: common/models.py:157 part/models.py:834 part/templates/part/detail.html:170
 #: templates/js/table_filters.js:101 templates/js/table_filters.js:300
 msgid "Assembly"
 msgstr ""
@@ -1360,7 +1427,7 @@ msgstr ""
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:164 part/models.py:839 part/templates/part/detail.html:180
+#: common/models.py:164 part/models.py:840 part/templates/part/detail.html:180
 #: templates/js/table_filters.js:304
 msgid "Component"
 msgstr ""
@@ -1369,7 +1436,7 @@ msgstr ""
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:171 part/models.py:850 part/templates/part/detail.html:200
+#: common/models.py:171 part/models.py:851 part/templates/part/detail.html:200
 msgid "Purchaseable"
 msgstr ""
 
@@ -1377,7 +1444,7 @@ msgstr ""
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:178 part/models.py:855 part/templates/part/detail.html:210
+#: common/models.py:178 part/models.py:856 part/templates/part/detail.html:210
 #: templates/js/table_filters.js:312
 msgid "Salable"
 msgstr ""
@@ -1386,7 +1453,7 @@ msgstr ""
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:185 part/models.py:845 part/templates/part/detail.html:190
+#: common/models.py:185 part/models.py:846 part/templates/part/detail.html:190
 #: templates/js/table_filters.js:32 templates/js/table_filters.js:316
 msgid "Trackable"
 msgstr ""
@@ -1395,7 +1462,7 @@ msgstr ""
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:192 part/models.py:865 part/templates/part/detail.html:150
+#: common/models.py:192 part/models.py:866 part/templates/part/detail.html:150
 #: templates/js/table_filters.js:28
 msgid "Virtual"
 msgstr ""
@@ -1585,12 +1652,12 @@ msgstr ""
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: company/forms.py:37 company/models.py:137
+#: company/forms.py:37 company/models.py:139
 #: company/templates/company/detail.html:40
 msgid "Currency"
 msgstr ""
 
-#: company/forms.py:38 company/models.py:139
+#: company/forms.py:38 company/models.py:141
 msgid "Default currency used for this company"
 msgstr ""
 
@@ -1610,95 +1677,106 @@ msgstr ""
 msgid "Single quantity price"
 msgstr ""
 
-#: company/models.py:98
+#: company/models.py:99
 msgid "Company description"
 msgstr ""
 
-#: company/models.py:98
+#: company/models.py:99
 msgid "Description of the company"
 msgstr ""
 
-#: company/models.py:100 company/templates/company/company_base.html:70
+#: company/models.py:101 company/templates/company/company_base.html:70
 #: company/templates/company/detail.html:31 templates/js/company.js:60
 msgid "Website"
 msgstr ""
 
-#: company/models.py:100
+#: company/models.py:101
 msgid "Company website URL"
 msgstr ""
 
-#: company/models.py:103 company/templates/company/company_base.html:77
+#: company/models.py:104 company/templates/company/company_base.html:77
 msgid "Address"
 msgstr ""
 
-#: company/models.py:104
+#: company/models.py:105
 msgid "Company address"
 msgstr ""
 
-#: company/models.py:107
+#: company/models.py:108
 msgid "Phone number"
 msgstr ""
 
-#: company/models.py:108
+#: company/models.py:109
 msgid "Contact phone number"
 msgstr ""
 
-#: company/models.py:111 company/templates/company/company_base.html:91
+#: company/models.py:112 company/templates/company/company_base.html:91
 msgid "Email"
 msgstr ""
 
-#: company/models.py:111
+#: company/models.py:112
 msgid "Contact email address"
 msgstr ""
 
-#: company/models.py:114 company/templates/company/company_base.html:98
+#: company/models.py:115 company/templates/company/company_base.html:98
 msgid "Contact"
 msgstr ""
 
-#: company/models.py:115
+#: company/models.py:116
 msgid "Point of contact"
 msgstr ""
 
-#: company/models.py:117
+#: company/models.py:118 company/models.py:355 order/models.py:103
+#: part/models.py:743
+#: report/templates/report/inventree_build_order_base.html:165
+#: stock/models.py:1557 templates/js/company.js:208 templates/js/part.js:430
+msgid "Link"
+msgstr ""
+
+#: company/models.py:118
 msgid "Link to external company information"
 msgstr ""
 
-#: company/models.py:129
+#: company/models.py:126 part/models.py:753
+msgid "Image"
+msgstr ""
+
+#: company/models.py:131
 msgid "is customer"
 msgstr ""
 
-#: company/models.py:129
+#: company/models.py:131
 msgid "Do you sell items to this company?"
 msgstr ""
 
-#: company/models.py:131
+#: company/models.py:133
 msgid "is supplier"
 msgstr ""
 
-#: company/models.py:131
+#: company/models.py:133
 msgid "Do you purchase items from this company?"
 msgstr ""
 
-#: company/models.py:133
+#: company/models.py:135
 msgid "is manufacturer"
 msgstr ""
 
-#: company/models.py:133
+#: company/models.py:135
 msgid "Does this company manufacture parts?"
 msgstr ""
 
-#: company/models.py:313 stock/models.py:370
+#: company/models.py:315 stock/models.py:371
 #: stock/templates/stock/item_base.html:220
 msgid "Base Part"
 msgstr ""
 
-#: company/models.py:317 order/views.py:1372
+#: company/models.py:319 order/views.py:1372
 msgid "Select part"
 msgstr ""
 
-#: company/models.py:323 company/templates/company/detail.html:60
+#: company/models.py:325 company/templates/company/detail.html:60
 #: company/templates/company/supplier_part_base.html:83
-#: company/templates/company/supplier_part_detail.html:25
+#: company/templates/company/supplier_part_detail.html:25 order/models.py:190
 #: order/templates/order/order_base.html:92
 #: order/templates/order/order_wizard/select_pos.html:30 part/bom.py:170
 #: stock/templates/stock/item_base.html:337 templates/js/company.js:48
@@ -1706,81 +1784,83 @@ msgstr ""
 msgid "Supplier"
 msgstr ""
 
-#: company/models.py:324
+#: company/models.py:326
 msgid "Select supplier"
 msgstr ""
 
-#: company/models.py:329 company/templates/company/supplier_part_base.html:87
+#: company/models.py:331 company/templates/company/supplier_part_base.html:87
 #: company/templates/company/supplier_part_detail.html:26
 #: order/templates/order/purchase_order_detail.html:174 part/bom.py:171
 msgid "SKU"
 msgstr ""
 
-#: company/models.py:330
+#: company/models.py:332
 msgid "Supplier stock keeping unit"
 msgstr ""
 
-#: company/models.py:340 company/templates/company/detail.html:55
+#: company/models.py:342 company/templates/company/detail.html:55
 #: company/templates/company/supplier_part_base.html:93
 #: company/templates/company/supplier_part_detail.html:34 part/bom.py:172
 #: templates/js/company.js:44 templates/js/company.js:188
 msgid "Manufacturer"
 msgstr ""
 
-#: company/models.py:341
+#: company/models.py:343
 msgid "Select manufacturer"
 msgstr ""
 
-#: company/models.py:347 company/templates/company/supplier_part_base.html:99
+#: company/models.py:349 company/templates/company/supplier_part_base.html:99
 #: company/templates/company/supplier_part_detail.html:35
 #: order/templates/order/purchase_order_detail.html:183 part/bom.py:173
 #: templates/js/company.js:204
 msgid "MPN"
 msgstr ""
 
-#: company/models.py:348
+#: company/models.py:350
 msgid "Manufacturer part number"
 msgstr ""
 
-#: company/models.py:353 part/models.py:743
-#: report/templates/report/inventree_build_order_base.html:165
-#: stock/models.py:1555 templates/js/company.js:208 templates/js/part.js:430
-msgid "Link"
-msgstr ""
-
-#: company/models.py:354
+#: company/models.py:356
 msgid "URL for external supplier part link"
 msgstr ""
 
-#: company/models.py:360
+#: company/models.py:362
 msgid "Supplier part description"
 msgstr ""
 
-#: company/models.py:365 company/templates/company/supplier_part_base.html:113
-#: company/templates/company/supplier_part_detail.html:38
+#: company/models.py:367 company/templates/company/supplier_part_base.html:113
+#: company/templates/company/supplier_part_detail.html:38 part/models.py:2170
 #: report/templates/report/inventree_po_report.html:93
 #: report/templates/report/inventree_so_report.html:93
 msgid "Note"
 msgstr ""
 
-#: company/models.py:369
+#: company/models.py:371
+msgid "base cost"
+msgstr ""
+
+#: company/models.py:371
 msgid "Minimum charge (e.g. stocking fee)"
 msgstr ""
 
-#: company/models.py:371 company/templates/company/supplier_part_base.html:106
-#: stock/models.py:394 stock/templates/stock/item_base.html:295
+#: company/models.py:373 company/templates/company/supplier_part_base.html:106
+#: stock/models.py:395 stock/templates/stock/item_base.html:295
 #: templates/js/stock.js:663
 msgid "Packaging"
 msgstr ""
 
-#: company/models.py:371
+#: company/models.py:373
 msgid "Part packaging"
 msgstr ""
 
-#: company/models.py:373
+#: company/models.py:375
 msgid "multiple"
 msgstr ""
 
+#: company/models.py:375
+msgid "Order multiple"
+msgstr ""
+
 #: company/templates/company/assigned_stock.html:10
 #: company/templates/company/navbar.html:51
 #: company/templates/company/navbar.html:54 templates/js/build.js:411
@@ -1825,6 +1905,19 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
+#: company/templates/company/delete.html:7
+#, python-format
+msgid "Are you sure you want to delete company '%(name)s'?"
+msgstr ""
+
+#: company/templates/company/delete.html:12
+#, python-format
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
+"If this supplier is deleted, these supplier part entries will also be "
+"deleted."
+msgstr ""
+
 #: company/templates/company/detail.html:21
 msgid "Company Name"
 msgstr ""
@@ -1837,9 +1930,9 @@ msgstr ""
 msgid "Uses default currency"
 msgstr ""
 
-#: company/templates/company/detail.html:65
-#: order/templates/order/sales_order_base.html:92 stock/models.py:412
-#: stock/models.py:413 stock/templates/stock/item_base.html:247
+#: company/templates/company/detail.html:65 order/models.py:440
+#: order/templates/order/sales_order_base.html:92 stock/models.py:413
+#: stock/models.py:414 stock/templates/stock/item_base.html:247
 #: templates/js/company.js:40 templates/js/order.js:267
 msgid "Customer"
 msgstr ""
@@ -1850,6 +1943,7 @@ msgid "Supplier Parts"
 msgstr ""
 
 #: company/templates/company/detail_part.html:20
+#: order/templates/order/order_wizard/select_parts.html:42
 #: order/templates/order/purchase_order_detail.html:75
 msgid "Create new supplier part"
 msgstr ""
@@ -1889,13 +1983,13 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_part.html:72 company/views.py:62
-#: order/templates/order/purchase_orders.html:182
+#: order/templates/order/purchase_orders.html:183
 #: part/templates/part/supplier.html:50
 msgid "New Supplier"
 msgstr ""
 
 #: company/templates/company/detail_part.html:73 company/views.py:279
-#: order/templates/order/purchase_orders.html:183
+#: order/templates/order/purchase_orders.html:184
 msgid "Create new Supplier"
 msgstr ""
 
@@ -2035,7 +2129,7 @@ msgid "New Sales Order"
 msgstr ""
 
 #: company/templates/company/supplier_part_base.html:6
-#: company/templates/company/supplier_part_base.html:19 stock/models.py:379
+#: company/templates/company/supplier_part_base.html:19 stock/models.py:380
 #: stock/templates/stock/item_base.html:342 templates/js/company.js:180
 msgid "Supplier Part"
 msgstr ""
@@ -2109,7 +2203,7 @@ msgstr ""
 msgid "Customers"
 msgstr ""
 
-#: company/views.py:76 order/templates/order/sales_orders.html:184
+#: company/views.py:76 order/templates/order/sales_orders.html:185
 msgid "New Customer"
 msgstr ""
 
@@ -2149,7 +2243,7 @@ msgstr ""
 msgid "Edited company information"
 msgstr ""
 
-#: company/views.py:285 order/templates/order/sales_orders.html:185
+#: company/views.py:285 order/templates/order/sales_orders.html:186
 msgid "Create new Customer"
 msgstr ""
 
@@ -2201,7 +2295,7 @@ msgstr ""
 msgid "Label description"
 msgstr ""
 
-#: label/models.py:116 stock/forms.py:201
+#: label/models.py:116 stock/forms.py:202
 msgid "Label"
 msgstr ""
 
@@ -2217,6 +2311,10 @@ msgstr ""
 msgid "Label template is enabled"
 msgstr ""
 
+#: label/models.py:129
+msgid "Width [mm]"
+msgstr ""
+
 #: label/models.py:130
 msgid "Label width, specified in mm"
 msgstr ""
@@ -2263,24 +2361,24 @@ msgstr ""
 msgid "Purchase Order reference"
 msgstr ""
 
-#: order/forms.py:109
+#: order/forms.py:110
 msgid "Target date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/forms.py:137
+#: order/forms.py:138
 msgid "Enter sales order number"
 msgstr ""
 
-#: order/forms.py:143 order/models.py:448
+#: order/forms.py:145 order/models.py:452
 msgid ""
 "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/forms.py:233
+#: order/forms.py:235
 msgid "Enter stock item serial numbers"
 msgstr ""
 
-#: order/forms.py:239
+#: order/forms.py:241
 msgid "Enter quantity of stock items"
 msgstr ""
 
@@ -2296,137 +2394,183 @@ msgstr ""
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:117
+#: order/models.py:111 part/templates/part/detail.html:132
+msgid "Created By"
+msgstr ""
+
+#: order/models.py:118
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:122
+#: order/models.py:123
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:181 order/models.py:441
+#: order/models.py:182 order/models.py:445
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:189
+#: order/models.py:191
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:192
+#: order/models.py:194 order/templates/order/order_base.html:98
+#: templates/js/order.js:179
+msgid "Supplier Reference"
+msgstr ""
+
+#: order/models.py:194
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:203
+#: order/models.py:201
+msgid "received by"
+msgstr ""
+
+#: order/models.py:206
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:204
+#: order/models.py:207
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:209
+#: order/models.py:212
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:210
+#: order/models.py:213
 msgid ""
 "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:216
+#: order/models.py:219
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:240 order/models.py:339 part/views.py:1586
-#: stock/models.py:269 stock/models.py:948
+#: order/models.py:243 order/models.py:342 part/views.py:1586
+#: stock/models.py:270 stock/models.py:950
 msgid "Quantity must be greater than zero"
 msgstr ""
 
-#: order/models.py:245
+#: order/models.py:248
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:334
+#: order/models.py:337
 msgid "Lines can only be received against an order marked as 'Placed'"
 msgstr ""
 
-#: order/models.py:356
+#: order/models.py:359
 msgid "Received items"
 msgstr ""
 
-#: order/models.py:437
+#: order/models.py:441
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:443
+#: order/models.py:447
+msgid "Customer Reference "
+msgstr ""
+
+#: order/models.py:447
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:501
+#: order/models.py:455 templates/js/order.js:303
+msgid "Shipment Date"
+msgstr ""
+
+#: order/models.py:462
+msgid "shipped by"
+msgstr ""
+
+#: order/models.py:506
 msgid "SalesOrder cannot be shipped as it is not currently pending"
 msgstr ""
 
-#: order/models.py:588
+#: order/models.py:593
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:590
+#: order/models.py:595
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:592
+#: order/models.py:597
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:618 order/templates/order/order_base.html:9
+#: order/models.py:623 order/models.py:667
+#: part/templates/part/allocation.html:17
+#: part/templates/part/allocation.html:45
+msgid "Order"
+msgstr ""
+
+#: order/models.py:624 order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:24
 #: report/templates/report/inventree_po_report.html:77
 #: stock/templates/stock/item_base.html:309 templates/js/order.js:148
 msgid "Purchase Order"
 msgstr ""
 
-#: order/models.py:631
+#: order/models.py:638
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:634
+#: order/models.py:641 order/templates/order/order_base.html:131
+#: order/templates/order/purchase_order_detail.html:207
+#: order/templates/order/receive_parts.html:22
+#: order/templates/order/sales_order_base.html:131
+msgid "Received"
+msgstr ""
+
+#: order/models.py:641
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:641 stock/models.py:505
+#: order/models.py:648 stock/models.py:506
 #: stock/templates/stock/item_base.html:316
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:642
+#: order/models.py:649
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:736 order/models.py:738
+#: order/models.py:743 order/models.py:745
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:742
+#: order/models.py:749
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:744
+#: order/models.py:751
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:747
+#: order/models.py:754
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:757
+#: order/models.py:764
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:773
+#: order/models.py:769
+msgid "Line"
+msgstr ""
+
+#: order/models.py:780
+msgid "Item"
+msgstr ""
+
+#: order/models.py:781
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:776
+#: order/models.py:784
 msgid "Enter stock allocation quantity"
 msgstr ""
 
@@ -2469,27 +2613,25 @@ msgstr ""
 msgid "Order Status"
 msgstr ""
 
-#: order/templates/order/order_base.html:98 templates/js/order.js:179
-msgid "Supplier Reference"
-msgstr ""
-
 #: order/templates/order/order_base.html:117
 #: report/templates/report/inventree_build_order_base.html:122
 msgid "Issued"
 msgstr ""
 
-#: order/templates/order/order_base.html:131
-#: order/templates/order/purchase_order_detail.html:207
-#: order/templates/order/receive_parts.html:22
-#: order/templates/order/sales_order_base.html:131
-msgid "Received"
-msgstr ""
-
 #: order/templates/order/order_cancel.html:7
 #: order/templates/order/sales_order_cancel.html:9
 msgid "Cancelling this order means that the order will no longer be editable."
 msgstr ""
 
+#: order/templates/order/order_complete.html:7
+msgid "Mark this order as complete?"
+msgstr ""
+
+#: order/templates/order/order_issue.html:7
+msgid ""
+"After placing this purchase order, line items will no longer be editable."
+msgstr ""
+
 #: order/templates/order/order_notes.html:13
 msgid "Order Notes"
 msgstr ""
@@ -2668,11 +2810,16 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:75
 #: order/templates/order/sales_order_detail.html:157
 #: report/templates/report/inventree_test_report_base.html:75
-#: stock/models.py:417 stock/templates/stock/item_base.html:234
+#: stock/models.py:418 stock/templates/stock/item_base.html:234
 #: templates/js/build.js:418
 msgid "Serial Number"
 msgstr ""
 
+#: order/templates/order/sales_order_detail.html:92 templates/js/bom.js:338
+#: templates/js/build.js:571 templates/js/build.js:984
+msgid "Actions"
+msgstr ""
+
 #: order/templates/order/sales_order_detail.html:99 templates/js/build.js:459
 #: templates/js/build.js:789
 msgid "Edit stock allocation"
@@ -2683,8 +2830,16 @@ msgstr ""
 msgid "Delete stock allocation"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:229 order/views.py:1351
-#: templates/js/build.js:523 templates/js/build.js:785
+#: order/templates/order/sales_order_detail.html:170
+msgid "No matching line items"
+msgstr ""
+
+#: order/templates/order/sales_order_detail.html:199
+msgid "ID"
+msgstr ""
+
+#: order/templates/order/sales_order_detail.html:229 templates/js/build.js:523
+#: templates/js/build.js:785
 msgid "Allocated"
 msgstr ""
 
@@ -2852,6 +3007,11 @@ msgstr ""
 msgid "No lines specified"
 msgstr ""
 
+#: order/views.py:1060
+#, python-brace-format
+msgid "Ordered {n} parts"
+msgstr ""
+
 #: order/views.py:1117
 msgid "Supplier part must be specified"
 msgstr ""
@@ -2877,7 +3037,8 @@ msgid "Allocate Serial Numbers"
 msgstr ""
 
 #: order/views.py:1351
-msgid "items"
+#, python-brace-format
+msgid "Allocated {n} items"
 msgstr ""
 
 #: order/views.py:1367
@@ -2908,7 +3069,7 @@ msgstr ""
 msgid "Remove allocation"
 msgstr ""
 
-#: part/bom.py:138 part/models.py:72 part/models.py:761
+#: part/bom.py:138 part/models.py:72 part/models.py:762
 #: part/templates/part/category.html:62 part/templates/part/detail.html:90
 msgid "Default Location"
 msgstr ""
@@ -2930,11 +3091,11 @@ msgstr ""
 msgid "Error reading BOM file (incorrect row size)"
 msgstr ""
 
-#: part/forms.py:89 stock/forms.py:264
+#: part/forms.py:89 stock/forms.py:265
 msgid "File Format"
 msgstr ""
 
-#: part/forms.py:89 stock/forms.py:264
+#: part/forms.py:89 stock/forms.py:265
 msgid "Select output file format"
 msgstr ""
 
@@ -2978,7 +3139,7 @@ msgstr ""
 msgid "Include part supplier data in exported BOM"
 msgstr ""
 
-#: part/forms.py:120 part/models.py:2054
+#: part/forms.py:120 part/models.py:2057
 msgid "Parent Part"
 msgstr ""
 
@@ -2990,63 +3151,75 @@ msgstr ""
 msgid "Clear existing BOM items"
 msgstr ""
 
-#: part/forms.py:132
+#: part/forms.py:133
 msgid "Confirm BOM duplication"
 msgstr ""
 
-#: part/forms.py:150
+#: part/forms.py:151
+msgid "validate"
+msgstr ""
+
+#: part/forms.py:151
 msgid "Confirm that the BOM is correct"
 msgstr ""
 
-#: part/forms.py:162
+#: part/forms.py:163
+msgid "BOM file"
+msgstr ""
+
+#: part/forms.py:163
 msgid "Select BOM file to upload"
 msgstr ""
 
-#: part/forms.py:181
+#: part/forms.py:182
 msgid "Related Part"
 msgstr ""
 
-#: part/forms.py:200
+#: part/forms.py:201
 msgid "Select part category"
 msgstr ""
 
-#: part/forms.py:217
+#: part/forms.py:218
 msgid "Duplicate all BOM data for this part"
 msgstr ""
 
-#: part/forms.py:218
+#: part/forms.py:219
 msgid "Copy BOM"
 msgstr ""
 
-#: part/forms.py:223
+#: part/forms.py:224
 msgid "Duplicate all parameter data for this part"
 msgstr ""
 
-#: part/forms.py:224
+#: part/forms.py:225
 msgid "Copy Parameters"
 msgstr ""
 
-#: part/forms.py:229
+#: part/forms.py:230
 msgid "Confirm part creation"
 msgstr ""
 
-#: part/forms.py:234
+#: part/forms.py:235
 msgid "Include category parameter templates"
 msgstr ""
 
-#: part/forms.py:239
+#: part/forms.py:240
 msgid "Include parent categories parameter templates"
 msgstr ""
 
-#: part/forms.py:319
+#: part/forms.py:320
 msgid "Add parameter template to same level categories"
 msgstr ""
 
-#: part/forms.py:323
+#: part/forms.py:324
 msgid "Add parameter template to all categories"
 msgstr ""
 
-#: part/forms.py:368
+#: part/forms.py:342 part/models.py:2151
+msgid "Sub part"
+msgstr ""
+
+#: part/forms.py:370
 msgid "Input quantity for price calculation"
 msgstr ""
 
@@ -3062,7 +3235,7 @@ msgstr ""
 msgid "Default keywords for parts in this category"
 msgstr ""
 
-#: part/models.py:82 part/models.py:2099
+#: part/models.py:82 part/models.py:2103
 #: part/templates/part/part_app_base.html:9
 msgid "Part Category"
 msgstr ""
@@ -3132,7 +3305,7 @@ msgstr ""
 msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
-#: part/models.py:724 part/templates/part/detail.html:73
+#: part/models.py:724 part/models.py:2102 part/templates/part/detail.html:73
 #: part/templates/part/set_category.html:15 templates/js/part.js:384
 msgid "Category"
 msgstr ""
@@ -3159,243 +3332,262 @@ msgstr ""
 msgid "Revision"
 msgstr ""
 
-#: part/models.py:759
+#: part/models.py:760
 msgid "Where is this item normally stored?"
 msgstr ""
 
-#: part/models.py:806 part/templates/part/detail.html:97
+#: part/models.py:807 part/templates/part/detail.html:97
 msgid "Default Supplier"
 msgstr ""
 
-#: part/models.py:807
+#: part/models.py:808
 msgid "Default supplier part"
 msgstr ""
 
-#: part/models.py:814
+#: part/models.py:815
 msgid "Default Expiry"
 msgstr ""
 
-#: part/models.py:815
+#: part/models.py:816
 msgid "Expiry time (in days) for stock items of this part"
 msgstr ""
 
-#: part/models.py:820 part/templates/part/detail.html:113
+#: part/models.py:821 part/templates/part/detail.html:113
 msgid "Minimum Stock"
 msgstr ""
 
-#: part/models.py:821
+#: part/models.py:822
 msgid "Minimum allowed stock level"
 msgstr ""
 
-#: part/models.py:827 part/templates/part/detail.html:106
+#: part/models.py:828 part/models.py:2031 part/templates/part/detail.html:106
 #: part/templates/part/params.html:29
 msgid "Units"
 msgstr ""
 
-#: part/models.py:828
+#: part/models.py:829
 msgid "Stock keeping units for this part"
 msgstr ""
 
-#: part/models.py:834
+#: part/models.py:835
 msgid "Can this part be built from other parts?"
 msgstr ""
 
-#: part/models.py:840
+#: part/models.py:841
 msgid "Can this part be used to build other parts?"
 msgstr ""
 
-#: part/models.py:846
+#: part/models.py:847
 msgid "Does this part have tracking for unique items?"
 msgstr ""
 
-#: part/models.py:851
+#: part/models.py:852
 msgid "Can this part be purchased from external suppliers?"
 msgstr ""
 
-#: part/models.py:856
+#: part/models.py:857
 msgid "Can this part be sold to customers?"
 msgstr ""
 
-#: part/models.py:860 part/templates/part/detail.html:227
+#: part/models.py:861 part/templates/part/detail.html:227
 #: templates/js/table_filters.js:20 templates/js/table_filters.js:60
 #: templates/js/table_filters.js:214 templates/js/table_filters.js:283
 msgid "Active"
 msgstr ""
 
-#: part/models.py:861
+#: part/models.py:862
 msgid "Is this part active?"
 msgstr ""
 
-#: part/models.py:866
+#: part/models.py:867
 msgid "Is this a virtual part, such as a software product or license?"
 msgstr ""
 
-#: part/models.py:871
+#: part/models.py:872
 msgid "Part notes - supports Markdown formatting"
 msgstr ""
 
-#: part/models.py:874
+#: part/models.py:875
 msgid "BOM checksum"
 msgstr ""
 
-#: part/models.py:874
+#: part/models.py:875
 msgid "Stored BOM checksum"
 msgstr ""
 
-#: part/models.py:877
+#: part/models.py:878
 msgid "BOM checked by"
 msgstr ""
 
-#: part/models.py:879
+#: part/models.py:880
 msgid "BOM checked date"
 msgstr ""
 
-#: part/models.py:881 part/templates/part/detail.html:126
-#: templates/js/order.js:293
-msgid "Creation Date"
-msgstr ""
-
-#: part/models.py:883
+#: part/models.py:884
 msgid "Creation User"
 msgstr ""
 
-#: part/models.py:1927
+#: part/models.py:1929
 msgid "Test templates can only be created for trackable parts"
 msgstr ""
 
-#: part/models.py:1944
+#: part/models.py:1946
 msgid "Test with this name already exists for this part"
 msgstr ""
 
-#: part/models.py:1963 templates/js/part.js:561 templates/js/stock.js:104
+#: part/models.py:1966 templates/js/part.js:561 templates/js/stock.js:104
 msgid "Test Name"
 msgstr ""
 
-#: part/models.py:1964
+#: part/models.py:1967
 msgid "Enter a name for the test"
 msgstr ""
 
-#: part/models.py:1969
+#: part/models.py:1972
 msgid "Test Description"
 msgstr ""
 
-#: part/models.py:1970
+#: part/models.py:1973
 msgid "Enter description for this test"
 msgstr ""
 
-#: part/models.py:1975 templates/js/part.js:570
+#: part/models.py:1978 templates/js/part.js:570
 #: templates/js/table_filters.js:200
 msgid "Required"
 msgstr ""
 
-#: part/models.py:1976
+#: part/models.py:1979
 msgid "Is this test required to pass?"
 msgstr ""
 
-#: part/models.py:1981 templates/js/part.js:578
+#: part/models.py:1984 templates/js/part.js:578
 msgid "Requires Value"
 msgstr ""
 
-#: part/models.py:1982
+#: part/models.py:1985
 msgid "Does this test require a value when adding a test result?"
 msgstr ""
 
-#: part/models.py:1987 templates/js/part.js:585
+#: part/models.py:1990 templates/js/part.js:585
 msgid "Requires Attachment"
 msgstr ""
 
-#: part/models.py:1988
+#: part/models.py:1991
 msgid "Does this test require a file attachment when adding a test result?"
 msgstr ""
 
-#: part/models.py:2021
+#: part/models.py:2024
 msgid "Parameter template name must be unique"
 msgstr ""
 
-#: part/models.py:2026
+#: part/models.py:2029
 msgid "Parameter Name"
 msgstr ""
 
-#: part/models.py:2028
+#: part/models.py:2031
 msgid "Parameter Units"
 msgstr ""
 
-#: part/models.py:2056 part/models.py:2104
+#: part/models.py:2059 part/models.py:2108 part/models.py:2109
 #: templates/InvenTree/settings/category.html:62
 msgid "Parameter Template"
 msgstr ""
 
-#: part/models.py:2058
+#: part/models.py:2061
 msgid "Data"
 msgstr ""
 
-#: part/models.py:2058
+#: part/models.py:2061
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2108
+#: part/models.py:2113 templates/InvenTree/settings/category.html:67
+msgid "Default Value"
+msgstr ""
+
+#: part/models.py:2114
 msgid "Default Parameter Value"
 msgstr ""
 
-#: part/models.py:2136
+#: part/models.py:2143
 msgid "Select parent part"
 msgstr ""
 
-#: part/models.py:2144
+#: part/models.py:2152
 msgid "Select part to be used in BOM"
 msgstr ""
 
-#: part/models.py:2150
+#: part/models.py:2158
 msgid "BOM quantity for this BOM item"
 msgstr ""
 
-#: part/models.py:2152
+#: part/models.py:2160 templates/js/bom.js:216 templates/js/bom.js:269
+msgid "Optional"
+msgstr ""
+
+#: part/models.py:2160
 msgid "This BOM item is optional"
 msgstr ""
 
-#: part/models.py:2155
+#: part/models.py:2163
+msgid "Overage"
+msgstr ""
+
+#: part/models.py:2164
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr ""
 
-#: part/models.py:2158
+#: part/models.py:2167
 msgid "BOM item reference"
 msgstr ""
 
-#: part/models.py:2161
+#: part/models.py:2170
 msgid "BOM item notes"
 msgstr ""
 
-#: part/models.py:2163
+#: part/models.py:2172
+msgid "Checksum"
+msgstr ""
+
+#: part/models.py:2172
 msgid "BOM line checksum"
 msgstr ""
 
-#: part/models.py:2167 templates/js/bom.js:275 templates/js/bom.js:282
+#: part/models.py:2176 templates/js/bom.js:275 templates/js/bom.js:282
 #: templates/js/table_filters.js:50
 msgid "Inherited"
 msgstr ""
 
-#: part/models.py:2168
+#: part/models.py:2177
 msgid "This BOM item is inherited by BOMs for variant parts"
 msgstr ""
 
-#: part/models.py:2244 part/views.py:1592 part/views.py:1644
-#: stock/models.py:259
+#: part/models.py:2253 part/views.py:1592 part/views.py:1644
+#: stock/models.py:260
 msgid "Quantity must be integer value for trackable parts"
 msgstr ""
 
-#: part/models.py:2253 part/models.py:2255
+#: part/models.py:2262 part/models.py:2264
 msgid "Sub part must be specified"
 msgstr ""
 
-#: part/models.py:2258
+#: part/models.py:2267
 msgid "BOM Item"
 msgstr ""
 
-#: part/models.py:2379
+#: part/models.py:2384
+msgid "Part 1"
+msgstr ""
+
+#: part/models.py:2388
+msgid "Part 2"
+msgstr ""
+
+#: part/models.py:2388
 msgid "Select Related Part"
 msgstr ""
 
-#: part/models.py:2411
+#: part/models.py:2420
 msgid ""
 "Error creating relationship: check that the part is not related to itself "
 "and that the relationship is unique"
@@ -3405,23 +3597,6 @@ msgstr ""
 msgid "Part Stock Allocations"
 msgstr ""
 
-#: part/templates/part/allocation.html:17
-#: part/templates/part/allocation.html:45
-msgid "Order"
-msgstr ""
-
-#: part/templates/part/allocation.html:18
-#: part/templates/part/allocation.html:24
-#: part/templates/part/allocation.html:31
-#: part/templates/part/allocation.html:49
-#: stock/templates/stock/item_base.html:8
-#: stock/templates/stock/item_base.html:89
-#: stock/templates/stock/item_base.html:324
-#: stock/templates/stock/stock_adjust.html:16 templates/js/build.js:771
-#: templates/js/stock.js:923 templates/js/stock.js:1181
-msgid "Stock Item"
-msgstr ""
-
 #: part/templates/part/attachments.html:10
 msgid "Part Attachments"
 msgstr ""
@@ -3439,6 +3614,22 @@ msgstr ""
 msgid "Bill of Materials"
 msgstr ""
 
+#: part/templates/part/bom.html:19
+#, python-format
+msgid "The BOM for <i>%(part)s</i> has changed, and must be validated.<br>"
+msgstr ""
+
+#: part/templates/part/bom.html:21
+#, python-format
+msgid ""
+"The BOM for <i>%(part)s</i> was last checked by %(checker)s on %(check_date)s"
+msgstr ""
+
+#: part/templates/part/bom.html:25
+#, python-format
+msgid "The BOM for <i>%(part)s</i> has not been validated."
+msgstr ""
+
 #: part/templates/part/bom.html:32
 msgid "Remove selected BOM items"
 msgstr ""
@@ -3578,6 +3769,20 @@ msgstr ""
 msgid "Each part must already exist in the database"
 msgstr ""
 
+#: part/templates/part/bom_upload/upload_file.html:27
+msgid "Upload File"
+msgstr ""
+
+#: part/templates/part/bom_validate.html:6
+#, python-format
+msgid ""
+"Confirm that the Bill of Materials (BOM) is valid for:<br><i>%(part)s</i>"
+msgstr ""
+
+#: part/templates/part/bom_validate.html:9
+msgid "This will validate each line in the BOM."
+msgstr ""
+
 #: part/templates/part/build.html:10
 msgid "Part Builds"
 msgstr ""
@@ -3655,7 +3860,7 @@ msgstr ""
 msgid "Create new Part Category"
 msgstr ""
 
-#: part/templates/part/category.html:240 stock/views.py:1358
+#: part/templates/part/category.html:240 stock/views.py:1359
 msgid "Create new Stock Location"
 msgstr ""
 
@@ -3749,10 +3954,6 @@ msgstr ""
 msgid "Stock Expiry Time"
 msgstr ""
 
-#: part/templates/part/detail.html:132
-msgid "Created By"
-msgstr ""
-
 #: part/templates/part/detail.html:139
 msgid "Responsible User"
 msgstr ""
@@ -3874,7 +4075,7 @@ msgstr ""
 
 #: part/templates/part/params.html:28
 #: report/templates/report/inventree_test_report_base.html:90
-#: stock/models.py:1650 templates/InvenTree/settings/header.html:8
+#: stock/models.py:1652 templates/InvenTree/settings/header.html:8
 #: templates/js/stock.js:124
 msgid "Value"
 msgstr ""
@@ -3884,7 +4085,7 @@ msgid "Edit"
 msgstr ""
 
 #: part/templates/part/params.html:44 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 users/models.py:175
+#: part/templates/part/supplier.html:22 stock/views.py:1002 users/models.py:175
 msgid "Delete"
 msgstr ""
 
@@ -4376,18 +4577,26 @@ msgid "Sales order query filters"
 msgstr ""
 
 #: report/models.py:500
+msgid "Snippet"
+msgstr ""
+
+#: report/models.py:501
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:504
+#: report/models.py:505
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:539
+#: report/models.py:540
+msgid "Asset"
+msgstr ""
+
+#: report/models.py:541
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:542
+#: report/models.py:544
 msgid "Asset file description"
 msgstr ""
 
@@ -4409,12 +4618,12 @@ msgid "Test Results"
 msgstr ""
 
 #: report/templates/report/inventree_test_report_base.html:88
-#: stock/models.py:1638
+#: stock/models.py:1640
 msgid "Test"
 msgstr ""
 
 #: report/templates/report/inventree_test_report_base.html:89
-#: stock/models.py:1644
+#: stock/models.py:1646
 msgid "Result"
 msgstr ""
 
@@ -4431,301 +4640,345 @@ msgstr ""
 msgid "Fail"
 msgstr ""
 
-#: stock/forms.py:117
+#: stock/api.py:199
+#, python-brace-format
+msgid "Updated stock for {n} items"
+msgstr ""
+
+#: stock/api.py:268
+#, python-brace-format
+msgid "Moved {n} parts to {loc}"
+msgstr ""
+
+#: stock/forms.py:114 stock/forms.py:406 stock/models.py:473
+#: stock/templates/stock/item_base.html:349 templates/js/stock.js:652
+msgid "Expiry Date"
+msgstr ""
+
+#: stock/forms.py:115 stock/forms.py:407
+msgid "Expiration date for this stock item"
+msgstr ""
+
+#: stock/forms.py:118
 msgid "Enter unique serial numbers (or leave blank)"
 msgstr ""
 
-#: stock/forms.py:202 stock/forms.py:258
-msgid "Select test report template"
+#: stock/forms.py:169
+msgid ""
+"Destination for serialized stock (by default, will remain in current "
+"location)"
 msgstr ""
 
-#: stock/forms.py:266
-msgid "Include stock items in sub locations"
+#: stock/forms.py:171
+msgid "Serial numbers"
 msgstr ""
 
-#: stock/forms.py:301
-msgid "Stock item to install"
+#: stock/forms.py:171
+msgid "Unique serial numbers (must match quantity)"
 msgstr ""
 
-#: stock/forms.py:308
-msgid "Stock quantity to assign"
-msgstr ""
-
-#: stock/forms.py:336
-msgid "Must not exceed available quantity"
-msgstr ""
-
-#: stock/forms.py:346
-msgid "Destination location for uninstalled items"
-msgstr ""
-
-#: stock/forms.py:348
+#: stock/forms.py:173 stock/forms.py:349
 msgid "Add transaction note (optional)"
 msgstr ""
 
-#: stock/forms.py:350
+#: stock/forms.py:203 stock/forms.py:259
+msgid "Select test report template"
+msgstr ""
+
+#: stock/forms.py:267 templates/js/table_filters.js:111
+msgid "Include sublocations"
+msgstr ""
+
+#: stock/forms.py:267
+msgid "Include stock items in sub locations"
+msgstr ""
+
+#: stock/forms.py:302
+msgid "Stock item to install"
+msgstr ""
+
+#: stock/forms.py:309
+msgid "Stock quantity to assign"
+msgstr ""
+
+#: stock/forms.py:337
+msgid "Must not exceed available quantity"
+msgstr ""
+
+#: stock/forms.py:347
+msgid "Destination location for uninstalled items"
+msgstr ""
+
+#: stock/forms.py:351
 msgid "Confirm uninstall"
 msgstr ""
 
-#: stock/forms.py:350
+#: stock/forms.py:351
 msgid "Confirm removal of installed stock items"
 msgstr ""
 
-#: stock/forms.py:374
+#: stock/forms.py:375
 msgid "Destination stock location"
 msgstr ""
 
-#: stock/forms.py:376
+#: stock/forms.py:377
 msgid "Add note (required)"
 msgstr ""
 
-#: stock/forms.py:380 stock/views.py:852 stock/views.py:1050
+#: stock/forms.py:381 stock/views.py:852 stock/views.py:1051
 msgid "Confirm stock adjustment"
 msgstr ""
 
-#: stock/forms.py:380
+#: stock/forms.py:381
 msgid "Confirm movement of stock items"
 msgstr ""
 
-#: stock/forms.py:382
+#: stock/forms.py:383
 msgid "Set Default Location"
 msgstr ""
 
-#: stock/forms.py:382
+#: stock/forms.py:383
 msgid "Set the destination as the default location for selected parts"
 msgstr ""
 
-#: stock/models.py:204
+#: stock/models.py:54 stock/models.py:511
+msgid "Owner"
+msgstr ""
+
+#: stock/models.py:55 stock/models.py:512
+msgid "Select Owner"
+msgstr ""
+
+#: stock/models.py:205
 msgid "Created stock item"
 msgstr ""
 
-#: stock/models.py:240
+#: stock/models.py:241
 msgid "StockItem with this serial number already exists"
 msgstr ""
 
-#: stock/models.py:276
+#: stock/models.py:277
 #, python-brace-format
 msgid "Part type ('{pf}') must be {pe}"
 msgstr ""
 
-#: stock/models.py:286 stock/models.py:295
+#: stock/models.py:287 stock/models.py:296
 msgid "Quantity must be 1 for item with a serial number"
 msgstr ""
 
-#: stock/models.py:287
+#: stock/models.py:288
 msgid "Serial number cannot be set if quantity greater than 1"
 msgstr ""
 
-#: stock/models.py:309
+#: stock/models.py:310
 msgid "Item cannot belong to itself"
 msgstr ""
 
-#: stock/models.py:315
+#: stock/models.py:316
 msgid "Item must have a build reference if is_building=True"
 msgstr ""
 
-#: stock/models.py:322
+#: stock/models.py:323
 msgid "Build reference does not point to the same part object"
 msgstr ""
 
-#: stock/models.py:362
+#: stock/models.py:363
 msgid "Parent Stock Item"
 msgstr ""
 
-#: stock/models.py:371
+#: stock/models.py:372
 msgid "Base part"
 msgstr ""
 
-#: stock/models.py:380
+#: stock/models.py:381
 msgid "Select a matching supplier part for this stock item"
 msgstr ""
 
-#: stock/models.py:385 stock/templates/stock/stock_app_base.html:7
+#: stock/models.py:386 stock/templates/stock/stock_app_base.html:7
 msgid "Stock Location"
 msgstr ""
 
-#: stock/models.py:388
+#: stock/models.py:389
 msgid "Where is this stock item located?"
 msgstr ""
 
-#: stock/models.py:395
+#: stock/models.py:396
 msgid "Packaging this stock item is stored in"
 msgstr ""
 
-#: stock/models.py:400 stock/templates/stock/item_base.html:255
+#: stock/models.py:401 stock/templates/stock/item_base.html:255
 msgid "Installed In"
 msgstr ""
 
-#: stock/models.py:403
+#: stock/models.py:404
 msgid "Is this item installed in another item?"
 msgstr ""
 
-#: stock/models.py:419
+#: stock/models.py:420
 msgid "Serial number for this item"
 msgstr ""
 
-#: stock/models.py:431
+#: stock/models.py:432
 msgid "Batch code for this stock item"
 msgstr ""
 
-#: stock/models.py:435
+#: stock/models.py:436
 msgid "Stock Quantity"
 msgstr ""
 
-#: stock/models.py:444
+#: stock/models.py:445
 msgid "Source Build"
 msgstr ""
 
-#: stock/models.py:446
+#: stock/models.py:447
 msgid "Build for this stock item"
 msgstr ""
 
-#: stock/models.py:457
+#: stock/models.py:458
 msgid "Source Purchase Order"
 msgstr ""
 
-#: stock/models.py:460
+#: stock/models.py:461
 msgid "Purchase order for this stock item"
 msgstr ""
 
-#: stock/models.py:466
+#: stock/models.py:467
 msgid "Destination Sales Order"
 msgstr ""
 
-#: stock/models.py:472 stock/templates/stock/item_base.html:349
-#: templates/js/stock.js:652
-msgid "Expiry Date"
-msgstr ""
-
-#: stock/models.py:473
+#: stock/models.py:474
 msgid ""
 "Expiry date for stock item. Stock will be considered expired after this date"
 msgstr ""
 
-#: stock/models.py:486
+#: stock/models.py:487
+msgid "Delete on deplete"
+msgstr ""
+
+#: stock/models.py:487
 msgid "Delete this Stock Item when stock is depleted"
 msgstr ""
 
-#: stock/models.py:496 stock/templates/stock/item_notes.html:13
+#: stock/models.py:497 stock/templates/stock/item_notes.html:13
 #: stock/templates/stock/navbar.html:54
 msgid "Stock Item Notes"
 msgstr ""
 
-#: stock/models.py:506
+#: stock/models.py:507
 msgid "Single unit purchase price at time of purchase"
 msgstr ""
 
-#: stock/models.py:610
+#: stock/models.py:612
 msgid "Assigned to Customer"
 msgstr ""
 
-#: stock/models.py:612
+#: stock/models.py:614
 msgid "Manually assigned to customer"
 msgstr ""
 
-#: stock/models.py:625
+#: stock/models.py:627
 msgid "Returned from customer"
 msgstr ""
 
-#: stock/models.py:627
+#: stock/models.py:629
 msgid "Returned to location"
 msgstr ""
 
-#: stock/models.py:787
+#: stock/models.py:789
 msgid "Installed into stock item"
 msgstr ""
 
-#: stock/models.py:795
+#: stock/models.py:797
 msgid "Installed stock item"
 msgstr ""
 
-#: stock/models.py:819
+#: stock/models.py:821
 msgid "Uninstalled stock item"
 msgstr ""
 
-#: stock/models.py:838
+#: stock/models.py:840
 msgid "Uninstalled into location"
 msgstr ""
 
-#: stock/models.py:939
+#: stock/models.py:941
 msgid "Part is not set as trackable"
 msgstr ""
 
-#: stock/models.py:945
+#: stock/models.py:947
 msgid "Quantity must be integer"
 msgstr ""
 
-#: stock/models.py:951
+#: stock/models.py:953
 #, python-brace-format
 msgid "Quantity must not exceed available stock quantity ({n})"
 msgstr ""
 
-#: stock/models.py:954
+#: stock/models.py:956
 msgid "Serial numbers must be a list of integers"
 msgstr ""
 
-#: stock/models.py:957
+#: stock/models.py:959
 msgid "Quantity does not match serial numbers"
 msgstr ""
 
-#: stock/models.py:989
+#: stock/models.py:991
 msgid "Add serial number"
 msgstr ""
 
-#: stock/models.py:992
+#: stock/models.py:994
 #, python-brace-format
 msgid "Serialized {n} items"
 msgstr ""
 
-#: stock/models.py:1070
+#: stock/models.py:1072
 msgid "Split from existing stock"
 msgstr ""
 
-#: stock/models.py:1108
+#: stock/models.py:1110
 msgid "StockItem cannot be moved as it is not in stock"
 msgstr ""
 
-#: stock/models.py:1551
+#: stock/models.py:1553
 msgid "Title"
 msgstr ""
 
-#: stock/models.py:1551
+#: stock/models.py:1553
 msgid "Tracking entry title"
 msgstr ""
 
-#: stock/models.py:1553
+#: stock/models.py:1555
 msgid "Entry notes"
 msgstr ""
 
-#: stock/models.py:1555
+#: stock/models.py:1557
 msgid "Link to external page for further information"
 msgstr ""
 
-#: stock/models.py:1615
+#: stock/models.py:1617
 msgid "Value must be provided for this test"
 msgstr ""
 
-#: stock/models.py:1621
+#: stock/models.py:1623
 msgid "Attachment must be uploaded for this test"
 msgstr ""
 
-#: stock/models.py:1639
+#: stock/models.py:1641
 msgid "Test name"
 msgstr ""
 
-#: stock/models.py:1645 templates/js/table_filters.js:190
+#: stock/models.py:1647 templates/js/table_filters.js:190
 msgid "Test result"
 msgstr ""
 
-#: stock/models.py:1651
+#: stock/models.py:1653
 msgid "Test output value"
 msgstr ""
 
-#: stock/models.py:1658
+#: stock/models.py:1660
 msgid "Test result attachment"
 msgstr ""
 
-#: stock/models.py:1664
+#: stock/models.py:1666
 msgid "Test notes"
 msgstr ""
 
@@ -4888,11 +5141,6 @@ msgstr ""
 msgid "Barcode Identifier"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:302 templates/InvenTree/search.html:167
-#: templates/js/build.js:655 templates/navbar.html:29
-msgid "Build"
-msgstr ""
-
 #: stock/templates/stock/item_base.html:323
 msgid "Parent Item"
 msgstr ""
@@ -5070,7 +5318,7 @@ msgstr ""
 msgid "The following stock items will be uninstalled"
 msgstr ""
 
-#: stock/templates/stock/stockitem_convert.html:7 stock/views.py:1331
+#: stock/templates/stock/stockitem_convert.html:7 stock/views.py:1332
 msgid "Convert Stock Item"
 msgstr ""
 
@@ -5090,8 +5338,8 @@ msgstr ""
 msgid "Edit Stock Location"
 msgstr ""
 
-#: stock/views.py:230 stock/views.py:1321 stock/views.py:1432
-#: stock/views.py:1797
+#: stock/views.py:230 stock/views.py:1322 stock/views.py:1433
+#: stock/views.py:1798
 msgid "Owner is required (ownership control is enabled)"
 msgstr ""
 
@@ -5179,95 +5427,121 @@ msgstr ""
 msgid "Move Stock Items"
 msgstr ""
 
+#: stock/views.py:998
+msgid "Move"
+msgstr ""
+
 #: stock/views.py:999
 msgid "Count Stock Items"
 msgstr ""
 
+#: stock/views.py:999
+msgid "Count"
+msgstr ""
+
 #: stock/views.py:1000
 msgid "Remove From Stock"
 msgstr ""
 
+#: stock/views.py:1000
+msgid "Take"
+msgstr ""
+
 #: stock/views.py:1001
 msgid "Add Stock Items"
 msgstr ""
 
+#: stock/views.py:1001 users/models.py:171
+msgid "Add"
+msgstr ""
+
 #: stock/views.py:1002
 msgid "Delete Stock Items"
 msgstr ""
 
-#: stock/views.py:1030
+#: stock/views.py:1031
 msgid "Must enter integer value"
 msgstr ""
 
-#: stock/views.py:1035
+#: stock/views.py:1036
 msgid "Quantity must be positive"
 msgstr ""
 
-#: stock/views.py:1042
+#: stock/views.py:1043
 #, python-brace-format
 msgid "Quantity must not exceed {x}"
 msgstr ""
 
-#: stock/views.py:1106
+#: stock/views.py:1107
 msgid "No action performed"
 msgstr ""
 
-#: stock/views.py:1149
+#: stock/views.py:1122
+#, python-brace-format
+msgid "Added stock to {n} items"
+msgstr ""
+
+#: stock/views.py:1137
+#, python-brace-format
+msgid "Removed stock from {n} items"
+msgstr ""
+
+#: stock/views.py:1150
 #, python-brace-format
 msgid "Counted stock for {n} items"
 msgstr ""
 
-#: stock/views.py:1189
+#: stock/views.py:1190
 msgid "No items were moved"
 msgstr ""
 
-#: stock/views.py:1192
+#: stock/views.py:1193
 #, python-brace-format
 msgid "Moved {n} items to {dest}"
 msgstr ""
 
-#: stock/views.py:1211
+#: stock/views.py:1212
 #, python-brace-format
 msgid "Deleted {n} stock items"
 msgstr ""
 
-#: stock/views.py:1223
+#: stock/views.py:1224
 msgid "Edit Stock Item"
 msgstr ""
 
-#: stock/views.py:1449
+#: stock/views.py:1450
 msgid "Serialize Stock"
 msgstr ""
 
-#: stock/views.py:1542 templates/js/build.js:210
+#: stock/views.py:1543 templates/js/build.js:210
 msgid "Create new Stock Item"
 msgstr ""
 
-#: stock/views.py:1684
+#: stock/views.py:1685
 msgid "Duplicate Stock Item"
 msgstr ""
 
-#: stock/views.py:1766
+#: stock/views.py:1767
 msgid "Quantity cannot be negative"
 msgstr ""
 
-#: stock/views.py:1866
+#: stock/views.py:1867
 msgid "Delete Stock Location"
 msgstr ""
 
-#: stock/views.py:1879
+#: stock/views.py:1880
 msgid "Delete Stock Item"
 msgstr ""
 
-#: stock/views.py:1890
+#: stock/views.py:1891
 msgid "Delete Stock Tracking Entry"
 msgstr ""
 
-#: stock/views.py:1897
+#: stock/views.py:1898
 msgid "Edit Stock Tracking Entry"
 msgstr ""
 
-#: stock/views.py:1906
+#: stock/views.py:1907
 msgid "Add Stock Tracking Entry"
 msgstr ""
 
@@ -5371,10 +5645,6 @@ msgstr ""
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/category.html:67
-msgid "Default Value"
-msgstr ""
-
 #: templates/InvenTree/settings/category.html:70
 #: templates/InvenTree/settings/part.html:81
 msgid "Edit Template"
@@ -5683,10 +5953,6 @@ msgstr ""
 msgid "Open subassembly"
 msgstr ""
 
-#: templates/js/bom.js:216 templates/js/bom.js:269
-msgid "Optional"
-msgstr ""
-
 #: templates/js/bom.js:261
 msgid "No pricing available"
 msgstr ""
@@ -5695,10 +5961,6 @@ msgstr ""
 msgid "View BOM"
 msgstr ""
 
-#: templates/js/bom.js:338 templates/js/build.js:571 templates/js/build.js:984
-msgid "Actions"
-msgstr ""
-
 #: templates/js/bom.js:346
 msgid "Validate BOM Item"
 msgstr ""
@@ -5959,10 +6221,6 @@ msgstr ""
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/order.js:303
-msgid "Shipment Date"
-msgstr ""
-
 #: templates/js/part.js:51 templates/js/part.js:136
 msgid "Trackable part"
 msgstr ""
@@ -6282,10 +6540,6 @@ msgstr ""
 msgid "Item has been allocated"
 msgstr ""
 
-#: templates/js/table_filters.js:111
-msgid "Include sublocations"
-msgstr ""
-
 #: templates/js/table_filters.js:112
 msgid "Include stock in sublocations"
 msgstr ""
@@ -6483,10 +6737,6 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: templates/registration/login.html:76
-msgid "Enter password"
-msgstr ""
-
 #: templates/registration/login.html:83
 msgid "Username / password combination is incorrect"
 msgstr ""
@@ -6623,10 +6873,6 @@ msgstr ""
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:171
-msgid "Add"
-msgstr ""
-
 #: users/models.py:171
 msgid "Permission to add items"
 msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 7fe67bf929..bb954c049d 100644
--- a/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-03 02:10+0000\n"
+"POT-Creation-Date: 2021-04-04 20:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,32 +34,47 @@ msgstr ""
 msgid "Enter date"
 msgstr ""
 
-#: InvenTree/forms.py:110 build/forms.py:99 build/forms.py:187
+#: InvenTree/forms.py:110 build/forms.py:99 build/forms.py:120
+#: build/forms.py:142 build/forms.py:166 build/forms.py:188 build/forms.py:223
+#: order/forms.py:27 order/forms.py:38 order/forms.py:49 order/forms.py:60
+#: order/forms.py:71 part/forms.py:132
 msgid "Confirm"
 msgstr ""
 
 #: InvenTree/forms.py:126
+msgid "Confirm delete"
+msgstr ""
+
+#: InvenTree/forms.py:127
 msgid "Confirm item deletion"
 msgstr ""
 
-#: InvenTree/forms.py:158
+#: InvenTree/forms.py:159 templates/registration/login.html:76
+msgid "Enter password"
+msgstr ""
+
+#: InvenTree/forms.py:160
 msgid "Enter new password"
 msgstr ""
 
-#: InvenTree/forms.py:165
+#: InvenTree/forms.py:167
+msgid "Confirm password"
+msgstr ""
+
+#: InvenTree/forms.py:168
 msgid "Confirm new password"
 msgstr ""
 
-#: InvenTree/forms.py:200
+#: InvenTree/forms.py:203
 msgid "Apply Theme"
 msgstr ""
 
-#: InvenTree/forms.py:230
+#: InvenTree/forms.py:233
 msgid "Select Category"
 msgstr ""
 
-#: InvenTree/helpers.py:361 order/models.py:242 order/models.py:341
-#: stock/views.py:1762
+#: InvenTree/helpers.py:361 order/models.py:245 order/models.py:344
+#: stock/views.py:1763
 msgid "Invalid quantity provided"
 msgstr ""
 
@@ -91,7 +106,7 @@ msgstr ""
 msgid "Number of unique serial number ({s}) must match quantity ({q})"
 msgstr ""
 
-#: InvenTree/models.py:59 stock/models.py:1657
+#: InvenTree/models.py:59 stock/models.py:1659
 msgid "Attachment"
 msgstr ""
 
@@ -107,7 +122,7 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:68 InvenTree/models.py:69
+#: InvenTree/models.py:68 InvenTree/models.py:69 part/models.py:1888
 #: report/templates/report/inventree_test_report_base.html:91
 #: templates/js/stock.js:960
 msgid "User"
@@ -118,20 +133,21 @@ msgid "upload date"
 msgstr ""
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:101
-#: part/models.py:686 part/templates/part/params.html:27 report/models.py:179
-#: templates/InvenTree/search.html:136 templates/InvenTree/search.html:273
-#: templates/js/part.js:109
+#: part/models.py:686 part/models.py:2029 part/templates/part/params.html:27
+#: report/models.py:179 templates/InvenTree/search.html:136
+#: templates/InvenTree/search.html:273 templates/js/part.js:109
 msgid "Name"
 msgstr ""
 
 #: InvenTree/models.py:114 build/models.py:134
-#: build/templates/build/detail.html:21 company/models.py:359
+#: build/templates/build/detail.html:21 company/models.py:361
 #: company/templates/company/detail.html:26
 #: company/templates/company/supplier_part_base.html:70
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:108
-#: order/templates/order/purchase_order_detail.html:168 part/models.py:710
-#: part/templates/part/detail.html:54 part/templates/part/set_category.html:14
-#: report/models.py:192
+#: order/models.py:101 order/templates/order/purchase_order_detail.html:168
+#: part/models.py:710 part/templates/part/detail.html:54
+#: part/templates/part/set_category.html:14 report/models.py:192
+#: report/models.py:505 report/models.py:544
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:143 templates/InvenTree/search.html:208
 #: templates/InvenTree/search.html:280
@@ -246,7 +262,8 @@ msgid "Invalid character in part name"
 msgstr ""
 
 #: InvenTree/validators.py:63
-msgid "IPN must match regex pattern"
+#, python-brace-format
+msgid "IPN must match regex pattern {pat}"
 msgstr ""
 
 #: InvenTree/validators.py:77 InvenTree/validators.py:91
@@ -344,7 +361,7 @@ msgid "Order target date"
 msgstr ""
 
 #: build/forms.py:39 build/templates/build/build_base.html:104
-#: build/templates/build/detail.html:121
+#: build/templates/build/detail.html:121 order/forms.py:109 order/forms.py:144
 #: order/templates/order/order_base.html:124
 #: order/templates/order/sales_order_base.html:117
 #: report/templates/report/inventree_build_order_base.html:126
@@ -358,15 +375,20 @@ msgid ""
 "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/forms.py:45 build/forms.py:87
+#: build/forms.py:45 build/forms.py:87 build/forms.py:257 build/models.py:1103
 #: build/templates/build/auto_allocate.html:17
 #: build/templates/build/build_base.html:91
 #: build/templates/build/detail.html:31 common/models.py:696
 #: company/forms.py:131 company/templates/company/supplier_part_pricing.html:77
-#: order/forms.py:237 order/templates/order/order_wizard/select_parts.html:32
+#: order/forms.py:188 order/forms.py:205 order/forms.py:239 order/forms.py:261
+#: order/forms.py:278 order/models.py:593 order/models.py:784
+#: order/templates/order/order_wizard/select_parts.html:32
 #: order/templates/order/purchase_order_detail.html:193
+#: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:159
+#: order/templates/order/sales_order_detail.html:224 part/forms.py:340
+#: part/forms.py:369 part/forms.py:385 part/models.py:2158
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
 #: part/templates/part/part_pricing.html:12
@@ -376,7 +398,8 @@ msgstr ""
 #: report/templates/report/inventree_po_report.html:91
 #: report/templates/report/inventree_so_report.html:91
 #: report/templates/report/inventree_test_report_base.html:77
-#: stock/forms.py:307 stock/templates/stock/item_base.html:51
+#: stock/forms.py:175 stock/forms.py:308 stock/models.py:1563
+#: stock/templates/stock/item_base.html:51
 #: stock/templates/stock/item_base.html:57
 #: stock/templates/stock/item_base.html:240
 #: stock/templates/stock/stock_adjust.html:18 templates/js/barcode.js:364
@@ -393,7 +416,7 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/forms.py:92 order/forms.py:231 stock/forms.py:117
+#: build/forms.py:92 order/forms.py:233 stock/forms.py:118
 msgid "Serial Numbers"
 msgstr ""
 
@@ -405,39 +428,57 @@ msgstr ""
 msgid "Confirm creation of build output"
 msgstr ""
 
-#: build/forms.py:120
+#: build/forms.py:121
 msgid "Confirm deletion of build output"
 msgstr ""
 
-#: build/forms.py:141
+#: build/forms.py:142
 msgid "Confirm unallocation of stock"
 msgstr ""
 
-#: build/forms.py:165
+#: build/forms.py:166
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: build/forms.py:188
+#: build/forms.py:189
 msgid "Mark build as complete"
 msgstr ""
 
-#: build/forms.py:212
+#: build/forms.py:213 build/templates/build/auto_allocate.html:18
+#: order/forms.py:82 stock/forms.py:347
+#: stock/templates/stock/item_base.html:270
+#: stock/templates/stock/stock_adjust.html:17
+#: templates/InvenTree/search.html:244 templates/js/barcode.js:363
+#: templates/js/barcode.js:531 templates/js/build.js:434
+#: templates/js/stock.js:637
+msgid "Location"
+msgstr ""
+
+#: build/forms.py:214
 msgid "Location of completed parts"
 msgstr ""
 
-#: build/forms.py:217
-msgid "Confirm completion with incomplete stock allocation"
+#: build/forms.py:219
+msgid "Confirm incomplete"
 msgstr ""
 
 #: build/forms.py:220
+msgid "Confirm completion with incomplete stock allocation"
+msgstr ""
+
+#: build/forms.py:223
 msgid "Confirm build completion"
 msgstr ""
 
-#: build/forms.py:240 build/views.py:66
+#: build/forms.py:243
+msgid "Confirm cancel"
+msgstr ""
+
+#: build/forms.py:243 build/views.py:66
 msgid "Confirm build cancellation"
 msgstr ""
 
-#: build/forms.py:254
+#: build/forms.py:257
 msgid "Select quantity of stock to allocate"
 msgstr ""
 
@@ -462,7 +503,9 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:127 order/templates/order/purchase_order_detail.html:188
+#: build/models.py:127 order/models.py:99 order/models.py:595
+#: order/templates/order/purchase_order_detail.html:188
+#: order/templates/order/sales_order_detail.html:219 part/models.py:2167
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:509 templates/js/build.js:948
@@ -484,11 +527,15 @@ msgstr ""
 
 #: build/models.py:152 build/templates/build/auto_allocate.html:16
 #: build/templates/build/build_base.html:86
-#: build/templates/build/detail.html:26 order/models.py:662
+#: build/templates/build/detail.html:26 company/models.py:535
+#: order/models.py:637 order/models.py:669
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:156
-#: order/templates/order/receive_parts.html:19 part/models.py:321
-#: part/models.py:2054 part/templates/part/part_app_base.html:7
+#: order/templates/order/receive_parts.html:19
+#: order/templates/order/sales_order_detail.html:207 part/models.py:321
+#: part/models.py:1856 part/models.py:1868 part/models.py:1886
+#: part/models.py:1961 part/models.py:2057 part/models.py:2142
+#: part/templates/part/part_app_base.html:7
 #: part/templates/part/part_pricing.html:15 part/templates/part/related.html:29
 #: part/templates/part/set_category.html:13
 #: part/templates/part/subcategories.html:17
@@ -558,7 +605,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:212 stock/models.py:429
+#: build/models.py:212 stock/models.py:430
 msgid "Batch Code"
 msgstr ""
 
@@ -566,11 +613,16 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:223 order/models.py:447
+#: build/models.py:219 order/models.py:105 part/models.py:882
+#: part/templates/part/detail.html:126 templates/js/order.js:293
+msgid "Creation Date"
+msgstr ""
+
+#: build/models.py:223 order/models.py:451
 msgid "Target completion date"
 msgstr ""
 
-#: build/models.py:227 order/models.py:215
+#: build/models.py:227 order/models.py:218
 msgid "Completion Date"
 msgstr ""
 
@@ -587,9 +639,9 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:250 build/templates/build/build_base.html:142
-#: build/templates/build/detail.html:105 order/models.py:118
+#: build/templates/build/detail.html:105 order/models.py:119
 #: order/templates/order/order_base.html:138
-#: order/templates/order/sales_order_base.html:138 part/models.py:885
+#: order/templates/order/sales_order_base.html:138 part/models.py:886
 #: report/templates/report/inventree_build_order_base.html:159
 msgid "Responsible"
 msgstr ""
@@ -602,26 +654,28 @@ msgstr ""
 #: company/templates/company/supplier_part_base.html:77
 #: company/templates/company/supplier_part_detail.html:28
 #: part/templates/part/detail.html:83 part/templates/part/part_base.html:100
-#: stock/models.py:423 stock/templates/stock/item_base.html:330
+#: stock/models.py:424 stock/templates/stock/item_base.html:330
 msgid "External Link"
 msgstr ""
 
-#: build/models.py:257 part/models.py:744 stock/models.py:425
+#: build/models.py:257 part/models.py:744 stock/models.py:426
 msgid "Link to external URL"
 msgstr ""
 
 #: build/models.py:261 build/templates/build/navbar.html:59
-#: company/models.py:366 company/templates/company/navbar.html:59
-#: company/templates/company/navbar.html:62
-#: order/templates/order/po_navbar.html:29
+#: company/models.py:129 company/models.py:368
+#: company/templates/company/navbar.html:59
+#: company/templates/company/navbar.html:62 order/models.py:123
+#: order/models.py:597 order/templates/order/po_navbar.html:29
 #: order/templates/order/po_navbar.html:32
 #: order/templates/order/purchase_order_detail.html:227
+#: order/templates/order/sales_order_detail.html:264
 #: order/templates/order/so_navbar.html:33
-#: order/templates/order/so_navbar.html:36 part/models.py:870
+#: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:122
 #: report/templates/report/inventree_build_order_base.html:173
-#: stock/forms.py:316 stock/forms.py:348 stock/forms.py:376 stock/models.py:495
-#: stock/models.py:1553 stock/models.py:1663
+#: stock/forms.py:173 stock/forms.py:317 stock/forms.py:349 stock/forms.py:377
+#: stock/models.py:496 stock/models.py:1555 stock/models.py:1665
 #: stock/templates/stock/navbar.html:57 templates/js/barcode.js:37
 #: templates/js/bom.js:329 templates/js/stock.js:128 templates/js/stock.js:667
 msgid "Notes"
@@ -665,11 +719,11 @@ msgstr ""
 msgid "Allocated quantity ({n}) must not exceed available quantity ({q})"
 msgstr ""
 
-#: build/models.py:1034 order/models.py:751
+#: build/models.py:1034 order/models.py:758
 msgid "StockItem is over-allocated"
 msgstr ""
 
-#: build/models.py:1038 order/models.py:754
+#: build/models.py:1038 order/models.py:761
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -677,19 +731,41 @@ msgstr ""
 msgid "Quantity must be 1 for serialized stock"
 msgstr ""
 
-#: build/models.py:1082
+#: build/models.py:1082 stock/templates/stock/item_base.html:302
+#: templates/InvenTree/search.html:167 templates/js/build.js:655
+#: templates/navbar.html:29
+msgid "Build"
+msgstr ""
+
+#: build/models.py:1083
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1089
+#: build/models.py:1090 part/templates/part/allocation.html:18
+#: part/templates/part/allocation.html:24
+#: part/templates/part/allocation.html:31
+#: part/templates/part/allocation.html:49
+#: stock/templates/stock/item_base.html:8
+#: stock/templates/stock/item_base.html:89
+#: stock/templates/stock/item_base.html:324
+#: stock/templates/stock/stock_adjust.html:16 templates/js/build.js:771
+#: templates/js/stock.js:923 templates/js/stock.js:1181
+msgid "Stock Item"
+msgstr ""
+
+#: build/models.py:1091
 msgid "Source stock item"
 msgstr ""
 
-#: build/models.py:1101
+#: build/models.py:1104
 msgid "Stock quantity to allocate to build"
 msgstr ""
 
-#: build/models.py:1109
+#: build/models.py:1112
+msgid "Install into"
+msgstr ""
+
+#: build/models.py:1113
 msgid "Destination stock item"
 msgstr ""
 
@@ -757,15 +833,6 @@ msgid ""
 "The following stock items will be allocated to the specified build output"
 msgstr ""
 
-#: build/templates/build/auto_allocate.html:18 stock/forms.py:346
-#: stock/templates/stock/item_base.html:270
-#: stock/templates/stock/stock_adjust.html:17
-#: templates/InvenTree/search.html:244 templates/js/barcode.js:363
-#: templates/js/barcode.js:531 templates/js/build.js:434
-#: templates/js/stock.js:637
-msgid "Location"
-msgstr ""
-
 #: build/templates/build/auto_allocate.html:37
 msgid "No stock items found that can be automatically allocated to this build"
 msgstr ""
@@ -836,7 +903,7 @@ msgid "Build Details"
 msgstr ""
 
 #: build/templates/build/build_base.html:96
-#: build/templates/build/detail.html:59
+#: build/templates/build/detail.html:59 order/models.py:445
 #: order/templates/order/receive_parts.html:24
 #: stock/templates/stock/item_base.html:376 templates/InvenTree/search.html:236
 #: templates/js/barcode.js:119 templates/js/build.js:710
@@ -855,7 +922,7 @@ msgid "Progress"
 msgstr ""
 
 #: build/templates/build/build_base.html:128
-#: build/templates/build/detail.html:84 order/models.py:660
+#: build/templates/build/detail.html:84 order/models.py:667
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:33
 #: order/templates/order/sales_order_ship.html:25
@@ -966,7 +1033,7 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:46 stock/forms.py:374
+#: build/templates/build/detail.html:46 stock/forms.py:169 stock/forms.py:375
 msgid "Destination"
 msgstr ""
 
@@ -1099,7 +1166,7 @@ msgstr ""
 msgid "Create Build Output"
 msgstr ""
 
-#: build/views.py:203 stock/models.py:964 stock/views.py:1788
+#: build/views.py:203 stock/models.py:966 stock/views.py:1789
 msgid "Serial numbers already exist"
 msgstr ""
 
@@ -1237,7 +1304,7 @@ msgstr ""
 msgid "String descriptor for the server instance"
 msgstr ""
 
-#: common/models.py:62 company/models.py:95 company/models.py:96
+#: common/models.py:62 company/models.py:96 company/models.py:97
 msgid "Company name"
 msgstr ""
 
@@ -1341,8 +1408,8 @@ msgstr ""
 msgid "Number of recent parts to display on index page"
 msgstr ""
 
-#: common/models.py:150 part/models.py:2056 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:258 templates/js/table_filters.js:24
+#: common/models.py:150 part/models.py:2059 part/templates/part/detail.html:160
+#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:24
 #: templates/js/table_filters.js:288
 msgid "Template"
 msgstr ""
@@ -1351,7 +1418,7 @@ msgstr ""
 msgid "Parts are templates by default"
 msgstr ""
 
-#: common/models.py:157 part/models.py:833 part/templates/part/detail.html:170
+#: common/models.py:157 part/models.py:834 part/templates/part/detail.html:170
 #: templates/js/table_filters.js:101 templates/js/table_filters.js:300
 msgid "Assembly"
 msgstr ""
@@ -1360,7 +1427,7 @@ msgstr ""
 msgid "Parts can be assembled from other components by default"
 msgstr ""
 
-#: common/models.py:164 part/models.py:839 part/templates/part/detail.html:180
+#: common/models.py:164 part/models.py:840 part/templates/part/detail.html:180
 #: templates/js/table_filters.js:304
 msgid "Component"
 msgstr ""
@@ -1369,7 +1436,7 @@ msgstr ""
 msgid "Parts can be used as sub-components by default"
 msgstr ""
 
-#: common/models.py:171 part/models.py:850 part/templates/part/detail.html:200
+#: common/models.py:171 part/models.py:851 part/templates/part/detail.html:200
 msgid "Purchaseable"
 msgstr ""
 
@@ -1377,7 +1444,7 @@ msgstr ""
 msgid "Parts are purchaseable by default"
 msgstr ""
 
-#: common/models.py:178 part/models.py:855 part/templates/part/detail.html:210
+#: common/models.py:178 part/models.py:856 part/templates/part/detail.html:210
 #: templates/js/table_filters.js:312
 msgid "Salable"
 msgstr ""
@@ -1386,7 +1453,7 @@ msgstr ""
 msgid "Parts are salable by default"
 msgstr ""
 
-#: common/models.py:185 part/models.py:845 part/templates/part/detail.html:190
+#: common/models.py:185 part/models.py:846 part/templates/part/detail.html:190
 #: templates/js/table_filters.js:32 templates/js/table_filters.js:316
 msgid "Trackable"
 msgstr ""
@@ -1395,7 +1462,7 @@ msgstr ""
 msgid "Parts are trackable by default"
 msgstr ""
 
-#: common/models.py:192 part/models.py:865 part/templates/part/detail.html:150
+#: common/models.py:192 part/models.py:866 part/templates/part/detail.html:150
 #: templates/js/table_filters.js:28
 msgid "Virtual"
 msgstr ""
@@ -1585,12 +1652,12 @@ msgstr ""
 msgid "Supplied value must be a boolean"
 msgstr ""
 
-#: company/forms.py:37 company/models.py:137
+#: company/forms.py:37 company/models.py:139
 #: company/templates/company/detail.html:40
 msgid "Currency"
 msgstr ""
 
-#: company/forms.py:38 company/models.py:139
+#: company/forms.py:38 company/models.py:141
 msgid "Default currency used for this company"
 msgstr ""
 
@@ -1610,95 +1677,106 @@ msgstr ""
 msgid "Single quantity price"
 msgstr ""
 
-#: company/models.py:98
+#: company/models.py:99
 msgid "Company description"
 msgstr ""
 
-#: company/models.py:98
+#: company/models.py:99
 msgid "Description of the company"
 msgstr ""
 
-#: company/models.py:100 company/templates/company/company_base.html:70
+#: company/models.py:101 company/templates/company/company_base.html:70
 #: company/templates/company/detail.html:31 templates/js/company.js:60
 msgid "Website"
 msgstr ""
 
-#: company/models.py:100
+#: company/models.py:101
 msgid "Company website URL"
 msgstr ""
 
-#: company/models.py:103 company/templates/company/company_base.html:77
+#: company/models.py:104 company/templates/company/company_base.html:77
 msgid "Address"
 msgstr ""
 
-#: company/models.py:104
+#: company/models.py:105
 msgid "Company address"
 msgstr ""
 
-#: company/models.py:107
+#: company/models.py:108
 msgid "Phone number"
 msgstr ""
 
-#: company/models.py:108
+#: company/models.py:109
 msgid "Contact phone number"
 msgstr ""
 
-#: company/models.py:111 company/templates/company/company_base.html:91
+#: company/models.py:112 company/templates/company/company_base.html:91
 msgid "Email"
 msgstr ""
 
-#: company/models.py:111
+#: company/models.py:112
 msgid "Contact email address"
 msgstr ""
 
-#: company/models.py:114 company/templates/company/company_base.html:98
+#: company/models.py:115 company/templates/company/company_base.html:98
 msgid "Contact"
 msgstr ""
 
-#: company/models.py:115
+#: company/models.py:116
 msgid "Point of contact"
 msgstr ""
 
-#: company/models.py:117
+#: company/models.py:118 company/models.py:355 order/models.py:103
+#: part/models.py:743
+#: report/templates/report/inventree_build_order_base.html:165
+#: stock/models.py:1557 templates/js/company.js:208 templates/js/part.js:430
+msgid "Link"
+msgstr ""
+
+#: company/models.py:118
 msgid "Link to external company information"
 msgstr ""
 
-#: company/models.py:129
+#: company/models.py:126 part/models.py:753
+msgid "Image"
+msgstr ""
+
+#: company/models.py:131
 msgid "is customer"
 msgstr ""
 
-#: company/models.py:129
+#: company/models.py:131
 msgid "Do you sell items to this company?"
 msgstr ""
 
-#: company/models.py:131
+#: company/models.py:133
 msgid "is supplier"
 msgstr ""
 
-#: company/models.py:131
+#: company/models.py:133
 msgid "Do you purchase items from this company?"
 msgstr ""
 
-#: company/models.py:133
+#: company/models.py:135
 msgid "is manufacturer"
 msgstr ""
 
-#: company/models.py:133
+#: company/models.py:135
 msgid "Does this company manufacture parts?"
 msgstr ""
 
-#: company/models.py:313 stock/models.py:370
+#: company/models.py:315 stock/models.py:371
 #: stock/templates/stock/item_base.html:220
 msgid "Base Part"
 msgstr ""
 
-#: company/models.py:317 order/views.py:1372
+#: company/models.py:319 order/views.py:1372
 msgid "Select part"
 msgstr ""
 
-#: company/models.py:323 company/templates/company/detail.html:60
+#: company/models.py:325 company/templates/company/detail.html:60
 #: company/templates/company/supplier_part_base.html:83
-#: company/templates/company/supplier_part_detail.html:25
+#: company/templates/company/supplier_part_detail.html:25 order/models.py:190
 #: order/templates/order/order_base.html:92
 #: order/templates/order/order_wizard/select_pos.html:30 part/bom.py:170
 #: stock/templates/stock/item_base.html:337 templates/js/company.js:48
@@ -1706,81 +1784,83 @@ msgstr ""
 msgid "Supplier"
 msgstr ""
 
-#: company/models.py:324
+#: company/models.py:326
 msgid "Select supplier"
 msgstr ""
 
-#: company/models.py:329 company/templates/company/supplier_part_base.html:87
+#: company/models.py:331 company/templates/company/supplier_part_base.html:87
 #: company/templates/company/supplier_part_detail.html:26
 #: order/templates/order/purchase_order_detail.html:174 part/bom.py:171
 msgid "SKU"
 msgstr ""
 
-#: company/models.py:330
+#: company/models.py:332
 msgid "Supplier stock keeping unit"
 msgstr ""
 
-#: company/models.py:340 company/templates/company/detail.html:55
+#: company/models.py:342 company/templates/company/detail.html:55
 #: company/templates/company/supplier_part_base.html:93
 #: company/templates/company/supplier_part_detail.html:34 part/bom.py:172
 #: templates/js/company.js:44 templates/js/company.js:188
 msgid "Manufacturer"
 msgstr ""
 
-#: company/models.py:341
+#: company/models.py:343
 msgid "Select manufacturer"
 msgstr ""
 
-#: company/models.py:347 company/templates/company/supplier_part_base.html:99
+#: company/models.py:349 company/templates/company/supplier_part_base.html:99
 #: company/templates/company/supplier_part_detail.html:35
 #: order/templates/order/purchase_order_detail.html:183 part/bom.py:173
 #: templates/js/company.js:204
 msgid "MPN"
 msgstr ""
 
-#: company/models.py:348
+#: company/models.py:350
 msgid "Manufacturer part number"
 msgstr ""
 
-#: company/models.py:353 part/models.py:743
-#: report/templates/report/inventree_build_order_base.html:165
-#: stock/models.py:1555 templates/js/company.js:208 templates/js/part.js:430
-msgid "Link"
-msgstr ""
-
-#: company/models.py:354
+#: company/models.py:356
 msgid "URL for external supplier part link"
 msgstr ""
 
-#: company/models.py:360
+#: company/models.py:362
 msgid "Supplier part description"
 msgstr ""
 
-#: company/models.py:365 company/templates/company/supplier_part_base.html:113
-#: company/templates/company/supplier_part_detail.html:38
+#: company/models.py:367 company/templates/company/supplier_part_base.html:113
+#: company/templates/company/supplier_part_detail.html:38 part/models.py:2170
 #: report/templates/report/inventree_po_report.html:93
 #: report/templates/report/inventree_so_report.html:93
 msgid "Note"
 msgstr ""
 
-#: company/models.py:369
+#: company/models.py:371
+msgid "base cost"
+msgstr ""
+
+#: company/models.py:371
 msgid "Minimum charge (e.g. stocking fee)"
 msgstr ""
 
-#: company/models.py:371 company/templates/company/supplier_part_base.html:106
-#: stock/models.py:394 stock/templates/stock/item_base.html:295
+#: company/models.py:373 company/templates/company/supplier_part_base.html:106
+#: stock/models.py:395 stock/templates/stock/item_base.html:295
 #: templates/js/stock.js:663
 msgid "Packaging"
 msgstr ""
 
-#: company/models.py:371
+#: company/models.py:373
 msgid "Part packaging"
 msgstr ""
 
-#: company/models.py:373
+#: company/models.py:375
 msgid "multiple"
 msgstr ""
 
+#: company/models.py:375
+msgid "Order multiple"
+msgstr ""
+
 #: company/templates/company/assigned_stock.html:10
 #: company/templates/company/navbar.html:51
 #: company/templates/company/navbar.html:54 templates/js/build.js:411
@@ -1825,6 +1905,19 @@ msgstr ""
 msgid "Phone"
 msgstr ""
 
+#: company/templates/company/delete.html:7
+#, python-format
+msgid "Are you sure you want to delete company '%(name)s'?"
+msgstr ""
+
+#: company/templates/company/delete.html:12
+#, python-format
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
+"If this supplier is deleted, these supplier part entries will also be "
+"deleted."
+msgstr ""
+
 #: company/templates/company/detail.html:21
 msgid "Company Name"
 msgstr ""
@@ -1837,9 +1930,9 @@ msgstr ""
 msgid "Uses default currency"
 msgstr ""
 
-#: company/templates/company/detail.html:65
-#: order/templates/order/sales_order_base.html:92 stock/models.py:412
-#: stock/models.py:413 stock/templates/stock/item_base.html:247
+#: company/templates/company/detail.html:65 order/models.py:440
+#: order/templates/order/sales_order_base.html:92 stock/models.py:413
+#: stock/models.py:414 stock/templates/stock/item_base.html:247
 #: templates/js/company.js:40 templates/js/order.js:267
 msgid "Customer"
 msgstr ""
@@ -1850,6 +1943,7 @@ msgid "Supplier Parts"
 msgstr ""
 
 #: company/templates/company/detail_part.html:20
+#: order/templates/order/order_wizard/select_parts.html:42
 #: order/templates/order/purchase_order_detail.html:75
 msgid "Create new supplier part"
 msgstr ""
@@ -1889,13 +1983,13 @@ msgid "Create new Part"
 msgstr ""
 
 #: company/templates/company/detail_part.html:72 company/views.py:62
-#: order/templates/order/purchase_orders.html:182
+#: order/templates/order/purchase_orders.html:183
 #: part/templates/part/supplier.html:50
 msgid "New Supplier"
 msgstr ""
 
 #: company/templates/company/detail_part.html:73 company/views.py:279
-#: order/templates/order/purchase_orders.html:183
+#: order/templates/order/purchase_orders.html:184
 msgid "Create new Supplier"
 msgstr ""
 
@@ -2035,7 +2129,7 @@ msgid "New Sales Order"
 msgstr ""
 
 #: company/templates/company/supplier_part_base.html:6
-#: company/templates/company/supplier_part_base.html:19 stock/models.py:379
+#: company/templates/company/supplier_part_base.html:19 stock/models.py:380
 #: stock/templates/stock/item_base.html:342 templates/js/company.js:180
 msgid "Supplier Part"
 msgstr ""
@@ -2109,7 +2203,7 @@ msgstr ""
 msgid "Customers"
 msgstr ""
 
-#: company/views.py:76 order/templates/order/sales_orders.html:184
+#: company/views.py:76 order/templates/order/sales_orders.html:185
 msgid "New Customer"
 msgstr ""
 
@@ -2149,7 +2243,7 @@ msgstr ""
 msgid "Edited company information"
 msgstr ""
 
-#: company/views.py:285 order/templates/order/sales_orders.html:185
+#: company/views.py:285 order/templates/order/sales_orders.html:186
 msgid "Create new Customer"
 msgstr ""
 
@@ -2201,7 +2295,7 @@ msgstr ""
 msgid "Label description"
 msgstr ""
 
-#: label/models.py:116 stock/forms.py:201
+#: label/models.py:116 stock/forms.py:202
 msgid "Label"
 msgstr ""
 
@@ -2217,6 +2311,10 @@ msgstr ""
 msgid "Label template is enabled"
 msgstr ""
 
+#: label/models.py:129
+msgid "Width [mm]"
+msgstr ""
+
 #: label/models.py:130
 msgid "Label width, specified in mm"
 msgstr ""
@@ -2263,24 +2361,24 @@ msgstr ""
 msgid "Purchase Order reference"
 msgstr ""
 
-#: order/forms.py:109
+#: order/forms.py:110
 msgid "Target date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/forms.py:137
+#: order/forms.py:138
 msgid "Enter sales order number"
 msgstr ""
 
-#: order/forms.py:143 order/models.py:448
+#: order/forms.py:145 order/models.py:452
 msgid ""
 "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/forms.py:233
+#: order/forms.py:235
 msgid "Enter stock item serial numbers"
 msgstr ""
 
-#: order/forms.py:239
+#: order/forms.py:241
 msgid "Enter quantity of stock items"
 msgstr ""
 
@@ -2296,137 +2394,183 @@ msgstr ""
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:117
+#: order/models.py:111 part/templates/part/detail.html:132
+msgid "Created By"
+msgstr ""
+
+#: order/models.py:118
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:122
+#: order/models.py:123
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:181 order/models.py:441
+#: order/models.py:182 order/models.py:445
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:189
+#: order/models.py:191
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:192
+#: order/models.py:194 order/templates/order/order_base.html:98
+#: templates/js/order.js:179
+msgid "Supplier Reference"
+msgstr ""
+
+#: order/models.py:194
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:203
+#: order/models.py:201
+msgid "received by"
+msgstr ""
+
+#: order/models.py:206
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:204
+#: order/models.py:207
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:209
+#: order/models.py:212
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:210
+#: order/models.py:213
 msgid ""
 "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:216
+#: order/models.py:219
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:240 order/models.py:339 part/views.py:1586
-#: stock/models.py:269 stock/models.py:948
+#: order/models.py:243 order/models.py:342 part/views.py:1586
+#: stock/models.py:270 stock/models.py:950
 msgid "Quantity must be greater than zero"
 msgstr ""
 
-#: order/models.py:245
+#: order/models.py:248
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:334
+#: order/models.py:337
 msgid "Lines can only be received against an order marked as 'Placed'"
 msgstr ""
 
-#: order/models.py:356
+#: order/models.py:359
 msgid "Received items"
 msgstr ""
 
-#: order/models.py:437
+#: order/models.py:441
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:443
+#: order/models.py:447
+msgid "Customer Reference "
+msgstr ""
+
+#: order/models.py:447
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:501
+#: order/models.py:455 templates/js/order.js:303
+msgid "Shipment Date"
+msgstr ""
+
+#: order/models.py:462
+msgid "shipped by"
+msgstr ""
+
+#: order/models.py:506
 msgid "SalesOrder cannot be shipped as it is not currently pending"
 msgstr ""
 
-#: order/models.py:588
+#: order/models.py:593
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:590
+#: order/models.py:595
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:592
+#: order/models.py:597
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:618 order/templates/order/order_base.html:9
+#: order/models.py:623 order/models.py:667
+#: part/templates/part/allocation.html:17
+#: part/templates/part/allocation.html:45
+msgid "Order"
+msgstr ""
+
+#: order/models.py:624 order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:24
 #: report/templates/report/inventree_po_report.html:77
 #: stock/templates/stock/item_base.html:309 templates/js/order.js:148
 msgid "Purchase Order"
 msgstr ""
 
-#: order/models.py:631
+#: order/models.py:638
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:634
+#: order/models.py:641 order/templates/order/order_base.html:131
+#: order/templates/order/purchase_order_detail.html:207
+#: order/templates/order/receive_parts.html:22
+#: order/templates/order/sales_order_base.html:131
+msgid "Received"
+msgstr ""
+
+#: order/models.py:641
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:641 stock/models.py:505
+#: order/models.py:648 stock/models.py:506
 #: stock/templates/stock/item_base.html:316
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:642
+#: order/models.py:649
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:736 order/models.py:738
+#: order/models.py:743 order/models.py:745
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:742
+#: order/models.py:749
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:744
+#: order/models.py:751
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:747
+#: order/models.py:754
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:757
+#: order/models.py:764
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:773
+#: order/models.py:769
+msgid "Line"
+msgstr ""
+
+#: order/models.py:780
+msgid "Item"
+msgstr ""
+
+#: order/models.py:781
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:776
+#: order/models.py:784
 msgid "Enter stock allocation quantity"
 msgstr ""
 
@@ -2469,27 +2613,25 @@ msgstr ""
 msgid "Order Status"
 msgstr ""
 
-#: order/templates/order/order_base.html:98 templates/js/order.js:179
-msgid "Supplier Reference"
-msgstr ""
-
 #: order/templates/order/order_base.html:117
 #: report/templates/report/inventree_build_order_base.html:122
 msgid "Issued"
 msgstr ""
 
-#: order/templates/order/order_base.html:131
-#: order/templates/order/purchase_order_detail.html:207
-#: order/templates/order/receive_parts.html:22
-#: order/templates/order/sales_order_base.html:131
-msgid "Received"
-msgstr ""
-
 #: order/templates/order/order_cancel.html:7
 #: order/templates/order/sales_order_cancel.html:9
 msgid "Cancelling this order means that the order will no longer be editable."
 msgstr ""
 
+#: order/templates/order/order_complete.html:7
+msgid "Mark this order as complete?"
+msgstr ""
+
+#: order/templates/order/order_issue.html:7
+msgid ""
+"After placing this purchase order, line items will no longer be editable."
+msgstr ""
+
 #: order/templates/order/order_notes.html:13
 msgid "Order Notes"
 msgstr ""
@@ -2668,11 +2810,16 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:75
 #: order/templates/order/sales_order_detail.html:157
 #: report/templates/report/inventree_test_report_base.html:75
-#: stock/models.py:417 stock/templates/stock/item_base.html:234
+#: stock/models.py:418 stock/templates/stock/item_base.html:234
 #: templates/js/build.js:418
 msgid "Serial Number"
 msgstr ""
 
+#: order/templates/order/sales_order_detail.html:92 templates/js/bom.js:338
+#: templates/js/build.js:571 templates/js/build.js:984
+msgid "Actions"
+msgstr ""
+
 #: order/templates/order/sales_order_detail.html:99 templates/js/build.js:459
 #: templates/js/build.js:789
 msgid "Edit stock allocation"
@@ -2683,8 +2830,16 @@ msgstr ""
 msgid "Delete stock allocation"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:229 order/views.py:1351
-#: templates/js/build.js:523 templates/js/build.js:785
+#: order/templates/order/sales_order_detail.html:170
+msgid "No matching line items"
+msgstr ""
+
+#: order/templates/order/sales_order_detail.html:199
+msgid "ID"
+msgstr ""
+
+#: order/templates/order/sales_order_detail.html:229 templates/js/build.js:523
+#: templates/js/build.js:785
 msgid "Allocated"
 msgstr ""
 
@@ -2852,6 +3007,11 @@ msgstr ""
 msgid "No lines specified"
 msgstr ""
 
+#: order/views.py:1060
+#, python-brace-format
+msgid "Ordered {n} parts"
+msgstr ""
+
 #: order/views.py:1117
 msgid "Supplier part must be specified"
 msgstr ""
@@ -2877,7 +3037,8 @@ msgid "Allocate Serial Numbers"
 msgstr ""
 
 #: order/views.py:1351
-msgid "items"
+#, python-brace-format
+msgid "Allocated {n} items"
 msgstr ""
 
 #: order/views.py:1367
@@ -2908,7 +3069,7 @@ msgstr ""
 msgid "Remove allocation"
 msgstr ""
 
-#: part/bom.py:138 part/models.py:72 part/models.py:761
+#: part/bom.py:138 part/models.py:72 part/models.py:762
 #: part/templates/part/category.html:62 part/templates/part/detail.html:90
 msgid "Default Location"
 msgstr ""
@@ -2930,11 +3091,11 @@ msgstr ""
 msgid "Error reading BOM file (incorrect row size)"
 msgstr ""
 
-#: part/forms.py:89 stock/forms.py:264
+#: part/forms.py:89 stock/forms.py:265
 msgid "File Format"
 msgstr ""
 
-#: part/forms.py:89 stock/forms.py:264
+#: part/forms.py:89 stock/forms.py:265
 msgid "Select output file format"
 msgstr ""
 
@@ -2978,7 +3139,7 @@ msgstr ""
 msgid "Include part supplier data in exported BOM"
 msgstr ""
 
-#: part/forms.py:120 part/models.py:2054
+#: part/forms.py:120 part/models.py:2057
 msgid "Parent Part"
 msgstr ""
 
@@ -2990,63 +3151,75 @@ msgstr ""
 msgid "Clear existing BOM items"
 msgstr ""
 
-#: part/forms.py:132
+#: part/forms.py:133
 msgid "Confirm BOM duplication"
 msgstr ""
 
-#: part/forms.py:150
+#: part/forms.py:151
+msgid "validate"
+msgstr ""
+
+#: part/forms.py:151
 msgid "Confirm that the BOM is correct"
 msgstr ""
 
-#: part/forms.py:162
+#: part/forms.py:163
+msgid "BOM file"
+msgstr ""
+
+#: part/forms.py:163
 msgid "Select BOM file to upload"
 msgstr ""
 
-#: part/forms.py:181
+#: part/forms.py:182
 msgid "Related Part"
 msgstr ""
 
-#: part/forms.py:200
+#: part/forms.py:201
 msgid "Select part category"
 msgstr ""
 
-#: part/forms.py:217
+#: part/forms.py:218
 msgid "Duplicate all BOM data for this part"
 msgstr ""
 
-#: part/forms.py:218
+#: part/forms.py:219
 msgid "Copy BOM"
 msgstr ""
 
-#: part/forms.py:223
+#: part/forms.py:224
 msgid "Duplicate all parameter data for this part"
 msgstr ""
 
-#: part/forms.py:224
+#: part/forms.py:225
 msgid "Copy Parameters"
 msgstr ""
 
-#: part/forms.py:229
+#: part/forms.py:230
 msgid "Confirm part creation"
 msgstr ""
 
-#: part/forms.py:234
+#: part/forms.py:235
 msgid "Include category parameter templates"
 msgstr ""
 
-#: part/forms.py:239
+#: part/forms.py:240
 msgid "Include parent categories parameter templates"
 msgstr ""
 
-#: part/forms.py:319
+#: part/forms.py:320
 msgid "Add parameter template to same level categories"
 msgstr ""
 
-#: part/forms.py:323
+#: part/forms.py:324
 msgid "Add parameter template to all categories"
 msgstr ""
 
-#: part/forms.py:368
+#: part/forms.py:342 part/models.py:2151
+msgid "Sub part"
+msgstr ""
+
+#: part/forms.py:370
 msgid "Input quantity for price calculation"
 msgstr ""
 
@@ -3062,7 +3235,7 @@ msgstr ""
 msgid "Default keywords for parts in this category"
 msgstr ""
 
-#: part/models.py:82 part/models.py:2099
+#: part/models.py:82 part/models.py:2103
 #: part/templates/part/part_app_base.html:9
 msgid "Part Category"
 msgstr ""
@@ -3132,7 +3305,7 @@ msgstr ""
 msgid "Part keywords to improve visibility in search results"
 msgstr ""
 
-#: part/models.py:724 part/templates/part/detail.html:73
+#: part/models.py:724 part/models.py:2102 part/templates/part/detail.html:73
 #: part/templates/part/set_category.html:15 templates/js/part.js:384
 msgid "Category"
 msgstr ""
@@ -3159,243 +3332,262 @@ msgstr ""
 msgid "Revision"
 msgstr ""
 
-#: part/models.py:759
+#: part/models.py:760
 msgid "Where is this item normally stored?"
 msgstr ""
 
-#: part/models.py:806 part/templates/part/detail.html:97
+#: part/models.py:807 part/templates/part/detail.html:97
 msgid "Default Supplier"
 msgstr ""
 
-#: part/models.py:807
+#: part/models.py:808
 msgid "Default supplier part"
 msgstr ""
 
-#: part/models.py:814
+#: part/models.py:815
 msgid "Default Expiry"
 msgstr ""
 
-#: part/models.py:815
+#: part/models.py:816
 msgid "Expiry time (in days) for stock items of this part"
 msgstr ""
 
-#: part/models.py:820 part/templates/part/detail.html:113
+#: part/models.py:821 part/templates/part/detail.html:113
 msgid "Minimum Stock"
 msgstr ""
 
-#: part/models.py:821
+#: part/models.py:822
 msgid "Minimum allowed stock level"
 msgstr ""
 
-#: part/models.py:827 part/templates/part/detail.html:106
+#: part/models.py:828 part/models.py:2031 part/templates/part/detail.html:106
 #: part/templates/part/params.html:29
 msgid "Units"
 msgstr ""
 
-#: part/models.py:828
+#: part/models.py:829
 msgid "Stock keeping units for this part"
 msgstr ""
 
-#: part/models.py:834
+#: part/models.py:835
 msgid "Can this part be built from other parts?"
 msgstr ""
 
-#: part/models.py:840
+#: part/models.py:841
 msgid "Can this part be used to build other parts?"
 msgstr ""
 
-#: part/models.py:846
+#: part/models.py:847
 msgid "Does this part have tracking for unique items?"
 msgstr ""
 
-#: part/models.py:851
+#: part/models.py:852
 msgid "Can this part be purchased from external suppliers?"
 msgstr ""
 
-#: part/models.py:856
+#: part/models.py:857
 msgid "Can this part be sold to customers?"
 msgstr ""
 
-#: part/models.py:860 part/templates/part/detail.html:227
+#: part/models.py:861 part/templates/part/detail.html:227
 #: templates/js/table_filters.js:20 templates/js/table_filters.js:60
 #: templates/js/table_filters.js:214 templates/js/table_filters.js:283
 msgid "Active"
 msgstr ""
 
-#: part/models.py:861
+#: part/models.py:862
 msgid "Is this part active?"
 msgstr ""
 
-#: part/models.py:866
+#: part/models.py:867
 msgid "Is this a virtual part, such as a software product or license?"
 msgstr ""
 
-#: part/models.py:871
+#: part/models.py:872
 msgid "Part notes - supports Markdown formatting"
 msgstr ""
 
-#: part/models.py:874
+#: part/models.py:875
 msgid "BOM checksum"
 msgstr ""
 
-#: part/models.py:874
+#: part/models.py:875
 msgid "Stored BOM checksum"
 msgstr ""
 
-#: part/models.py:877
+#: part/models.py:878
 msgid "BOM checked by"
 msgstr ""
 
-#: part/models.py:879
+#: part/models.py:880
 msgid "BOM checked date"
 msgstr ""
 
-#: part/models.py:881 part/templates/part/detail.html:126
-#: templates/js/order.js:293
-msgid "Creation Date"
-msgstr ""
-
-#: part/models.py:883
+#: part/models.py:884
 msgid "Creation User"
 msgstr ""
 
-#: part/models.py:1927
+#: part/models.py:1929
 msgid "Test templates can only be created for trackable parts"
 msgstr ""
 
-#: part/models.py:1944
+#: part/models.py:1946
 msgid "Test with this name already exists for this part"
 msgstr ""
 
-#: part/models.py:1963 templates/js/part.js:561 templates/js/stock.js:104
+#: part/models.py:1966 templates/js/part.js:561 templates/js/stock.js:104
 msgid "Test Name"
 msgstr ""
 
-#: part/models.py:1964
+#: part/models.py:1967
 msgid "Enter a name for the test"
 msgstr ""
 
-#: part/models.py:1969
+#: part/models.py:1972
 msgid "Test Description"
 msgstr ""
 
-#: part/models.py:1970
+#: part/models.py:1973
 msgid "Enter description for this test"
 msgstr ""
 
-#: part/models.py:1975 templates/js/part.js:570
+#: part/models.py:1978 templates/js/part.js:570
 #: templates/js/table_filters.js:200
 msgid "Required"
 msgstr ""
 
-#: part/models.py:1976
+#: part/models.py:1979
 msgid "Is this test required to pass?"
 msgstr ""
 
-#: part/models.py:1981 templates/js/part.js:578
+#: part/models.py:1984 templates/js/part.js:578
 msgid "Requires Value"
 msgstr ""
 
-#: part/models.py:1982
+#: part/models.py:1985
 msgid "Does this test require a value when adding a test result?"
 msgstr ""
 
-#: part/models.py:1987 templates/js/part.js:585
+#: part/models.py:1990 templates/js/part.js:585
 msgid "Requires Attachment"
 msgstr ""
 
-#: part/models.py:1988
+#: part/models.py:1991
 msgid "Does this test require a file attachment when adding a test result?"
 msgstr ""
 
-#: part/models.py:2021
+#: part/models.py:2024
 msgid "Parameter template name must be unique"
 msgstr ""
 
-#: part/models.py:2026
+#: part/models.py:2029
 msgid "Parameter Name"
 msgstr ""
 
-#: part/models.py:2028
+#: part/models.py:2031
 msgid "Parameter Units"
 msgstr ""
 
-#: part/models.py:2056 part/models.py:2104
+#: part/models.py:2059 part/models.py:2108 part/models.py:2109
 #: templates/InvenTree/settings/category.html:62
 msgid "Parameter Template"
 msgstr ""
 
-#: part/models.py:2058
+#: part/models.py:2061
 msgid "Data"
 msgstr ""
 
-#: part/models.py:2058
+#: part/models.py:2061
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:2108
+#: part/models.py:2113 templates/InvenTree/settings/category.html:67
+msgid "Default Value"
+msgstr ""
+
+#: part/models.py:2114
 msgid "Default Parameter Value"
 msgstr ""
 
-#: part/models.py:2136
+#: part/models.py:2143
 msgid "Select parent part"
 msgstr ""
 
-#: part/models.py:2144
+#: part/models.py:2152
 msgid "Select part to be used in BOM"
 msgstr ""
 
-#: part/models.py:2150
+#: part/models.py:2158
 msgid "BOM quantity for this BOM item"
 msgstr ""
 
-#: part/models.py:2152
+#: part/models.py:2160 templates/js/bom.js:216 templates/js/bom.js:269
+msgid "Optional"
+msgstr ""
+
+#: part/models.py:2160
 msgid "This BOM item is optional"
 msgstr ""
 
-#: part/models.py:2155
+#: part/models.py:2163
+msgid "Overage"
+msgstr ""
+
+#: part/models.py:2164
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr ""
 
-#: part/models.py:2158
+#: part/models.py:2167
 msgid "BOM item reference"
 msgstr ""
 
-#: part/models.py:2161
+#: part/models.py:2170
 msgid "BOM item notes"
 msgstr ""
 
-#: part/models.py:2163
+#: part/models.py:2172
+msgid "Checksum"
+msgstr ""
+
+#: part/models.py:2172
 msgid "BOM line checksum"
 msgstr ""
 
-#: part/models.py:2167 templates/js/bom.js:275 templates/js/bom.js:282
+#: part/models.py:2176 templates/js/bom.js:275 templates/js/bom.js:282
 #: templates/js/table_filters.js:50
 msgid "Inherited"
 msgstr ""
 
-#: part/models.py:2168
+#: part/models.py:2177
 msgid "This BOM item is inherited by BOMs for variant parts"
 msgstr ""
 
-#: part/models.py:2244 part/views.py:1592 part/views.py:1644
-#: stock/models.py:259
+#: part/models.py:2253 part/views.py:1592 part/views.py:1644
+#: stock/models.py:260
 msgid "Quantity must be integer value for trackable parts"
 msgstr ""
 
-#: part/models.py:2253 part/models.py:2255
+#: part/models.py:2262 part/models.py:2264
 msgid "Sub part must be specified"
 msgstr ""
 
-#: part/models.py:2258
+#: part/models.py:2267
 msgid "BOM Item"
 msgstr ""
 
-#: part/models.py:2379
+#: part/models.py:2384
+msgid "Part 1"
+msgstr ""
+
+#: part/models.py:2388
+msgid "Part 2"
+msgstr ""
+
+#: part/models.py:2388
 msgid "Select Related Part"
 msgstr ""
 
-#: part/models.py:2411
+#: part/models.py:2420
 msgid ""
 "Error creating relationship: check that the part is not related to itself "
 "and that the relationship is unique"
@@ -3405,23 +3597,6 @@ msgstr ""
 msgid "Part Stock Allocations"
 msgstr ""
 
-#: part/templates/part/allocation.html:17
-#: part/templates/part/allocation.html:45
-msgid "Order"
-msgstr ""
-
-#: part/templates/part/allocation.html:18
-#: part/templates/part/allocation.html:24
-#: part/templates/part/allocation.html:31
-#: part/templates/part/allocation.html:49
-#: stock/templates/stock/item_base.html:8
-#: stock/templates/stock/item_base.html:89
-#: stock/templates/stock/item_base.html:324
-#: stock/templates/stock/stock_adjust.html:16 templates/js/build.js:771
-#: templates/js/stock.js:923 templates/js/stock.js:1181
-msgid "Stock Item"
-msgstr ""
-
 #: part/templates/part/attachments.html:10
 msgid "Part Attachments"
 msgstr ""
@@ -3439,6 +3614,22 @@ msgstr ""
 msgid "Bill of Materials"
 msgstr ""
 
+#: part/templates/part/bom.html:19
+#, python-format
+msgid "The BOM for <i>%(part)s</i> has changed, and must be validated.<br>"
+msgstr ""
+
+#: part/templates/part/bom.html:21
+#, python-format
+msgid ""
+"The BOM for <i>%(part)s</i> was last checked by %(checker)s on %(check_date)s"
+msgstr ""
+
+#: part/templates/part/bom.html:25
+#, python-format
+msgid "The BOM for <i>%(part)s</i> has not been validated."
+msgstr ""
+
 #: part/templates/part/bom.html:32
 msgid "Remove selected BOM items"
 msgstr ""
@@ -3578,6 +3769,20 @@ msgstr ""
 msgid "Each part must already exist in the database"
 msgstr ""
 
+#: part/templates/part/bom_upload/upload_file.html:27
+msgid "Upload File"
+msgstr ""
+
+#: part/templates/part/bom_validate.html:6
+#, python-format
+msgid ""
+"Confirm that the Bill of Materials (BOM) is valid for:<br><i>%(part)s</i>"
+msgstr ""
+
+#: part/templates/part/bom_validate.html:9
+msgid "This will validate each line in the BOM."
+msgstr ""
+
 #: part/templates/part/build.html:10
 msgid "Part Builds"
 msgstr ""
@@ -3655,7 +3860,7 @@ msgstr ""
 msgid "Create new Part Category"
 msgstr ""
 
-#: part/templates/part/category.html:240 stock/views.py:1358
+#: part/templates/part/category.html:240 stock/views.py:1359
 msgid "Create new Stock Location"
 msgstr ""
 
@@ -3749,10 +3954,6 @@ msgstr ""
 msgid "Stock Expiry Time"
 msgstr ""
 
-#: part/templates/part/detail.html:132
-msgid "Created By"
-msgstr ""
-
 #: part/templates/part/detail.html:139
 msgid "Responsible User"
 msgstr ""
@@ -3874,7 +4075,7 @@ msgstr ""
 
 #: part/templates/part/params.html:28
 #: report/templates/report/inventree_test_report_base.html:90
-#: stock/models.py:1650 templates/InvenTree/settings/header.html:8
+#: stock/models.py:1652 templates/InvenTree/settings/header.html:8
 #: templates/js/stock.js:124
 msgid "Value"
 msgstr ""
@@ -3884,7 +4085,7 @@ msgid "Edit"
 msgstr ""
 
 #: part/templates/part/params.html:44 part/templates/part/related.html:44
-#: part/templates/part/supplier.html:22 users/models.py:175
+#: part/templates/part/supplier.html:22 stock/views.py:1002 users/models.py:175
 msgid "Delete"
 msgstr ""
 
@@ -4376,18 +4577,26 @@ msgid "Sales order query filters"
 msgstr ""
 
 #: report/models.py:500
+msgid "Snippet"
+msgstr ""
+
+#: report/models.py:501
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:504
+#: report/models.py:505
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:539
+#: report/models.py:540
+msgid "Asset"
+msgstr ""
+
+#: report/models.py:541
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:542
+#: report/models.py:544
 msgid "Asset file description"
 msgstr ""
 
@@ -4409,12 +4618,12 @@ msgid "Test Results"
 msgstr ""
 
 #: report/templates/report/inventree_test_report_base.html:88
-#: stock/models.py:1638
+#: stock/models.py:1640
 msgid "Test"
 msgstr ""
 
 #: report/templates/report/inventree_test_report_base.html:89
-#: stock/models.py:1644
+#: stock/models.py:1646
 msgid "Result"
 msgstr ""
 
@@ -4431,301 +4640,345 @@ msgstr ""
 msgid "Fail"
 msgstr ""
 
-#: stock/forms.py:117
+#: stock/api.py:199
+#, python-brace-format
+msgid "Updated stock for {n} items"
+msgstr ""
+
+#: stock/api.py:268
+#, python-brace-format
+msgid "Moved {n} parts to {loc}"
+msgstr ""
+
+#: stock/forms.py:114 stock/forms.py:406 stock/models.py:473
+#: stock/templates/stock/item_base.html:349 templates/js/stock.js:652
+msgid "Expiry Date"
+msgstr ""
+
+#: stock/forms.py:115 stock/forms.py:407
+msgid "Expiration date for this stock item"
+msgstr ""
+
+#: stock/forms.py:118
 msgid "Enter unique serial numbers (or leave blank)"
 msgstr ""
 
-#: stock/forms.py:202 stock/forms.py:258
-msgid "Select test report template"
+#: stock/forms.py:169
+msgid ""
+"Destination for serialized stock (by default, will remain in current "
+"location)"
 msgstr ""
 
-#: stock/forms.py:266
-msgid "Include stock items in sub locations"
+#: stock/forms.py:171
+msgid "Serial numbers"
 msgstr ""
 
-#: stock/forms.py:301
-msgid "Stock item to install"
+#: stock/forms.py:171
+msgid "Unique serial numbers (must match quantity)"
 msgstr ""
 
-#: stock/forms.py:308
-msgid "Stock quantity to assign"
-msgstr ""
-
-#: stock/forms.py:336
-msgid "Must not exceed available quantity"
-msgstr ""
-
-#: stock/forms.py:346
-msgid "Destination location for uninstalled items"
-msgstr ""
-
-#: stock/forms.py:348
+#: stock/forms.py:173 stock/forms.py:349
 msgid "Add transaction note (optional)"
 msgstr ""
 
-#: stock/forms.py:350
+#: stock/forms.py:203 stock/forms.py:259
+msgid "Select test report template"
+msgstr ""
+
+#: stock/forms.py:267 templates/js/table_filters.js:111
+msgid "Include sublocations"
+msgstr ""
+
+#: stock/forms.py:267
+msgid "Include stock items in sub locations"
+msgstr ""
+
+#: stock/forms.py:302
+msgid "Stock item to install"
+msgstr ""
+
+#: stock/forms.py:309
+msgid "Stock quantity to assign"
+msgstr ""
+
+#: stock/forms.py:337
+msgid "Must not exceed available quantity"
+msgstr ""
+
+#: stock/forms.py:347
+msgid "Destination location for uninstalled items"
+msgstr ""
+
+#: stock/forms.py:351
 msgid "Confirm uninstall"
 msgstr ""
 
-#: stock/forms.py:350
+#: stock/forms.py:351
 msgid "Confirm removal of installed stock items"
 msgstr ""
 
-#: stock/forms.py:374
+#: stock/forms.py:375
 msgid "Destination stock location"
 msgstr ""
 
-#: stock/forms.py:376
+#: stock/forms.py:377
 msgid "Add note (required)"
 msgstr ""
 
-#: stock/forms.py:380 stock/views.py:852 stock/views.py:1050
+#: stock/forms.py:381 stock/views.py:852 stock/views.py:1051
 msgid "Confirm stock adjustment"
 msgstr ""
 
-#: stock/forms.py:380
+#: stock/forms.py:381
 msgid "Confirm movement of stock items"
 msgstr ""
 
-#: stock/forms.py:382
+#: stock/forms.py:383
 msgid "Set Default Location"
 msgstr ""
 
-#: stock/forms.py:382
+#: stock/forms.py:383
 msgid "Set the destination as the default location for selected parts"
 msgstr ""
 
-#: stock/models.py:204
+#: stock/models.py:54 stock/models.py:511
+msgid "Owner"
+msgstr ""
+
+#: stock/models.py:55 stock/models.py:512
+msgid "Select Owner"
+msgstr ""
+
+#: stock/models.py:205
 msgid "Created stock item"
 msgstr ""
 
-#: stock/models.py:240
+#: stock/models.py:241
 msgid "StockItem with this serial number already exists"
 msgstr ""
 
-#: stock/models.py:276
+#: stock/models.py:277
 #, python-brace-format
 msgid "Part type ('{pf}') must be {pe}"
 msgstr ""
 
-#: stock/models.py:286 stock/models.py:295
+#: stock/models.py:287 stock/models.py:296
 msgid "Quantity must be 1 for item with a serial number"
 msgstr ""
 
-#: stock/models.py:287
+#: stock/models.py:288
 msgid "Serial number cannot be set if quantity greater than 1"
 msgstr ""
 
-#: stock/models.py:309
+#: stock/models.py:310
 msgid "Item cannot belong to itself"
 msgstr ""
 
-#: stock/models.py:315
+#: stock/models.py:316
 msgid "Item must have a build reference if is_building=True"
 msgstr ""
 
-#: stock/models.py:322
+#: stock/models.py:323
 msgid "Build reference does not point to the same part object"
 msgstr ""
 
-#: stock/models.py:362
+#: stock/models.py:363
 msgid "Parent Stock Item"
 msgstr ""
 
-#: stock/models.py:371
+#: stock/models.py:372
 msgid "Base part"
 msgstr ""
 
-#: stock/models.py:380
+#: stock/models.py:381
 msgid "Select a matching supplier part for this stock item"
 msgstr ""
 
-#: stock/models.py:385 stock/templates/stock/stock_app_base.html:7
+#: stock/models.py:386 stock/templates/stock/stock_app_base.html:7
 msgid "Stock Location"
 msgstr ""
 
-#: stock/models.py:388
+#: stock/models.py:389
 msgid "Where is this stock item located?"
 msgstr ""
 
-#: stock/models.py:395
+#: stock/models.py:396
 msgid "Packaging this stock item is stored in"
 msgstr ""
 
-#: stock/models.py:400 stock/templates/stock/item_base.html:255
+#: stock/models.py:401 stock/templates/stock/item_base.html:255
 msgid "Installed In"
 msgstr ""
 
-#: stock/models.py:403
+#: stock/models.py:404
 msgid "Is this item installed in another item?"
 msgstr ""
 
-#: stock/models.py:419
+#: stock/models.py:420
 msgid "Serial number for this item"
 msgstr ""
 
-#: stock/models.py:431
+#: stock/models.py:432
 msgid "Batch code for this stock item"
 msgstr ""
 
-#: stock/models.py:435
+#: stock/models.py:436
 msgid "Stock Quantity"
 msgstr ""
 
-#: stock/models.py:444
+#: stock/models.py:445
 msgid "Source Build"
 msgstr ""
 
-#: stock/models.py:446
+#: stock/models.py:447
 msgid "Build for this stock item"
 msgstr ""
 
-#: stock/models.py:457
+#: stock/models.py:458
 msgid "Source Purchase Order"
 msgstr ""
 
-#: stock/models.py:460
+#: stock/models.py:461
 msgid "Purchase order for this stock item"
 msgstr ""
 
-#: stock/models.py:466
+#: stock/models.py:467
 msgid "Destination Sales Order"
 msgstr ""
 
-#: stock/models.py:472 stock/templates/stock/item_base.html:349
-#: templates/js/stock.js:652
-msgid "Expiry Date"
-msgstr ""
-
-#: stock/models.py:473
+#: stock/models.py:474
 msgid ""
 "Expiry date for stock item. Stock will be considered expired after this date"
 msgstr ""
 
-#: stock/models.py:486
+#: stock/models.py:487
+msgid "Delete on deplete"
+msgstr ""
+
+#: stock/models.py:487
 msgid "Delete this Stock Item when stock is depleted"
 msgstr ""
 
-#: stock/models.py:496 stock/templates/stock/item_notes.html:13
+#: stock/models.py:497 stock/templates/stock/item_notes.html:13
 #: stock/templates/stock/navbar.html:54
 msgid "Stock Item Notes"
 msgstr ""
 
-#: stock/models.py:506
+#: stock/models.py:507
 msgid "Single unit purchase price at time of purchase"
 msgstr ""
 
-#: stock/models.py:610
+#: stock/models.py:612
 msgid "Assigned to Customer"
 msgstr ""
 
-#: stock/models.py:612
+#: stock/models.py:614
 msgid "Manually assigned to customer"
 msgstr ""
 
-#: stock/models.py:625
+#: stock/models.py:627
 msgid "Returned from customer"
 msgstr ""
 
-#: stock/models.py:627
+#: stock/models.py:629
 msgid "Returned to location"
 msgstr ""
 
-#: stock/models.py:787
+#: stock/models.py:789
 msgid "Installed into stock item"
 msgstr ""
 
-#: stock/models.py:795
+#: stock/models.py:797
 msgid "Installed stock item"
 msgstr ""
 
-#: stock/models.py:819
+#: stock/models.py:821
 msgid "Uninstalled stock item"
 msgstr ""
 
-#: stock/models.py:838
+#: stock/models.py:840
 msgid "Uninstalled into location"
 msgstr ""
 
-#: stock/models.py:939
+#: stock/models.py:941
 msgid "Part is not set as trackable"
 msgstr ""
 
-#: stock/models.py:945
+#: stock/models.py:947
 msgid "Quantity must be integer"
 msgstr ""
 
-#: stock/models.py:951
+#: stock/models.py:953
 #, python-brace-format
 msgid "Quantity must not exceed available stock quantity ({n})"
 msgstr ""
 
-#: stock/models.py:954
+#: stock/models.py:956
 msgid "Serial numbers must be a list of integers"
 msgstr ""
 
-#: stock/models.py:957
+#: stock/models.py:959
 msgid "Quantity does not match serial numbers"
 msgstr ""
 
-#: stock/models.py:989
+#: stock/models.py:991
 msgid "Add serial number"
 msgstr ""
 
-#: stock/models.py:992
+#: stock/models.py:994
 #, python-brace-format
 msgid "Serialized {n} items"
 msgstr ""
 
-#: stock/models.py:1070
+#: stock/models.py:1072
 msgid "Split from existing stock"
 msgstr ""
 
-#: stock/models.py:1108
+#: stock/models.py:1110
 msgid "StockItem cannot be moved as it is not in stock"
 msgstr ""
 
-#: stock/models.py:1551
+#: stock/models.py:1553
 msgid "Title"
 msgstr ""
 
-#: stock/models.py:1551
+#: stock/models.py:1553
 msgid "Tracking entry title"
 msgstr ""
 
-#: stock/models.py:1553
+#: stock/models.py:1555
 msgid "Entry notes"
 msgstr ""
 
-#: stock/models.py:1555
+#: stock/models.py:1557
 msgid "Link to external page for further information"
 msgstr ""
 
-#: stock/models.py:1615
+#: stock/models.py:1617
 msgid "Value must be provided for this test"
 msgstr ""
 
-#: stock/models.py:1621
+#: stock/models.py:1623
 msgid "Attachment must be uploaded for this test"
 msgstr ""
 
-#: stock/models.py:1639
+#: stock/models.py:1641
 msgid "Test name"
 msgstr ""
 
-#: stock/models.py:1645 templates/js/table_filters.js:190
+#: stock/models.py:1647 templates/js/table_filters.js:190
 msgid "Test result"
 msgstr ""
 
-#: stock/models.py:1651
+#: stock/models.py:1653
 msgid "Test output value"
 msgstr ""
 
-#: stock/models.py:1658
+#: stock/models.py:1660
 msgid "Test result attachment"
 msgstr ""
 
-#: stock/models.py:1664
+#: stock/models.py:1666
 msgid "Test notes"
 msgstr ""
 
@@ -4888,11 +5141,6 @@ msgstr ""
 msgid "Barcode Identifier"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:302 templates/InvenTree/search.html:167
-#: templates/js/build.js:655 templates/navbar.html:29
-msgid "Build"
-msgstr ""
-
 #: stock/templates/stock/item_base.html:323
 msgid "Parent Item"
 msgstr ""
@@ -5070,7 +5318,7 @@ msgstr ""
 msgid "The following stock items will be uninstalled"
 msgstr ""
 
-#: stock/templates/stock/stockitem_convert.html:7 stock/views.py:1331
+#: stock/templates/stock/stockitem_convert.html:7 stock/views.py:1332
 msgid "Convert Stock Item"
 msgstr ""
 
@@ -5090,8 +5338,8 @@ msgstr ""
 msgid "Edit Stock Location"
 msgstr ""
 
-#: stock/views.py:230 stock/views.py:1321 stock/views.py:1432
-#: stock/views.py:1797
+#: stock/views.py:230 stock/views.py:1322 stock/views.py:1433
+#: stock/views.py:1798
 msgid "Owner is required (ownership control is enabled)"
 msgstr ""
 
@@ -5179,95 +5427,121 @@ msgstr ""
 msgid "Move Stock Items"
 msgstr ""
 
+#: stock/views.py:998
+msgid "Move"
+msgstr ""
+
 #: stock/views.py:999
 msgid "Count Stock Items"
 msgstr ""
 
+#: stock/views.py:999
+msgid "Count"
+msgstr ""
+
 #: stock/views.py:1000
 msgid "Remove From Stock"
 msgstr ""
 
+#: stock/views.py:1000
+msgid "Take"
+msgstr ""
+
 #: stock/views.py:1001
 msgid "Add Stock Items"
 msgstr ""
 
+#: stock/views.py:1001 users/models.py:171
+msgid "Add"
+msgstr ""
+
 #: stock/views.py:1002
 msgid "Delete Stock Items"
 msgstr ""
 
-#: stock/views.py:1030
+#: stock/views.py:1031
 msgid "Must enter integer value"
 msgstr ""
 
-#: stock/views.py:1035
+#: stock/views.py:1036
 msgid "Quantity must be positive"
 msgstr ""
 
-#: stock/views.py:1042
+#: stock/views.py:1043
 #, python-brace-format
 msgid "Quantity must not exceed {x}"
 msgstr ""
 
-#: stock/views.py:1106
+#: stock/views.py:1107
 msgid "No action performed"
 msgstr ""
 
-#: stock/views.py:1149
+#: stock/views.py:1122
+#, python-brace-format
+msgid "Added stock to {n} items"
+msgstr ""
+
+#: stock/views.py:1137
+#, python-brace-format
+msgid "Removed stock from {n} items"
+msgstr ""
+
+#: stock/views.py:1150
 #, python-brace-format
 msgid "Counted stock for {n} items"
 msgstr ""
 
-#: stock/views.py:1189
+#: stock/views.py:1190
 msgid "No items were moved"
 msgstr ""
 
-#: stock/views.py:1192
+#: stock/views.py:1193
 #, python-brace-format
 msgid "Moved {n} items to {dest}"
 msgstr ""
 
-#: stock/views.py:1211
+#: stock/views.py:1212
 #, python-brace-format
 msgid "Deleted {n} stock items"
 msgstr ""
 
-#: stock/views.py:1223
+#: stock/views.py:1224
 msgid "Edit Stock Item"
 msgstr ""
 
-#: stock/views.py:1449
+#: stock/views.py:1450
 msgid "Serialize Stock"
 msgstr ""
 
-#: stock/views.py:1542 templates/js/build.js:210
+#: stock/views.py:1543 templates/js/build.js:210
 msgid "Create new Stock Item"
 msgstr ""
 
-#: stock/views.py:1684
+#: stock/views.py:1685
 msgid "Duplicate Stock Item"
 msgstr ""
 
-#: stock/views.py:1766
+#: stock/views.py:1767
 msgid "Quantity cannot be negative"
 msgstr ""
 
-#: stock/views.py:1866
+#: stock/views.py:1867
 msgid "Delete Stock Location"
 msgstr ""
 
-#: stock/views.py:1879
+#: stock/views.py:1880
 msgid "Delete Stock Item"
 msgstr ""
 
-#: stock/views.py:1890
+#: stock/views.py:1891
 msgid "Delete Stock Tracking Entry"
 msgstr ""
 
-#: stock/views.py:1897
+#: stock/views.py:1898
 msgid "Edit Stock Tracking Entry"
 msgstr ""
 
-#: stock/views.py:1906
+#: stock/views.py:1907
 msgid "Add Stock Tracking Entry"
 msgstr ""
 
@@ -5371,10 +5645,6 @@ msgstr ""
 msgid "No category parameter templates found"
 msgstr ""
 
-#: templates/InvenTree/settings/category.html:67
-msgid "Default Value"
-msgstr ""
-
 #: templates/InvenTree/settings/category.html:70
 #: templates/InvenTree/settings/part.html:81
 msgid "Edit Template"
@@ -5683,10 +5953,6 @@ msgstr ""
 msgid "Open subassembly"
 msgstr ""
 
-#: templates/js/bom.js:216 templates/js/bom.js:269
-msgid "Optional"
-msgstr ""
-
 #: templates/js/bom.js:261
 msgid "No pricing available"
 msgstr ""
@@ -5695,10 +5961,6 @@ msgstr ""
 msgid "View BOM"
 msgstr ""
 
-#: templates/js/bom.js:338 templates/js/build.js:571 templates/js/build.js:984
-msgid "Actions"
-msgstr ""
-
 #: templates/js/bom.js:346
 msgid "Validate BOM Item"
 msgstr ""
@@ -5959,10 +6221,6 @@ msgstr ""
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/order.js:303
-msgid "Shipment Date"
-msgstr ""
-
 #: templates/js/part.js:51 templates/js/part.js:136
 msgid "Trackable part"
 msgstr ""
@@ -6282,10 +6540,6 @@ msgstr ""
 msgid "Item has been allocated"
 msgstr ""
 
-#: templates/js/table_filters.js:111
-msgid "Include sublocations"
-msgstr ""
-
 #: templates/js/table_filters.js:112
 msgid "Include stock in sublocations"
 msgstr ""
@@ -6483,10 +6737,6 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: templates/registration/login.html:76
-msgid "Enter password"
-msgstr ""
-
 #: templates/registration/login.html:83
 msgid "Username / password combination is incorrect"
 msgstr ""
@@ -6623,10 +6873,6 @@ msgstr ""
 msgid "Permission to view items"
 msgstr ""
 
-#: users/models.py:171
-msgid "Add"
-msgstr ""
-
 #: users/models.py:171
 msgid "Permission to add items"
 msgstr ""
diff --git a/InvenTree/order/forms.py b/InvenTree/order/forms.py
index c8501d68b2..4c9caf3b53 100644
--- a/InvenTree/order/forms.py
+++ b/InvenTree/order/forms.py
@@ -24,7 +24,7 @@ from .models import SalesOrderAllocation
 
 class IssuePurchaseOrderForm(HelperForm):
 
-    confirm = forms.BooleanField(required=True, initial=False, help_text=_('Place order'))
+    confirm = forms.BooleanField(required=True, initial=False, label=_('Confirm'), help_text=_('Place order'))
 
     class Meta:
         model = PurchaseOrder
@@ -35,7 +35,7 @@ class IssuePurchaseOrderForm(HelperForm):
 
 class CompletePurchaseOrderForm(HelperForm):
 
-    confirm = forms.BooleanField(required=True, help_text=_("Mark order as complete"))
+    confirm = forms.BooleanField(required=True, label=_('Confirm'), help_text=_("Mark order as complete"))
 
     class Meta:
         model = PurchaseOrder
@@ -46,7 +46,7 @@ class CompletePurchaseOrderForm(HelperForm):
 
 class CancelPurchaseOrderForm(HelperForm):
 
-    confirm = forms.BooleanField(required=True, help_text=_('Cancel order'))
+    confirm = forms.BooleanField(required=True, label=_('Confirm'), help_text=_('Cancel order'))
 
     class Meta:
         model = PurchaseOrder
@@ -57,7 +57,7 @@ class CancelPurchaseOrderForm(HelperForm):
 
 class CancelSalesOrderForm(HelperForm):
 
-    confirm = forms.BooleanField(required=True, help_text=_('Cancel order'))
+    confirm = forms.BooleanField(required=True, label=_('Confirm'), help_text=_('Cancel order'))
 
     class Meta:
         model = SalesOrder
@@ -68,7 +68,7 @@ class CancelSalesOrderForm(HelperForm):
 
 class ShipSalesOrderForm(HelperForm):
 
-    confirm = forms.BooleanField(required=True, help_text=_('Ship order'))
+    confirm = forms.BooleanField(required=True, label=_('Confirm'), help_text=_('Ship order'))
 
     class Meta:
         model = SalesOrder
@@ -79,7 +79,7 @@ class ShipSalesOrderForm(HelperForm):
 
 class ReceivePurchaseOrderForm(HelperForm):
 
-    location = TreeNodeChoiceField(queryset=StockLocation.objects.all(), required=True, help_text=_('Receive parts to this location'))
+    location = TreeNodeChoiceField(queryset=StockLocation.objects.all(), required=True, label=_('Location'), help_text=_('Receive parts to this location'))
 
     class Meta:
         model = PurchaseOrder
@@ -106,6 +106,7 @@ class EditPurchaseOrderForm(HelperForm):
         super().__init__(*args, **kwargs)
 
     target_date = DatePickerFormField(
+        label=_('Target Date'),
         help_text=_('Target date for order delivery. Order will be overdue after this date.'),
     )
 
@@ -140,6 +141,7 @@ class EditSalesOrderForm(HelperForm):
         super().__init__(*args, **kwargs)
 
     target_date = DatePickerFormField(
+        label=_('Target Date'),
         help_text=_('Target date for order completion. Order will be overdue after this date.'),
     )
 
@@ -183,7 +185,7 @@ class EditSalesOrderAttachmentForm(HelperForm):
 class EditPurchaseOrderLineItemForm(HelperForm):
     """ Form for editing a PurchaseOrderLineItem object """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'))
 
     class Meta:
         model = PurchaseOrderLineItem
@@ -200,7 +202,7 @@ class EditPurchaseOrderLineItemForm(HelperForm):
 class EditSalesOrderLineItemForm(HelperForm):
     """ Form for editing a SalesOrderLineItem object """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'))
 
     class Meta:
         model = SalesOrderLineItem
@@ -256,7 +258,7 @@ class CreateSalesOrderAllocationForm(HelperForm):
     Form for creating a SalesOrderAllocation item.
     """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'))
 
     class Meta:
         model = SalesOrderAllocation
@@ -273,7 +275,7 @@ class EditSalesOrderAllocationForm(HelperForm):
     Form for editing a SalesOrderAllocation item
     """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'))
 
     class Meta:
         model = SalesOrderAllocation
diff --git a/InvenTree/order/migrations/0044_auto_20210403_1210.py b/InvenTree/order/migrations/0044_auto_20210403_1210.py
deleted file mode 100644
index e0fa3692fe..0000000000
--- a/InvenTree/order/migrations/0044_auto_20210403_1210.py
+++ /dev/null
@@ -1,57 +0,0 @@
-# Generated by Django 3.0.7 on 2021-04-03 12:10
-
-import InvenTree.models
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('order', '0043_auto_20210330_0013'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='purchaseorderattachment',
-            name='attachment',
-            field=models.FileField(help_text='Select file to attach', upload_to=InvenTree.models.rename_attachment, verbose_name='Attachment'),
-        ),
-        migrations.AlterField(
-            model_name='purchaseorderattachment',
-            name='comment',
-            field=models.CharField(blank=True, help_text='File comment', max_length=100, verbose_name='Comment'),
-        ),
-        migrations.AlterField(
-            model_name='purchaseorderattachment',
-            name='upload_date',
-            field=models.DateField(auto_now_add=True, null=True, verbose_name='upload date'),
-        ),
-        migrations.AlterField(
-            model_name='purchaseorderattachment',
-            name='user',
-            field=models.ForeignKey(blank=True, help_text='User', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User'),
-        ),
-        migrations.AlterField(
-            model_name='salesorderattachment',
-            name='attachment',
-            field=models.FileField(help_text='Select file to attach', upload_to=InvenTree.models.rename_attachment, verbose_name='Attachment'),
-        ),
-        migrations.AlterField(
-            model_name='salesorderattachment',
-            name='comment',
-            field=models.CharField(blank=True, help_text='File comment', max_length=100, verbose_name='Comment'),
-        ),
-        migrations.AlterField(
-            model_name='salesorderattachment',
-            name='upload_date',
-            field=models.DateField(auto_now_add=True, null=True, verbose_name='upload date'),
-        ),
-        migrations.AlterField(
-            model_name='salesorderattachment',
-            name='user',
-            field=models.ForeignKey(blank=True, help_text='User', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User'),
-        ),
-    ]
diff --git a/InvenTree/order/migrations/0044_auto_20210404_2016.py b/InvenTree/order/migrations/0044_auto_20210404_2016.py
new file mode 100644
index 0000000000..f683ce0aae
--- /dev/null
+++ b/InvenTree/order/migrations/0044_auto_20210404_2016.py
@@ -0,0 +1,233 @@
+# Generated by Django 3.0.7 on 2021-04-04 20:16
+
+import InvenTree.fields
+import InvenTree.models
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import markdownx.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('company', '0032_auto_20210403_1837'),
+        ('part', '0063_bomitem_inherited'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('stock', '0058_stockitem_packaging'),
+        ('order', '0043_auto_20210330_0013'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='created_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='creation_date',
+            field=models.DateField(blank=True, null=True, verbose_name='Creation Date'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='description',
+            field=models.CharField(help_text='Order description', max_length=250, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='link',
+            field=models.URLField(blank=True, help_text='Link to external page', verbose_name='Link'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='notes',
+            field=markdownx.models.MarkdownxField(blank=True, help_text='Order notes', verbose_name='Notes'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='received_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='received by'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='reference',
+            field=models.CharField(help_text='Order reference', max_length=64, unique=True, verbose_name='Reference'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='supplier',
+            field=models.ForeignKey(help_text='Company from which the items are being ordered', limit_choices_to={'is_supplier': True}, on_delete=django.db.models.deletion.CASCADE, related_name='purchase_orders', to='company.Company', verbose_name='Supplier'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorder',
+            name='supplier_reference',
+            field=models.CharField(blank=True, help_text='Supplier order reference code', max_length=64, verbose_name='Supplier Reference'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderattachment',
+            name='attachment',
+            field=models.FileField(help_text='Select file to attach', upload_to=InvenTree.models.rename_attachment, verbose_name='Attachment'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderattachment',
+            name='comment',
+            field=models.CharField(blank=True, help_text='File comment', max_length=100, verbose_name='Comment'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderattachment',
+            name='upload_date',
+            field=models.DateField(auto_now_add=True, null=True, verbose_name='upload date'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderattachment',
+            name='user',
+            field=models.ForeignKey(blank=True, help_text='User', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='notes',
+            field=models.CharField(blank=True, help_text='Line item notes', max_length=500, verbose_name='Notes'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='order',
+            field=models.ForeignKey(help_text='Purchase Order', on_delete=django.db.models.deletion.CASCADE, related_name='lines', to='order.PurchaseOrder', verbose_name='Order'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='part',
+            field=models.ForeignKey(blank=True, help_text='Supplier part', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='purchase_order_line_items', to='company.SupplierPart', verbose_name='Part'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='quantity',
+            field=InvenTree.fields.RoundingDecimalField(decimal_places=5, default=1, help_text='Item quantity', max_digits=15, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='received',
+            field=models.DecimalField(decimal_places=5, default=0, help_text='Number of items received', max_digits=15, verbose_name='Received'),
+        ),
+        migrations.AlterField(
+            model_name='purchaseorderlineitem',
+            name='reference',
+            field=models.CharField(blank=True, help_text='Line item reference', max_length=100, verbose_name='Reference'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='created_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='creation_date',
+            field=models.DateField(blank=True, null=True, verbose_name='Creation Date'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='customer',
+            field=models.ForeignKey(help_text='Company to which the items are being sold', limit_choices_to={'is_customer': True}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sales_orders', to='company.Company', verbose_name='Customer'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='customer_reference',
+            field=models.CharField(blank=True, help_text='Customer order reference code', max_length=64, verbose_name='Customer Reference '),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='description',
+            field=models.CharField(help_text='Order description', max_length=250, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='link',
+            field=models.URLField(blank=True, help_text='Link to external page', verbose_name='Link'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='notes',
+            field=markdownx.models.MarkdownxField(blank=True, help_text='Order notes', verbose_name='Notes'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='reference',
+            field=models.CharField(help_text='Order reference', max_length=64, unique=True, verbose_name='Reference'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='shipment_date',
+            field=models.DateField(blank=True, null=True, verbose_name='Shipment Date'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='shipped_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='shipped by'),
+        ),
+        migrations.AlterField(
+            model_name='salesorder',
+            name='status',
+            field=models.PositiveIntegerField(choices=[(10, 'Pending'), (20, 'Shipped'), (40, 'Cancelled'), (50, 'Lost'), (60, 'Returned')], default=10, help_text='Purchase order status', verbose_name='Status'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderallocation',
+            name='item',
+            field=models.ForeignKey(help_text='Select stock item to allocate', limit_choices_to={'belongs_to': None, 'part__salable': True, 'sales_order': None}, on_delete=django.db.models.deletion.CASCADE, related_name='sales_order_allocations', to='stock.StockItem', verbose_name='Item'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderallocation',
+            name='line',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allocations', to='order.SalesOrderLineItem', verbose_name='Line'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderallocation',
+            name='quantity',
+            field=InvenTree.fields.RoundingDecimalField(decimal_places=5, default=1, help_text='Enter stock allocation quantity', max_digits=15, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderattachment',
+            name='attachment',
+            field=models.FileField(help_text='Select file to attach', upload_to=InvenTree.models.rename_attachment, verbose_name='Attachment'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderattachment',
+            name='comment',
+            field=models.CharField(blank=True, help_text='File comment', max_length=100, verbose_name='Comment'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderattachment',
+            name='upload_date',
+            field=models.DateField(auto_now_add=True, null=True, verbose_name='upload date'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderattachment',
+            name='user',
+            field=models.ForeignKey(blank=True, help_text='User', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderlineitem',
+            name='notes',
+            field=models.CharField(blank=True, help_text='Line item notes', max_length=500, verbose_name='Notes'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderlineitem',
+            name='order',
+            field=models.ForeignKey(help_text='Sales Order', on_delete=django.db.models.deletion.CASCADE, related_name='lines', to='order.SalesOrder', verbose_name='Order'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderlineitem',
+            name='part',
+            field=models.ForeignKey(help_text='Part', limit_choices_to={'salable': True}, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='sales_order_line_items', to='part.Part', verbose_name='Part'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderlineitem',
+            name='quantity',
+            field=InvenTree.fields.RoundingDecimalField(decimal_places=5, default=1, help_text='Item quantity', max_digits=15, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'),
+        ),
+        migrations.AlterField(
+            model_name='salesorderlineitem',
+            name='reference',
+            field=models.CharField(blank=True, help_text='Line item reference', max_length=100, verbose_name='Reference'),
+        ),
+    ]
diff --git a/InvenTree/order/models.py b/InvenTree/order/models.py
index b1ee7f7c74..818bc81707 100644
--- a/InvenTree/order/models.py
+++ b/InvenTree/order/models.py
@@ -96,18 +96,19 @@ class Order(models.Model):
     class Meta:
         abstract = True
 
-    reference = models.CharField(unique=True, max_length=64, blank=False, help_text=_('Order reference'))
+    reference = models.CharField(unique=True, max_length=64, blank=False, verbose_name=_('Reference'), help_text=_('Order reference'))
 
-    description = models.CharField(max_length=250, help_text=_('Order description'))
+    description = models.CharField(max_length=250, verbose_name=_('Description'), help_text=_('Order description'))
 
-    link = models.URLField(blank=True, help_text=_('Link to external page'))
+    link = models.URLField(blank=True, verbose_name=_('Link'), help_text=_('Link to external page'))
 
-    creation_date = models.DateField(blank=True, null=True)
+    creation_date = models.DateField(blank=True, null=True, verbose_name=_('Creation Date'))
 
     created_by = models.ForeignKey(User,
                                    on_delete=models.SET_NULL,
                                    blank=True, null=True,
-                                   related_name='+'
+                                   related_name='+',
+                                   verbose_name=_('Created By')
                                    )
 
     responsible = models.ForeignKey(
@@ -119,7 +120,7 @@ class Order(models.Model):
         related_name='+',
     )
 
-    notes = MarkdownxField(blank=True, help_text=_('Order notes'))
+    notes = MarkdownxField(blank=True, verbose_name=_('Notes'), help_text=_('Order notes'))
 
 
 class PurchaseOrder(Order):
@@ -186,16 +187,18 @@ class PurchaseOrder(Order):
             'is_supplier': True,
         },
         related_name='purchase_orders',
+        verbose_name=_('Supplier'),
         help_text=_('Company from which the items are being ordered')
     )
 
-    supplier_reference = models.CharField(max_length=64, blank=True, help_text=_("Supplier order reference code"))
+    supplier_reference = models.CharField(max_length=64, blank=True, verbose_name=_('Supplier Reference'), help_text=_("Supplier order reference code"))
 
     received_by = models.ForeignKey(
         User,
         on_delete=models.SET_NULL,
         blank=True, null=True,
-        related_name='+'
+        related_name='+',
+        verbose_name=_('received by')
     )
 
     issue_date = models.DateField(
@@ -434,13 +437,14 @@ class SalesOrder(Order):
         null=True,
         limit_choices_to={'is_customer': True},
         related_name='sales_orders',
+        verbose_name=_('Customer'),
         help_text=_("Company to which the items are being sold"),
     )
 
     status = models.PositiveIntegerField(default=SalesOrderStatus.PENDING, choices=SalesOrderStatus.items(),
-                                         help_text=_('Purchase order status'))
+                                         verbose_name=_('Status'), help_text=_('Purchase order status'))
 
-    customer_reference = models.CharField(max_length=64, blank=True, help_text=_("Customer order reference code"))
+    customer_reference = models.CharField(max_length=64, blank=True, verbose_name=_('Customer Reference '), help_text=_("Customer order reference code"))
 
     target_date = models.DateField(
         null=True, blank=True,
@@ -448,13 +452,14 @@ class SalesOrder(Order):
         help_text=_('Target date for order completion. Order will be overdue after this date.')
     )
 
-    shipment_date = models.DateField(blank=True, null=True)
+    shipment_date = models.DateField(blank=True, null=True, verbose_name=_('Shipment Date'))
 
     shipped_by = models.ForeignKey(
         User,
         on_delete=models.SET_NULL,
         blank=True, null=True,
-        related_name='+'
+        related_name='+',
+        verbose_name=_('shipped by')
     )
 
     @property
@@ -585,11 +590,11 @@ class OrderLineItem(models.Model):
     class Meta:
         abstract = True
 
-    quantity = RoundingDecimalField(max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], default=1, help_text=_('Item quantity'))
+    quantity = RoundingDecimalField(max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], default=1, verbose_name=_('Quantity'), help_text=_('Item quantity'))
 
-    reference = models.CharField(max_length=100, blank=True, help_text=_('Line item reference'))
+    reference = models.CharField(max_length=100, blank=True, verbose_name=_('Reference'), help_text=_('Line item reference'))
     
-    notes = models.CharField(max_length=500, blank=True, help_text=_('Line item notes'))
+    notes = models.CharField(max_length=500, blank=True, verbose_name=_('Notes'), help_text=_('Line item notes'))
 
 
 class PurchaseOrderLineItem(OrderLineItem):
@@ -615,6 +620,7 @@ class PurchaseOrderLineItem(OrderLineItem):
     order = models.ForeignKey(
         PurchaseOrder, on_delete=models.CASCADE,
         related_name='lines',
+        verbose_name=_('Order'),
         help_text=_('Purchase Order')
     )
 
@@ -628,10 +634,11 @@ class PurchaseOrderLineItem(OrderLineItem):
         SupplierPart, on_delete=models.SET_NULL,
         blank=True, null=True,
         related_name='purchase_order_line_items',
+        verbose_name=_('Part'),
         help_text=_("Supplier part"),
     )
 
-    received = models.DecimalField(decimal_places=5, max_digits=15, default=0, help_text=_('Number of items received'))
+    received = models.DecimalField(decimal_places=5, max_digits=15, default=0, verbose_name=_('Received') , help_text=_('Number of items received'))
 
     purchase_price = MoneyField(
         max_digits=19,
@@ -657,9 +664,9 @@ class SalesOrderLineItem(OrderLineItem):
         part: Link to a Part object (may be null)
     """
 
-    order = models.ForeignKey(SalesOrder, on_delete=models.CASCADE, related_name='lines', help_text=_('Sales Order'))
+    order = models.ForeignKey(SalesOrder, on_delete=models.CASCADE, related_name='lines', verbose_name=_('Order'), help_text=_('Sales Order'))
 
-    part = models.ForeignKey('part.Part', on_delete=models.SET_NULL, related_name='sales_order_line_items', null=True, help_text=_('Part'), limit_choices_to={'salable': True})
+    part = models.ForeignKey('part.Part', on_delete=models.SET_NULL, related_name='sales_order_line_items', null=True, verbose_name=_('Part'), help_text=_('Part'), limit_choices_to={'salable': True})
 
     class Meta:
         unique_together = [
@@ -759,7 +766,7 @@ class SalesOrderAllocation(models.Model):
         if len(errors) > 0:
             raise ValidationError(errors)
 
-    line = models.ForeignKey(SalesOrderLineItem, on_delete=models.CASCADE, related_name='allocations')
+    line = models.ForeignKey(SalesOrderLineItem, on_delete=models.CASCADE, verbose_name=_('Line'), related_name='allocations')
 
     item = models.ForeignKey(
         'stock.StockItem',
@@ -770,10 +777,11 @@ class SalesOrderAllocation(models.Model):
             'belongs_to': None,
             'sales_order': None,
         },
+        verbose_name=_('Item'),
         help_text=_('Select stock item to allocate')
     )
 
-    quantity = RoundingDecimalField(max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], default=1, help_text=_('Enter stock allocation quantity'))
+    quantity = RoundingDecimalField(max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], default=1, verbose_name=_('Quantity'), help_text=_('Enter stock allocation quantity'))
 
     def get_serial(self):
         return self.item.serial
diff --git a/InvenTree/order/templates/order/order_complete.html b/InvenTree/order/templates/order/order_complete.html
index f6b9f14338..0f6aa55133 100644
--- a/InvenTree/order/templates/order/order_complete.html
+++ b/InvenTree/order/templates/order/order_complete.html
@@ -1,12 +1,14 @@
 {% extends "modal_form.html" %}
 
+{% load i18n %}
+
 {% block pre_form_content %}
 
-Mark this order as complete?
+{% trans 'Mark this order as complete?' %}
 {% if not order.is_complete %}
 <div class='alert alert-warning alert-block'>
-    This order has line items which have not been marked as received.
-    Marking this order as complete will remove these line items.
+    {%trans 'This order has line items which have not been marked as received.
+    Marking this order as complete will remove these line items.' %}
 </div>
 {% endif %}
 
diff --git a/InvenTree/order/templates/order/order_issue.html b/InvenTree/order/templates/order/order_issue.html
index ad80fc5a0d..bb3c3eea8a 100644
--- a/InvenTree/order/templates/order/order_issue.html
+++ b/InvenTree/order/templates/order/order_issue.html
@@ -1,7 +1,9 @@
 {% extends "modal_form.html" %}
 
+{% load i18n %}
+
 {% block pre_form_content %}
 
-After placing this purchase order, line items will no longer be editable.
+{% trans 'After placing this purchase order, line items will no longer be editable.' %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/order/templates/order/order_wizard/select_parts.html b/InvenTree/order/templates/order/order_wizard/select_parts.html
index 21e23266bb..d3f1796dce 100644
--- a/InvenTree/order/templates/order/order_wizard/select_parts.html
+++ b/InvenTree/order/templates/order/order_wizard/select_parts.html
@@ -39,7 +39,7 @@
                 {{ part.full_name }} <small><i>{{ part.description }}</i></small>
             </td>
             <td>
-                <button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' part='{{ part.pk }}' title='{% trans "Create new supplier part" $}' type='button'>
+                <button class='btn btn-default btn-create' onClick='newSupplierPartFromOrderWizard()' id='new_supplier_part_{{ part.id }}' part='{{ part.pk }}' title='{% trans "Create new supplier part" %}' type='button'>
                     <span part='{{ part.pk }}' class='fas fa-plus-circle'></span>
                 </button>
             </td>
diff --git a/InvenTree/order/templates/order/sales_order_detail.html b/InvenTree/order/templates/order/sales_order_detail.html
index 7b4a4ed4f7..392a236931 100644
--- a/InvenTree/order/templates/order/sales_order_detail.html
+++ b/InvenTree/order/templates/order/sales_order_detail.html
@@ -67,7 +67,7 @@ function showAllocationSubTable(index, row, element) {
         {
             width: '50%',
             field: 'allocated',
-            title: 'Quantity',
+            title: '{% trans "Quantity" %}',
             formatter: function(value, row, index, field) {
                 var text = '';
                 
@@ -89,7 +89,7 @@ function showAllocationSubTable(index, row, element) {
         },
         {
             field: 'buttons',
-            title: 'Actions',
+            title: '{% trans "Actions" %}',
             formatter: function(value, row, index, field) {
                 
                 var html = "<div class='btn-group float-right' role='group'>";
@@ -167,7 +167,7 @@ function showFulfilledSubTable(index, row, element) {
 }
 
 $("#so-lines-table").inventreeTable({
-    formatNoMatches: function() { return "No matching line items"; },
+    formatNoMatches: function() { return "{% trans 'No matching line items' %}"; },
     queryParams: {
         order: {{ order.id }},
         part_detail: true,
@@ -196,7 +196,7 @@ $("#so-lines-table").inventreeTable({
     columns: [
         {
             field: 'pk',
-            title: 'ID',
+            title: '{% trans "ID" %}',
             visible: false,
             switchable: false,
         },
@@ -204,7 +204,7 @@ $("#so-lines-table").inventreeTable({
             sortable: true,
             sortName: 'part__name',
             field: 'part',
-            title: 'Part',
+            title: '{% trans "Part" %}',
             formatter: function(value, row, index, field) {
                 if (row.part) {
                     return imageHoverIcon(row.part_detail.thumbnail) + renderLink(row.part_detail.full_name, `/part/${value}/`);
@@ -216,12 +216,12 @@ $("#so-lines-table").inventreeTable({
         {
             sortable: true,
             field: 'reference',
-            title: 'Reference'
+            title: '{% trans "Reference" %}'
         },
         {
             sortable: true,
             field: 'quantity',
-            title: 'Quantity',
+            title: '{% trans "Quantity" %}',
         },
         {
             field: 'allocated',
@@ -261,7 +261,7 @@ $("#so-lines-table").inventreeTable({
         },
         {
             field: 'notes',
-            title: 'Notes',
+            title: '{% trans "Notes" %}',
         },
         {% if order.status == SalesOrderStatus.PENDING %}
         {
diff --git a/InvenTree/part/bom.py b/InvenTree/part/bom.py
index ccde26e2f7..f3cf598225 100644
--- a/InvenTree/part/bom.py
+++ b/InvenTree/part/bom.py
@@ -275,7 +275,7 @@ class BomUploadManager:
         elif ext in ['.xls', '.xlsx']:
             raw_data = bom_file.read()
         else:
-            raise ValidationError({'bom_file': _('Unsupported file format: {f}'.format(f=ext))})
+            raise ValidationError({'bom_file': _('Unsupported file format: {f}').format(f=ext)})
 
         try:
             self.data = tablib.Dataset().load(raw_data)
diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py
index 42970ccfb1..63cd7b4399 100644
--- a/InvenTree/part/forms.py
+++ b/InvenTree/part/forms.py
@@ -129,6 +129,7 @@ class BomDuplicateForm(HelperForm):
 
     confirm = forms.BooleanField(
         required=False, initial=False,
+        label=_('Confirm'),
         help_text=_('Confirm BOM duplication')
     )
 
@@ -147,7 +148,7 @@ class BomValidateForm(HelperForm):
     to confirm that the BOM for this part is valid
     """
 
-    validate = forms.BooleanField(required=False, initial=False, help_text=_('Confirm that the BOM is correct'))
+    validate = forms.BooleanField(required=False, initial=False, label=_('validate'), help_text=_('Confirm that the BOM is correct'))
 
     class Meta:
         model = Part
@@ -159,7 +160,7 @@ class BomValidateForm(HelperForm):
 class BomUploadSelectFile(HelperForm):
     """ Form for importing a BOM. Provides a file input box for upload """
 
-    bom_file = forms.FileField(label='BOM file', required=True, help_text=_("Select BOM file to upload"))
+    bom_file = forms.FileField(label=_('BOM file'), required=True, help_text=_("Select BOM file to upload"))
 
     class Meta:
         model = Part
@@ -336,9 +337,9 @@ class EditCategoryParameterTemplateForm(HelperForm):
 class EditBomItemForm(HelperForm):
     """ Form for editing a BomItem object """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'))
 
-    sub_part = PartModelChoiceField(queryset=Part.objects.all())
+    sub_part = PartModelChoiceField(queryset=Part.objects.all(), label=_('Sub part'))
 
     class Meta:
         model = BomItem
@@ -365,6 +366,7 @@ class PartPriceForm(forms.Form):
     quantity = forms.IntegerField(
         required=True,
         initial=1,
+        label=_('Quantity'),
         help_text=_('Input quantity for price calculation')
     )
 
@@ -380,7 +382,7 @@ class EditPartSalePriceBreakForm(HelperForm):
     Form for creating / editing a sale price for a part
     """
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'))
 
     class Meta:
         model = PartSellPriceBreak
diff --git a/InvenTree/part/migrations/0064_auto_20210403_1210.py b/InvenTree/part/migrations/0064_auto_20210403_1210.py
deleted file mode 100644
index d3f4b2b75f..0000000000
--- a/InvenTree/part/migrations/0064_auto_20210403_1210.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# Generated by Django 3.0.7 on 2021-04-03 12:10
-
-import InvenTree.models
-import InvenTree.validators
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-import mptt.fields
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('stock', '0059_auto_20210403_1210'),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('part', '0063_bomitem_inherited'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='part',
-            name='bom_checked_by',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='boms_checked', to=settings.AUTH_USER_MODEL, verbose_name='BOM checked by'),
-        ),
-        migrations.AlterField(
-            model_name='part',
-            name='bom_checked_date',
-            field=models.DateField(blank=True, null=True, verbose_name='BOM checked date'),
-        ),
-        migrations.AlterField(
-            model_name='part',
-            name='bom_checksum',
-            field=models.CharField(blank=True, help_text='Stored BOM checksum', max_length=128, verbose_name='BOM checksum'),
-        ),
-        migrations.AlterField(
-            model_name='part',
-            name='creation_date',
-            field=models.DateField(auto_now_add=True, null=True, verbose_name='Creation Date'),
-        ),
-        migrations.AlterField(
-            model_name='part',
-            name='creation_user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parts_created', to=settings.AUTH_USER_MODEL, verbose_name='Creation User'),
-        ),
-        migrations.AlterField(
-            model_name='part',
-            name='responsible',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parts_responible', to=settings.AUTH_USER_MODEL, verbose_name='Responsible'),
-        ),
-        migrations.AlterField(
-            model_name='partattachment',
-            name='attachment',
-            field=models.FileField(help_text='Select file to attach', upload_to=InvenTree.models.rename_attachment, verbose_name='Attachment'),
-        ),
-        migrations.AlterField(
-            model_name='partattachment',
-            name='comment',
-            field=models.CharField(blank=True, help_text='File comment', max_length=100, verbose_name='Comment'),
-        ),
-        migrations.AlterField(
-            model_name='partattachment',
-            name='upload_date',
-            field=models.DateField(auto_now_add=True, null=True, verbose_name='upload date'),
-        ),
-        migrations.AlterField(
-            model_name='partattachment',
-            name='user',
-            field=models.ForeignKey(blank=True, help_text='User', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User'),
-        ),
-        migrations.AlterField(
-            model_name='partcategory',
-            name='default_keywords',
-            field=models.CharField(blank=True, help_text='Default keywords for parts in this category', max_length=250, null=True, verbose_name='Default keywords'),
-        ),
-        migrations.AlterField(
-            model_name='partcategory',
-            name='default_location',
-            field=mptt.fields.TreeForeignKey(blank=True, help_text='Default location for parts in this category', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='default_categories', to='stock.StockLocation', verbose_name='Default Location'),
-        ),
-        migrations.AlterField(
-            model_name='partcategory',
-            name='description',
-            field=models.CharField(blank=True, help_text='Description (optional)', max_length=250, verbose_name='Description'),
-        ),
-        migrations.AlterField(
-            model_name='partcategory',
-            name='name',
-            field=models.CharField(help_text='Name', max_length=100, validators=[InvenTree.validators.validate_tree_name], verbose_name='Name'),
-        ),
-        migrations.AlterField(
-            model_name='partcategory',
-            name='parent',
-            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='children', to='part.PartCategory', verbose_name='parent'),
-        ),
-        migrations.AlterField(
-            model_name='partparameter',
-            name='data',
-            field=models.CharField(help_text='Parameter Value', max_length=500, verbose_name='Data'),
-        ),
-        migrations.AlterField(
-            model_name='partparameter',
-            name='part',
-            field=models.ForeignKey(help_text='Parent Part', on_delete=django.db.models.deletion.CASCADE, related_name='parameters', to='part.Part', verbose_name='Part'),
-        ),
-        migrations.AlterField(
-            model_name='partparameter',
-            name='template',
-            field=models.ForeignKey(help_text='Parameter Template', on_delete=django.db.models.deletion.CASCADE, related_name='instances', to='part.PartParameterTemplate', verbose_name='Template'),
-        ),
-    ]
diff --git a/InvenTree/part/migrations/0064_auto_20210404_2016.py b/InvenTree/part/migrations/0064_auto_20210404_2016.py
new file mode 100644
index 0000000000..57943347a1
--- /dev/null
+++ b/InvenTree/part/migrations/0064_auto_20210404_2016.py
@@ -0,0 +1,218 @@
+# Generated by Django 3.0.7 on 2021-04-04 20:16
+
+import InvenTree.models
+import InvenTree.validators
+from django.conf import settings
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+import mptt.fields
+import part.models
+import stdimage.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('stock', '0058_stockitem_packaging'),
+        ('part', '0063_bomitem_inherited'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='bomitem',
+            name='checksum',
+            field=models.CharField(blank=True, help_text='BOM line checksum', max_length=128, verbose_name='Checksum'),
+        ),
+        migrations.AlterField(
+            model_name='bomitem',
+            name='note',
+            field=models.CharField(blank=True, help_text='BOM item notes', max_length=500, verbose_name='Note'),
+        ),
+        migrations.AlterField(
+            model_name='bomitem',
+            name='optional',
+            field=models.BooleanField(default=False, help_text='This BOM item is optional', verbose_name='Optional'),
+        ),
+        migrations.AlterField(
+            model_name='bomitem',
+            name='overage',
+            field=models.CharField(blank=True, help_text='Estimated build wastage quantity (absolute or percentage)', max_length=24, validators=[InvenTree.validators.validate_overage], verbose_name='Overage'),
+        ),
+        migrations.AlterField(
+            model_name='bomitem',
+            name='part',
+            field=models.ForeignKey(help_text='Select parent part', limit_choices_to={'assembly': True}, on_delete=django.db.models.deletion.CASCADE, related_name='bom_items', to='part.Part', verbose_name='Part'),
+        ),
+        migrations.AlterField(
+            model_name='bomitem',
+            name='quantity',
+            field=models.DecimalField(decimal_places=5, default=1.0, help_text='BOM quantity for this BOM item', max_digits=15, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'),
+        ),
+        migrations.AlterField(
+            model_name='bomitem',
+            name='reference',
+            field=models.CharField(blank=True, help_text='BOM item reference', max_length=500, verbose_name='Reference'),
+        ),
+        migrations.AlterField(
+            model_name='bomitem',
+            name='sub_part',
+            field=models.ForeignKey(help_text='Select part to be used in BOM', limit_choices_to={'component': True}, on_delete=django.db.models.deletion.CASCADE, related_name='used_in', to='part.Part', verbose_name='Sub part'),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='bom_checked_by',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='boms_checked', to=settings.AUTH_USER_MODEL, verbose_name='BOM checked by'),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='bom_checked_date',
+            field=models.DateField(blank=True, null=True, verbose_name='BOM checked date'),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='bom_checksum',
+            field=models.CharField(blank=True, help_text='Stored BOM checksum', max_length=128, verbose_name='BOM checksum'),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='creation_date',
+            field=models.DateField(auto_now_add=True, null=True, verbose_name='Creation Date'),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='creation_user',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parts_created', to=settings.AUTH_USER_MODEL, verbose_name='Creation User'),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='image',
+            field=stdimage.models.StdImageField(blank=True, null=True, upload_to=part.models.rename_part_image, verbose_name='Image'),
+        ),
+        migrations.AlterField(
+            model_name='part',
+            name='responsible',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='parts_responible', to=settings.AUTH_USER_MODEL, verbose_name='Responsible'),
+        ),
+        migrations.AlterField(
+            model_name='partattachment',
+            name='attachment',
+            field=models.FileField(help_text='Select file to attach', upload_to=InvenTree.models.rename_attachment, verbose_name='Attachment'),
+        ),
+        migrations.AlterField(
+            model_name='partattachment',
+            name='comment',
+            field=models.CharField(blank=True, help_text='File comment', max_length=100, verbose_name='Comment'),
+        ),
+        migrations.AlterField(
+            model_name='partattachment',
+            name='part',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='attachments', to='part.Part', verbose_name='Part'),
+        ),
+        migrations.AlterField(
+            model_name='partattachment',
+            name='upload_date',
+            field=models.DateField(auto_now_add=True, null=True, verbose_name='upload date'),
+        ),
+        migrations.AlterField(
+            model_name='partattachment',
+            name='user',
+            field=models.ForeignKey(blank=True, help_text='User', null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User'),
+        ),
+        migrations.AlterField(
+            model_name='partcategory',
+            name='default_keywords',
+            field=models.CharField(blank=True, help_text='Default keywords for parts in this category', max_length=250, null=True, verbose_name='Default keywords'),
+        ),
+        migrations.AlterField(
+            model_name='partcategory',
+            name='default_location',
+            field=mptt.fields.TreeForeignKey(blank=True, help_text='Default location for parts in this category', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='default_categories', to='stock.StockLocation', verbose_name='Default Location'),
+        ),
+        migrations.AlterField(
+            model_name='partcategory',
+            name='description',
+            field=models.CharField(blank=True, help_text='Description (optional)', max_length=250, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='partcategory',
+            name='name',
+            field=models.CharField(help_text='Name', max_length=100, validators=[InvenTree.validators.validate_tree_name], verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='partcategory',
+            name='parent',
+            field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.DO_NOTHING, related_name='children', to='part.PartCategory', verbose_name='parent'),
+        ),
+        migrations.AlterField(
+            model_name='partcategoryparametertemplate',
+            name='category',
+            field=models.ForeignKey(help_text='Part Category', on_delete=django.db.models.deletion.CASCADE, related_name='parameter_templates', to='part.PartCategory', verbose_name='Category'),
+        ),
+        migrations.AlterField(
+            model_name='partcategoryparametertemplate',
+            name='default_value',
+            field=models.CharField(blank=True, help_text='Default Parameter Value', max_length=500, verbose_name='Default Value'),
+        ),
+        migrations.AlterField(
+            model_name='partcategoryparametertemplate',
+            name='parameter_template',
+            field=models.ForeignKey(help_text='Parameter Template', on_delete=django.db.models.deletion.CASCADE, related_name='part_categories', to='part.PartParameterTemplate', verbose_name='Parameter Template'),
+        ),
+        migrations.AlterField(
+            model_name='partparameter',
+            name='data',
+            field=models.CharField(help_text='Parameter Value', max_length=500, verbose_name='Data'),
+        ),
+        migrations.AlterField(
+            model_name='partparameter',
+            name='part',
+            field=models.ForeignKey(help_text='Parent Part', on_delete=django.db.models.deletion.CASCADE, related_name='parameters', to='part.Part', verbose_name='Part'),
+        ),
+        migrations.AlterField(
+            model_name='partparameter',
+            name='template',
+            field=models.ForeignKey(help_text='Parameter Template', on_delete=django.db.models.deletion.CASCADE, related_name='instances', to='part.PartParameterTemplate', verbose_name='Template'),
+        ),
+        migrations.AlterField(
+            model_name='partparametertemplate',
+            name='name',
+            field=models.CharField(help_text='Parameter Name', max_length=100, unique=True, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='partparametertemplate',
+            name='units',
+            field=models.CharField(blank=True, help_text='Parameter Units', max_length=25, verbose_name='Units'),
+        ),
+        migrations.AlterField(
+            model_name='partrelated',
+            name='part_1',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.DO_NOTHING, related_name='related_parts_1', to='part.Part', verbose_name='Part 1'),
+        ),
+        migrations.AlterField(
+            model_name='partrelated',
+            name='part_2',
+            field=models.ForeignKey(help_text='Select Related Part', on_delete=django.db.models.deletion.DO_NOTHING, related_name='related_parts_2', to='part.Part', verbose_name='Part 2'),
+        ),
+        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', verbose_name='Part'),
+        ),
+        migrations.AlterField(
+            model_name='partstar',
+            name='part',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='starred_users', to='part.Part', verbose_name='Part'),
+        ),
+        migrations.AlterField(
+            model_name='partstar',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='starred_parts', to=settings.AUTH_USER_MODEL, verbose_name='User'),
+        ),
+        migrations.AlterField(
+            model_name='parttesttemplate',
+            name='part',
+            field=models.ForeignKey(limit_choices_to={'trackable': True}, on_delete=django.db.models.deletion.CASCADE, related_name='test_templates', to='part.Part', verbose_name='Part'),
+        ),
+    ]
diff --git a/InvenTree/part/models.py b/InvenTree/part/models.py
index 9003e800d8..d2f8b805d3 100644
--- a/InvenTree/part/models.py
+++ b/InvenTree/part/models.py
@@ -443,10 +443,10 @@ class Part(MPTTModel):
             return
 
         if self.pk == parent.pk:
-            raise ValidationError({'sub_part': _("Part '{p1}' is  used in BOM for '{p2}' (recursive)".format(
+            raise ValidationError({'sub_part': _("Part '{p1}' is  used in BOM for '{p2}' (recursive)").format(
                 p1=str(self),
                 p2=str(parent)
-            ))})
+            )})
 
         bom_items = self.get_bom_items()
 
@@ -455,10 +455,10 @@ class Part(MPTTModel):
 
             # Check for simple match
             if item.sub_part == parent:
-                raise ValidationError({'sub_part': _("Part '{p1}' is  used in BOM for '{p2}' (recursive)".format(
+                raise ValidationError({'sub_part': _("Part '{p1}' is  used in BOM for '{p2}' (recursive)").format(
                     p1=str(parent),
                     p2=str(self)
-                ))})
+                )})
 
             # And recursively check too
             item.sub_part.checkAddToBOM(parent)
@@ -750,6 +750,7 @@ class Part(MPTTModel):
         blank=True,
         variations={'thumbnail': (128, 128)},
         delete_orphans=False,
+        verbose_name=_('Image'),
     )
 
     default_location = TreeForeignKey(
@@ -1852,7 +1853,7 @@ class PartAttachment(InvenTreeAttachment):
         return os.path.join("part_files", str(self.part.id))
 
     part = models.ForeignKey(Part, on_delete=models.CASCADE,
-                             related_name='attachments')
+                             verbose_name=_('Part'), related_name='attachments')
 
 
 class PartSellPriceBreak(common.models.PriceBreak):
@@ -1863,7 +1864,8 @@ class PartSellPriceBreak(common.models.PriceBreak):
     part = models.ForeignKey(
         Part, on_delete=models.CASCADE,
         related_name='salepricebreaks',
-        limit_choices_to={'salable': True}
+        limit_choices_to={'salable': True},
+        verbose_name=_('Part')
     )
 
     class Meta:
@@ -1881,9 +1883,9 @@ class PartStar(models.Model):
         user: Link to a User object
     """
 
-    part = models.ForeignKey(Part, on_delete=models.CASCADE, related_name='starred_users')
+    part = models.ForeignKey(Part, on_delete=models.CASCADE, verbose_name=_('Part'), related_name='starred_users')
 
-    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='starred_parts')
+    user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_('User'), related_name='starred_parts')
 
     class Meta:
         unique_together = ['part', 'user']
@@ -1956,6 +1958,7 @@ class PartTestTemplate(models.Model):
         on_delete=models.CASCADE,
         related_name='test_templates',
         limit_choices_to={'trackable': True},
+        verbose_name=_('Part'),
     )
 
     test_name = models.CharField(
@@ -2023,9 +2026,9 @@ class PartParameterTemplate(models.Model):
         except PartParameterTemplate.DoesNotExist:
             pass
 
-    name = models.CharField(max_length=100, help_text=_('Parameter Name'), unique=True)
+    name = models.CharField(max_length=100, verbose_name=_('Name'), help_text=_('Parameter Name'), unique=True)
 
-    units = models.CharField(max_length=25, help_text=_('Parameter Units'), blank=True)
+    units = models.CharField(max_length=25, verbose_name=_('Units'), help_text=_('Parameter Units'), blank=True)
 
 
 class PartParameter(models.Model):
@@ -2096,15 +2099,18 @@ class PartCategoryParameterTemplate(models.Model):
     category = models.ForeignKey(PartCategory,
                                  on_delete=models.CASCADE,
                                  related_name='parameter_templates',
+                                 verbose_name=_('Category'),
                                  help_text=_('Part Category'))
 
     parameter_template = models.ForeignKey(PartParameterTemplate,
                                            on_delete=models.CASCADE,
                                            related_name='part_categories',
+                                           verbose_name=_('Parameter Template'),
                                            help_text=_('Parameter Template'))
 
     default_value = models.CharField(max_length=500,
                                      blank=True,
+                                     verbose_name=_('Default Value'),
                                      help_text=_('Default Parameter Value'))
 
 
@@ -2133,6 +2139,7 @@ class BomItem(models.Model):
     # A link to the parent part
     # Each part will get a reverse lookup field 'bom_items'
     part = models.ForeignKey(Part, on_delete=models.CASCADE, related_name='bom_items',
+                             verbose_name=_('Part'),
                              help_text=_('Select parent part'),
                              limit_choices_to={
                                  'assembly': True,
@@ -2141,26 +2148,28 @@ class BomItem(models.Model):
     # A link to the child item (sub-part)
     # Each part will get a reverse lookup field 'used_in'
     sub_part = models.ForeignKey(Part, on_delete=models.CASCADE, related_name='used_in',
+                                 verbose_name=_('Sub part'),
                                  help_text=_('Select part to be used in BOM'),
                                  limit_choices_to={
                                      'component': True,
                                  })
 
     # Quantity required
-    quantity = models.DecimalField(default=1.0, max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], help_text=_('BOM quantity for this BOM item'))
+    quantity = models.DecimalField(default=1.0, max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], verbose_name=_('Quantity'), help_text=_('BOM quantity for this BOM item'))
 
-    optional = models.BooleanField(default=False, help_text=_("This BOM item is optional"))
+    optional = models.BooleanField(default=False, verbose_name=_('Optional'), help_text=_("This BOM item is optional"))
 
     overage = models.CharField(max_length=24, blank=True, validators=[validators.validate_overage],
+                                verbose_name=_('Overage'),
                                help_text=_('Estimated build wastage quantity (absolute or percentage)')
                                )
 
-    reference = models.CharField(max_length=500, blank=True, help_text=_('BOM item reference'))
+    reference = models.CharField(max_length=500, blank=True, verbose_name=_('Reference'), help_text=_('BOM item reference'))
 
     # Note attached to this BOM line item
-    note = models.CharField(max_length=500, blank=True, help_text=_('BOM item notes'))
+    note = models.CharField(max_length=500, blank=True, verbose_name=_('Note'), help_text=_('BOM item notes'))
 
-    checksum = models.CharField(max_length=128, blank=True, help_text=_('BOM line checksum'))
+    checksum = models.CharField(max_length=128, blank=True, verbose_name=_('Checksum'), help_text=_('BOM line checksum'))
 
     inherited = models.BooleanField(
         default=False,
@@ -2372,11 +2381,11 @@ class PartRelated(models.Model):
     """ Store and handle related parts (eg. mating connector, crimps, etc.) """
 
     part_1 = models.ForeignKey(Part, related_name='related_parts_1',
-                               on_delete=models.DO_NOTHING)
+                               verbose_name=_('Part 1'), on_delete=models.DO_NOTHING)
 
     part_2 = models.ForeignKey(Part, related_name='related_parts_2',
                                on_delete=models.DO_NOTHING,
-                               help_text=_('Select Related Part'))
+                               verbose_name=_('Part 2'), help_text=_('Select Related Part'))
 
     def __str__(self):
         return f'{self.part_1} <--> {self.part_2}'
diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index f7b366bccb..dc345f9737 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -16,13 +16,13 @@
 <div class='alert alert-block alert-info'>
 {% else %}
 <div class='alert alert-block alert-danger'>
-    The BOM for <i>{{ part.full_name }}</i> has changed, and must be validated.<br>
+    {% blocktrans with part=part.full_name %}The BOM for <i>{{ part }}</i> has changed, and must be validated.<br>{% endblocktrans %}
 {% endif %}
-    The BOM for <i>{{ part.full_name }}</i> was last checked by {{ part.bom_checked_by }} on {{ part.bom_checked_date }}
+    {% blocktrans with part=part.full_name checker=part.bom_checked_by check_date=part.bom_checked_date %}The BOM for <i>{{ part }}</i> was last checked by {{ checker }} on {{ check_date }}{% endblocktrans %}
 </div>
 {% else %}
 <div class='alert alert-danger alert-block'>
-    <b>The BOM for <i>{{ part.full_name }}</i> has not been validated.</b>
+    <b>{% blocktrans with part=part.full_name %}The BOM for <i>{{ part }}</i> has not been validated.{% endblocktrans %}</b>
 </div>
 {% endif %}
 
diff --git a/InvenTree/part/templates/part/bom_upload/upload_file.html b/InvenTree/part/templates/part/bom_upload/upload_file.html
index 05486ab0ac..148d32f5da 100644
--- a/InvenTree/part/templates/part/bom_upload/upload_file.html
+++ b/InvenTree/part/templates/part/bom_upload/upload_file.html
@@ -24,7 +24,7 @@
 </div>
 
 <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
-    <button type="submit" class="save btn btn-default">Upload File</button>
+    <button type="submit" class="save btn btn-default">{% trans 'Upload File' %}</button>
     {% csrf_token %}
     {% load crispy_forms_tags %}
 
diff --git a/InvenTree/part/templates/part/bom_validate.html b/InvenTree/part/templates/part/bom_validate.html
index 763d946bf2..6b3aff6eac 100644
--- a/InvenTree/part/templates/part/bom_validate.html
+++ b/InvenTree/part/templates/part/bom_validate.html
@@ -1,10 +1,12 @@
 {% extends "modal_form.html" %}
 
+{% load i18n %}
+
 {% block pre_form_content %}
-Confirm that the Bill of Materials (BOM) is valid for:<br><i>{{ part.full_name }}</i>
+{% blocktrans with part.full_name as part %}Confirm that the Bill of Materials (BOM) is valid for:<br><i>{{ part }}</i>{% endblocktrans %}
 
 <div class='alert alert-warning alert-block'>
-    This will validate each line in the BOM.
+    {% trans 'This will validate each line in the BOM.' %}
 </div>
 
 {% endblock %}
\ No newline at end of file
diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py
index 0208636a48..4efff3e9e3 100644
--- a/InvenTree/part/views.py
+++ b/InvenTree/part/views.py
@@ -342,7 +342,7 @@ class PartSetCategory(AjaxUpdateView):
 
         data = {
             'form_valid': valid,
-            'success': _('Set category for {n} parts'.format(n=len(self.parts)))
+            'success': _('Set category for {n} parts').format(n=len(self.parts))
         }
 
         if valid:
diff --git a/InvenTree/report/migrations/0015_auto_20210403_1837.py b/InvenTree/report/migrations/0015_auto_20210403_1837.py
new file mode 100644
index 0000000000..0348db5b35
--- /dev/null
+++ b/InvenTree/report/migrations/0015_auto_20210403_1837.py
@@ -0,0 +1,35 @@
+# Generated by Django 3.0.7 on 2021-04-03 18:37
+
+import django.core.validators
+from django.db import migrations, models
+import report.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('report', '0014_purchaseorderreport_salesorderreport'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reportasset',
+            name='asset',
+            field=models.FileField(help_text='Report asset file', upload_to=report.models.rename_asset, verbose_name='Asset'),
+        ),
+        migrations.AlterField(
+            model_name='reportasset',
+            name='description',
+            field=models.CharField(help_text='Asset file description', max_length=250, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='reportsnippet',
+            name='description',
+            field=models.CharField(help_text='Snippet file description', max_length=250, verbose_name='Description'),
+        ),
+        migrations.AlterField(
+            model_name='reportsnippet',
+            name='snippet',
+            field=models.FileField(help_text='Report snippet file', upload_to=report.models.rename_snippet, validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['html', 'htm'])], verbose_name='Snippet'),
+        ),
+    ]
diff --git a/InvenTree/report/models.py b/InvenTree/report/models.py
index a838396bf0..6f3891d6be 100644
--- a/InvenTree/report/models.py
+++ b/InvenTree/report/models.py
@@ -497,11 +497,12 @@ class ReportSnippet(models.Model):
 
     snippet = models.FileField(
         upload_to=rename_snippet,
+        verbose_name=_('Snippet'),
         help_text=_('Report snippet file'),
         validators=[FileExtensionValidator(allowed_extensions=['html', 'htm'])],
     )
 
-    description = models.CharField(max_length=250, help_text=_("Snippet file description"))
+    description = models.CharField(max_length=250, verbose_name=_('Description'), help_text=_("Snippet file description"))
 
 
 def rename_asset(instance, filename):
@@ -536,7 +537,8 @@ class ReportAsset(models.Model):
 
     asset = models.FileField(
         upload_to=rename_asset,
+        verbose_name=_('Asset'),
         help_text=_("Report asset file"),
     )
 
-    description = models.CharField(max_length=250, help_text=_("Asset file description"))
+    description = models.CharField(max_length=250, verbose_name=_('Description'), help_text=_("Asset file description"))
diff --git a/InvenTree/stock/api.py b/InvenTree/stock/api.py
index a7a7955c22..1c04ae7d65 100644
--- a/InvenTree/stock/api.py
+++ b/InvenTree/stock/api.py
@@ -195,7 +195,7 @@ class StockCount(StockAdjust):
             if item['item'].stocktake(item['quantity'], request.user, notes=self.notes):
                 n += 1
 
-        return Response({'success': 'Updated stock for {n} items'.format(n=n)})
+        return Response({'success': _('Updated stock for {n} items').format(n=n)})
 
 
 class StockAdd(StockAdjust):
@@ -264,7 +264,7 @@ class StockTransfer(StockAdjust):
             if item['item'].move(location, self.notes, request.user, quantity=item['quantity']):
                 n += 1
 
-        return Response({'success': 'Moved {n} parts to {loc}'.format(
+        return Response({'success': _('Moved {n} parts to {loc}').format(
             n=n,
             loc=str(location),
         )})
diff --git a/InvenTree/stock/forms.py b/InvenTree/stock/forms.py
index 3560f205cc..c784b08a69 100644
--- a/InvenTree/stock/forms.py
+++ b/InvenTree/stock/forms.py
@@ -111,7 +111,8 @@ class CreateStockItemForm(HelperForm):
     """ Form for creating a new StockItem """
 
     expiry_date = DatePickerFormField(
-        help_text=('Expiration date for this stock item'),
+        label=_('Expiry Date'),
+        help_text=_('Expiration date for this stock item'),
     )
 
     serial_numbers = forms.CharField(label=_('Serial Numbers'), required=False, help_text=_('Enter unique serial numbers (or leave blank)'))
@@ -165,13 +166,13 @@ class CreateStockItemForm(HelperForm):
 class SerializeStockForm(HelperForm):
     """ Form for serializing a StockItem. """
 
-    destination = TreeNodeChoiceField(queryset=StockLocation.objects.all(), label='Destination', required=True, help_text='Destination for serialized stock (by default, will remain in current location)')
+    destination = TreeNodeChoiceField(queryset=StockLocation.objects.all(), label=_('Destination'), required=True, help_text=_('Destination for serialized stock (by default, will remain in current location)'))
     
-    serial_numbers = forms.CharField(label='Serial numbers', required=True, help_text='Unique serial numbers (must match quantity)')
+    serial_numbers = forms.CharField(label=_('Serial numbers'), required=True, help_text=_('Unique serial numbers (must match quantity)'))
     
-    note = forms.CharField(label='Notes', required=False, help_text='Add transaction note (optional)')
+    note = forms.CharField(label=_('Notes'), required=False, help_text=_('Add transaction note (optional)'))
 
-    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5)
+    quantity = RoundingDecimalFormField(max_digits=10, decimal_places=5, label=_('Quantity'))
 
     def __init__(self, *args, **kwargs):
 
@@ -263,7 +264,7 @@ class ExportOptionsForm(HelperForm):
 
     file_format = forms.ChoiceField(label=_('File Format'), help_text=_('Select output file format'))
 
-    include_sublocations = forms.BooleanField(required=False, initial=True, help_text=_("Include stock items in sub locations"))
+    include_sublocations = forms.BooleanField(required=False, initial=True, label=_('Include sublocations'), help_text=_("Include stock items in sub locations"))
 
     class Meta:
         model = StockLocation
@@ -402,7 +403,8 @@ class EditStockItemForm(HelperForm):
     """
 
     expiry_date = DatePickerFormField(
-        help_text=('Expiration date for this stock item'),
+        label=_('Expiry Date'),
+        help_text=_('Expiration date for this stock item'),
     )
 
     class Meta:
diff --git a/InvenTree/stock/migrations/0059_auto_20210403_1210.py b/InvenTree/stock/migrations/0059_auto_20210404_2016.py
similarity index 69%
rename from InvenTree/stock/migrations/0059_auto_20210403_1210.py
rename to InvenTree/stock/migrations/0059_auto_20210404_2016.py
index ae11eb7536..b027a53854 100644
--- a/InvenTree/stock/migrations/0059_auto_20210403_1210.py
+++ b/InvenTree/stock/migrations/0059_auto_20210404_2016.py
@@ -1,9 +1,10 @@
-# Generated by Django 3.0.7 on 2021-04-03 12:10
+# Generated by Django 3.0.7 on 2021-04-04 20:16
 
 import InvenTree.fields
 import InvenTree.models
 import InvenTree.validators
 from django.conf import settings
+import django.core.validators
 from django.db import migrations, models
 import django.db.models.deletion
 import mptt.fields
@@ -12,11 +13,22 @@ import mptt.fields
 class Migration(migrations.Migration):
 
     dependencies = [
+        ('users', '0005_owner_model'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('stock', '0058_stockitem_packaging'),
     ]
 
     operations = [
+        migrations.AlterField(
+            model_name='stockitem',
+            name='delete_on_deplete',
+            field=models.BooleanField(default=True, help_text='Delete this Stock Item when stock is depleted', verbose_name='Delete on deplete'),
+        ),
+        migrations.AlterField(
+            model_name='stockitem',
+            name='owner',
+            field=models.ForeignKey(blank=True, help_text='Select Owner', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_items', to='users.Owner', verbose_name='Owner'),
+        ),
         migrations.AlterField(
             model_name='stockitemattachment',
             name='attachment',
@@ -47,6 +59,11 @@ class Migration(migrations.Migration):
             name='notes',
             field=models.CharField(blank=True, help_text='Entry notes', max_length=512, verbose_name='Notes'),
         ),
+        migrations.AlterField(
+            model_name='stockitemtracking',
+            name='quantity',
+            field=models.DecimalField(decimal_places=5, default=1, max_digits=15, validators=[django.core.validators.MinValueValidator(0)], verbose_name='Quantity'),
+        ),
         migrations.AlterField(
             model_name='stockitemtracking',
             name='title',
@@ -62,6 +79,11 @@ class Migration(migrations.Migration):
             name='name',
             field=models.CharField(help_text='Name', max_length=100, validators=[InvenTree.validators.validate_tree_name], verbose_name='Name'),
         ),
+        migrations.AlterField(
+            model_name='stocklocation',
+            name='owner',
+            field=models.ForeignKey(blank=True, help_text='Select Owner', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='stock_locations', to='users.Owner', verbose_name='Owner'),
+        ),
         migrations.AlterField(
             model_name='stocklocation',
             name='parent',
diff --git a/InvenTree/stock/models.py b/InvenTree/stock/models.py
index df767a3a70..b57f96d0f7 100644
--- a/InvenTree/stock/models.py
+++ b/InvenTree/stock/models.py
@@ -51,7 +51,8 @@ class StockLocation(InvenTreeTree):
     """
 
     owner = models.ForeignKey(Owner, on_delete=models.SET_NULL, blank=True, null=True,
-                              help_text='Select Owner',
+                              verbose_name=_('Owner'),
+                              help_text=_('Select Owner'),
                               related_name='stock_locations')
 
     def get_absolute_url(self):
@@ -483,7 +484,7 @@ class StockItem(MPTTModel):
 
     review_needed = models.BooleanField(default=False)
 
-    delete_on_deplete = models.BooleanField(default=True, help_text=_('Delete this Stock Item when stock is depleted'))
+    delete_on_deplete = models.BooleanField(default=True, verbose_name=_('Delete on deplete'), help_text=_('Delete this Stock Item when stock is depleted'))
 
     status = models.PositiveIntegerField(
         default=StockStatus.OK,
@@ -507,7 +508,8 @@ class StockItem(MPTTModel):
     )
 
     owner = models.ForeignKey(Owner, on_delete=models.SET_NULL, blank=True, null=True,
-                              help_text='Select Owner',
+                              verbose_name=_('Owner'),
+                              help_text=_('Select Owner'),
                               related_name='stock_items')
 
     def is_stale(self):
@@ -948,7 +950,7 @@ class StockItem(MPTTModel):
             raise ValidationError({"quantity": _("Quantity must be greater than zero")})
 
         if quantity > self.quantity:
-            raise ValidationError({"quantity": _("Quantity must not exceed available stock quantity ({n})".format(n=self.quantity))})
+            raise ValidationError({"quantity": _("Quantity must not exceed available stock quantity ({n})").format(n=self.quantity)})
 
         if not type(serials) in [list, tuple]:
             raise ValidationError({"serial_numbers": _("Serial numbers must be a list of integers")})
@@ -989,7 +991,7 @@ class StockItem(MPTTModel):
             new_item.addTransactionNote(_('Add serial number'), user, notes=notes)
 
         # Remove the equivalent number of items
-        self.take_stock(quantity, user, notes=_('Serialized {n} items'.format(n=quantity)))
+        self.take_stock(quantity, user, notes=_('Serialized {n} items').format(n=quantity))
 
     @transaction.atomic
     def copyHistoryFrom(self, other):
@@ -1558,7 +1560,7 @@ class StockItemTracking(models.Model):
 
     system = models.BooleanField(default=False)
 
-    quantity = models.DecimalField(max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], default=1)
+    quantity = models.DecimalField(max_digits=15, decimal_places=5, validators=[MinValueValidator(0)], default=1, verbose_name=_('Quantity'))
 
     # TODO
     # image = models.ImageField(upload_to=func, max_length=255, null=True, blank=True)
diff --git a/InvenTree/stock/views.py b/InvenTree/stock/views.py
index eeee13ad3a..72395a54d0 100644
--- a/InvenTree/stock/views.py
+++ b/InvenTree/stock/views.py
@@ -965,7 +965,7 @@ class StockAdjust(AjaxView, FormMixin):
 
         context['stock_action'] = self.stock_action.strip().lower()
 
-        context['stock_action_title'] = self.stock_action.capitalize()
+        context['stock_action_title'] = self.stock_action_title
 
         # Quantity column will be read-only in some circumstances
         context['edit_quantity'] = not self.stock_action == 'delete'
@@ -993,17 +993,18 @@ class StockAdjust(AjaxView, FormMixin):
         if self.stock_action not in ['move', 'count', 'take', 'add', 'delete']:
             self.stock_action = 'count'
 
-        # Choose the form title based on the action
+        # Choose form title and action column based on the action
         titles = {
-            'move': _('Move Stock Items'),
-            'count': _('Count Stock Items'),
-            'take': _('Remove From Stock'),
-            'add': _('Add Stock Items'),
-            'delete': _('Delete Stock Items')
+            'move': [_('Move Stock Items'), _('Move')],
+            'count': [_('Count Stock Items'), _('Count')],
+            'take': [_('Remove From Stock'), _('Take')],
+            'add': [_('Add Stock Items'), _('Add')],
+            'delete': [_('Delete Stock Items'), _('Delete')],
         }
 
-        self.ajax_form_title = titles[self.stock_action]
-        
+        self.ajax_form_title = titles[self.stock_action][0]
+        self.stock_action_title = titles[self.stock_action][1]
+
         # Save list of items!
         self.stock_items = self.get_GET_items()
 
@@ -1039,7 +1040,7 @@ class StockAdjust(AjaxView, FormMixin):
             if self.stock_action in ['move', 'take']:
 
                 if item.new_quantity > item.quantity:
-                    item.error = _('Quantity must not exceed {x}'.format(x=item.quantity))
+                    item.error = _('Quantity must not exceed {x}').format(x=item.quantity)
                     valid = False
                     continue
 
@@ -1118,7 +1119,7 @@ class StockAdjust(AjaxView, FormMixin):
 
             count += 1
 
-        return f"{_('Added stock to ')} {count} {_('items')}"
+        return _('Added stock to {n} items').format(n=count)
 
     def do_take(self):
 
@@ -1133,7 +1134,7 @@ class StockAdjust(AjaxView, FormMixin):
 
             count += 1
 
-        return f"{_('Removed stock from ')} {count} {_('items')}"
+        return _('Removed stock from {n} items').format(n=count)
 
     def do_count(self):
         
@@ -1189,9 +1190,9 @@ class StockAdjust(AjaxView, FormMixin):
             return _('No items were moved')
         
         else:
-            return _('Moved {n} items to {dest}'.format(
+            return _('Moved {n} items to {dest}').format(
                 n=count,
-                dest=destination.pathstring))
+                dest=destination.pathstring)
 
     def do_delete(self):
         """ Delete multiple stock items """
@@ -1208,7 +1209,7 @@ class StockAdjust(AjaxView, FormMixin):
 
             count += 1
 
-        return _("Deleted {n} stock items".format(n=count))
+        return _("Deleted {n} stock items").format(n=count)
 
 
 class StockItemEdit(AjaxUpdateView):