From b7f30ee13648f656c3a8b86eff2f016714b650f4 Mon Sep 17 00:00:00 2001
From: Oliver Walters <oliver.henry.walters@gmail.com>
Date: Thu, 30 Jul 2020 20:26:14 +1000
Subject: [PATCH] Update translations

---
 InvenTree/locale/de/LC_MESSAGES/django.mo | Bin 50749 -> 50558 bytes
 InvenTree/locale/de/LC_MESSAGES/django.po | 602 ++++++++++++++--------
 InvenTree/locale/en/LC_MESSAGES/django.po | 551 ++++++++++++--------
 InvenTree/locale/es/LC_MESSAGES/django.po | 551 ++++++++++++--------
 4 files changed, 1033 insertions(+), 671 deletions(-)

diff --git a/InvenTree/locale/de/LC_MESSAGES/django.mo b/InvenTree/locale/de/LC_MESSAGES/django.mo
index 93b1affc812a1b20499aa917caeb284ddbaf61c9..766a862f9d50bc0ab1252c60a0bf54afb543b655 100644
GIT binary patch
delta 15762
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
HdeZ*^J>})w

delta 15891
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

diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index 18a24b1387..420b316c25 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-06-12 00:43+0000\n"
+"POT-Creation-Date: 2020-07-30 10:24+0000\n"
 "PO-Revision-Date: 2020-05-03 11:32+0200\n"
 "Last-Translator: Christian Schlüter <chschlue@gmail.com>\n"
 "Language-Team: C <kde-i18n-doc@kde.org>\n"
@@ -83,7 +83,7 @@ msgstr "Datei zum Anhängen auswählen"
 msgid "File comment"
 msgstr "Datei-Kommentar"
 
-#: InvenTree/models.py:68 templates/js/stock.html:662
+#: InvenTree/models.py:68 templates/js/stock.html:669
 msgid "User"
 msgstr "Benutzer"
 
@@ -303,9 +303,10 @@ msgstr "Eltern-Bau, dem dieser Bau zugewiesen ist"
 #: order/templates/order/purchase_order_detail.html:145
 #: order/templates/order/receive_parts.html:19 part/models.py:240
 #: part/templates/part/part_app_base.html:7
-#: part/templates/part/set_category.html:13 templates/js/bom.html:135
-#: templates/js/build.html:41 templates/js/company.html:109
-#: templates/js/part.html:120 templates/js/stock.html:422
+#: part/templates/part/set_category.html:13 templates/js/barcode.html:336
+#: templates/js/bom.html:135 templates/js/build.html:41
+#: templates/js/company.html:109 templates/js/part.html:120
+#: templates/js/stock.html:424
 msgid "Part"
 msgstr "Teil"
 
@@ -341,7 +342,7 @@ msgstr "Bau-Anzahl"
 msgid "Number of parts to build"
 msgstr "Anzahl der zu bauenden Teile"
 
-#: build/models.py:128 part/templates/part/part_base.html:141
+#: build/models.py:128 part/templates/part/part_base.html:139
 msgid "Build Status"
 msgstr "Bau-Status"
 
@@ -360,7 +361,7 @@ msgstr "Chargennummer für diese Bau-Ausgabe"
 #: build/models.py:155 build/templates/build/detail.html:55
 #: company/templates/company/supplier_part_base.html:60
 #: company/templates/company/supplier_part_detail.html:24
-#: part/templates/part/detail.html:74 part/templates/part/part_base.html:88
+#: part/templates/part/detail.html:74 part/templates/part/part_base.html:86
 #: stock/models.py:368 stock/templates/stock/item_base.html:230
 msgid "External Link"
 msgstr "Externer Link"
@@ -369,13 +370,13 @@ msgstr "Externer Link"
 msgid "Link to external URL"
 msgstr "Link zu einer externen URL"
 
-#: build/models.py:160 build/templates/build/tabs.html:14 company/models.py:302
+#: build/models.py:160 build/templates/build/tabs.html:14 company/models.py:307
 #: company/templates/company/tabs.html:33 order/templates/order/po_tabs.html:15
 #: order/templates/order/purchase_order_detail.html:200
-#: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:73
+#: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:64
 #: stock/models.py:436 stock/models.py:1265 stock/templates/stock/tabs.html:26
-#: templates/js/bom.html:229 templates/js/stock.html:113
-#: templates/js/stock.html:506
+#: templates/js/barcode.html:391 templates/js/bom.html:229
+#: templates/js/stock.html:113 templates/js/stock.html:513
 msgid "Notes"
 msgstr "Notizen"
 
@@ -442,7 +443,7 @@ msgstr "Neues Lagerobjekt"
 #: build/templates/build/allocate.html:161
 #: order/templates/order/sales_order_detail.html:68
 #: order/templates/order/sales_order_detail.html:150 stock/models.py:362
-#: stock/templates/stock/item_base.html:189
+#: stock/templates/stock/item_base.html:146
 msgid "Serial Number"
 msgstr "Seriennummer"
 
@@ -459,16 +460,18 @@ msgstr "Seriennummer"
 #: part/templates/part/allocation.html:49
 #: stock/templates/stock/item_base.html:26
 #: stock/templates/stock/item_base.html:32
-#: stock/templates/stock/item_base.html:195
-#: stock/templates/stock/stock_adjust.html:18 templates/js/bom.html:172
-#: templates/js/build.html:52 templates/js/stock.html:653
+#: stock/templates/stock/item_base.html:152
+#: stock/templates/stock/stock_adjust.html:18 templates/js/barcode.html:338
+#: templates/js/bom.html:172 templates/js/build.html:52
+#: templates/js/stock.html:660
 msgid "Quantity"
 msgstr "Anzahl"
 
 #: build/templates/build/allocate.html:177
 #: build/templates/build/auto_allocate.html:20
-#: stock/templates/stock/item_base.html:171
-#: stock/templates/stock/stock_adjust.html:17 templates/js/stock.html:493
+#: stock/templates/stock/item_base.html:184
+#: stock/templates/stock/stock_adjust.html:17 templates/js/barcode.html:337
+#: templates/js/stock.html:495
 msgid "Location"
 msgstr "Standort"
 
@@ -494,7 +497,7 @@ msgstr "Keine BOM-Einträge gefunden"
 #: templates/js/bom.html:157 templates/js/company.html:60
 #: templates/js/order.html:157 templates/js/order.html:230
 #: templates/js/part.html:176 templates/js/part.html:355
-#: templates/js/stock.html:443 templates/js/stock.html:634
+#: templates/js/stock.html:445 templates/js/stock.html:641
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -504,8 +507,8 @@ msgstr "Beschreibung"
 msgid "Reference"
 msgstr "Referenz"
 
-#: build/templates/build/allocate.html:338 part/models.py:1260
-#: templates/js/part.html:359 templates/js/table_filters.html:63
+#: build/templates/build/allocate.html:338 part/models.py:1269
+#: templates/js/part.html:359 templates/js/table_filters.html:90
 msgid "Required"
 msgstr "benötigt"
 
@@ -569,9 +572,9 @@ msgstr "Bau-Status"
 #: build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:42
 #: order/templates/order/receive_parts.html:24
-#: stock/templates/stock/item_base.html:262 templates/js/build.html:57
-#: templates/js/order.html:162 templates/js/order.html:235
-#: templates/js/stock.html:480
+#: stock/templates/stock/item_base.html:262 templates/js/barcode.html:42
+#: templates/js/build.html:57 templates/js/order.html:162
+#: templates/js/order.html:235 templates/js/stock.html:482
 msgid "Status"
 msgstr "Status"
 
@@ -581,7 +584,7 @@ msgstr "Status"
 #: order/templates/order/sales_order_notes.html:10
 #: order/templates/order/sales_order_ship.html:25
 #: part/templates/part/allocation.html:27
-#: stock/templates/stock/item_base.html:159 templates/js/order.html:209
+#: stock/templates/stock/item_base.html:172 templates/js/order.html:209
 msgid "Sales Order"
 msgstr "Bestellung"
 
@@ -650,7 +653,7 @@ msgid "Stock can be taken from any available location."
 msgstr "Bestand kann jedem verfügbaren Lagerort entnommen werden."
 
 #: build/templates/build/detail.html:48
-#: stock/templates/stock/item_base.html:202 templates/js/stock.html:488
+#: stock/templates/stock/item_base.html:202 templates/js/stock.html:490
 msgid "Batch"
 msgstr "Los"
 
@@ -875,83 +878,117 @@ msgstr "Währung bearbeiten"
 msgid "Delete Currency"
 msgstr "Währung entfernen"
 
-#: company/models.py:83
+#: company/models.py:83 company/models.py:84
 msgid "Company name"
 msgstr "Firmenname"
 
-#: company/models.py:85
+#: company/models.py:86
+#, fuzzy
+#| msgid "Part description"
+msgid "Company description"
+msgstr "Beschreibung des Teils"
+
+#: company/models.py:86
 msgid "Description of the company"
 msgstr "Firmenbeschreibung"
 
-#: company/models.py:87
+#: company/models.py:88 company/templates/company/company_base.html:48
+#: templates/js/company.html:65
+msgid "Website"
+msgstr "Website"
+
+#: company/models.py:88
 msgid "Company website URL"
 msgstr "Firmenwebsite"
 
-#: company/models.py:90
+#: company/models.py:91 company/templates/company/company_base.html:55
+msgid "Address"
+msgstr "Adresse"
+
+#: company/models.py:92
 msgid "Company address"
 msgstr "Firmenadresse"
 
-#: company/models.py:93
+#: company/models.py:95
+#, fuzzy
+#| msgid "Contact phone number"
+msgid "Phone number"
+msgstr "Kontakt-Tel."
+
+#: company/models.py:96
 msgid "Contact phone number"
 msgstr "Kontakt-Tel."
 
-#: company/models.py:95
+#: company/models.py:98 company/templates/company/company_base.html:69
+msgid "Email"
+msgstr "Email"
+
+#: company/models.py:98
 msgid "Contact email address"
 msgstr "Kontakt-Email"
 
-#: company/models.py:98
+#: company/models.py:101 company/templates/company/company_base.html:76
+msgid "Contact"
+msgstr "Kontakt"
+
+#: company/models.py:102
 msgid "Point of contact"
 msgstr "Anlaufstelle"
 
-#: company/models.py:100
+#: company/models.py:104
 msgid "Link to external company information"
 msgstr "Link auf externe Firmeninformation"
 
-#: company/models.py:112
+#: company/models.py:116
 msgid "Do you sell items to this company?"
 msgstr "Verkaufen Sie Teile an diese Firma?"
 
-#: company/models.py:114
+#: company/models.py:118
 msgid "Do you purchase items from this company?"
 msgstr "Kaufen Sie Teile von dieser Firma?"
 
-#: company/models.py:116
+#: company/models.py:120
 msgid "Does this company manufacture parts?"
 msgstr "Produziert diese Firma Teile?"
 
-#: company/models.py:276
+#: company/models.py:276 stock/models.py:322
+#: stock/templates/stock/item_base.html:138
+msgid "Base Part"
+msgstr "Basisteil"
+
+#: company/models.py:281
 msgid "Select part"
 msgstr "Teil auswählen"
 
-#: company/models.py:282
+#: company/models.py:287
 msgid "Select supplier"
 msgstr "Zulieferer auswählen"
 
-#: company/models.py:285
+#: company/models.py:290
 msgid "Supplier stock keeping unit"
 msgstr "Stock Keeping Units (SKU) des Zulieferers"
 
-#: company/models.py:292
+#: company/models.py:297
 msgid "Select manufacturer"
 msgstr "Hersteller auswählen"
 
-#: company/models.py:296
+#: company/models.py:301
 msgid "Manufacturer part number"
 msgstr "Hersteller-Teilenummer"
 
-#: company/models.py:298
+#: company/models.py:303
 msgid "URL for external supplier part link"
 msgstr "Teil-URL des Zulieferers"
 
-#: company/models.py:300
+#: company/models.py:305
 msgid "Supplier part description"
 msgstr "Zuliefererbeschreibung des Teils"
 
-#: company/models.py:304
+#: company/models.py:309
 msgid "Minimum charge (e.g. stocking fee)"
 msgstr "Mindestpreis"
 
-#: company/models.py:306
+#: company/models.py:311
 msgid "Part packaging"
 msgstr "Teile-Packaging"
 
@@ -972,26 +1009,10 @@ msgstr "Firma"
 msgid "Company Details"
 msgstr "Firmendetails"
 
-#: company/templates/company/company_base.html:48 templates/js/company.html:65
-msgid "Website"
-msgstr "Website"
-
-#: company/templates/company/company_base.html:55
-msgid "Address"
-msgstr "Adresse"
-
 #: company/templates/company/company_base.html:62
 msgid "Phone"
 msgstr "Telefon"
 
-#: company/templates/company/company_base.html:69
-msgid "Email"
-msgstr "Email"
-
-#: company/templates/company/company_base.html:76
-msgid "Contact"
-msgstr "Kontakt"
-
 #: company/templates/company/detail.html:16
 #: company/templates/company/supplier_part_base.html:76
 #: company/templates/company/supplier_part_detail.html:30
@@ -1011,7 +1032,7 @@ msgstr "Zulieferer"
 
 #: company/templates/company/detail.html:26 order/models.py:314
 #: order/templates/order/sales_order_base.html:73 stock/models.py:357
-#: stock/models.py:358 stock/templates/stock/item_base.html:146
+#: stock/models.py:358 stock/templates/stock/item_base.html:159
 #: templates/js/company.html:44 templates/js/order.html:217
 msgid "Customer"
 msgstr "Kunde"
@@ -1022,7 +1043,7 @@ msgstr "Zulieferer-Teile"
 
 #: company/templates/company/detail_part.html:13
 #: order/templates/order/purchase_order_detail.html:67
-#: part/templates/part/stock.html:82 part/templates/part/supplier.html:12
+#: part/templates/part/stock.html:81 part/templates/part/supplier.html:12
 msgid "New Supplier Part"
 msgstr "Neues Zulieferer-Teil"
 
@@ -1036,7 +1057,7 @@ msgid "Delete Parts"
 msgstr "Teile löschen"
 
 #: company/templates/company/detail_part.html:43
-#: part/templates/part/stock.html:76
+#: part/templates/part/stock.html:75
 msgid "New Part"
 msgstr "Neues Teil"
 
@@ -1068,7 +1089,7 @@ msgstr "Zuliefererbestand"
 
 #: company/templates/company/detail_stock.html:34
 #: company/templates/company/supplier_part_stock.html:33
-#: part/templates/part/stock.html:54 templates/stock_table.html:5
+#: part/templates/part/stock.html:53 templates/stock_table.html:5
 msgid "Export"
 msgstr "Exportieren"
 
@@ -1209,12 +1230,12 @@ msgstr "Zuliefererbestand"
 #: company/templates/company/supplier_part_stock.html:56
 #: order/templates/order/purchase_order_detail.html:38
 #: order/templates/order/purchase_order_detail.html:118
-#: part/templates/part/stock.html:91
+#: part/templates/part/stock.html:90
 msgid "New Location"
 msgstr "Neuer Standort"
 
 #: company/templates/company/supplier_part_stock.html:57
-#: part/templates/part/stock.html:92
+#: part/templates/part/stock.html:91
 msgid "Create New Location"
 msgstr "Neuen Standort anlegen"
 
@@ -1225,7 +1246,7 @@ msgstr "Bepreisung"
 #: company/templates/company/supplier_part_tabs.html:8
 #: company/templates/company/tabs.html:12 part/templates/part/tabs.html:18
 #: stock/templates/stock/location.html:12 templates/js/part.html:203
-#: templates/js/stock.html:451 templates/navbar.html:11
+#: templates/js/stock.html:453 templates/navbar.html:11
 msgid "Stock"
 msgstr "Lagerbestand"
 
@@ -1305,7 +1326,7 @@ msgstr "Firma gelöscht"
 msgid "Edit Supplier Part"
 msgstr "Zuliefererteil bearbeiten"
 
-#: company/views.py:265 part/templates/part/stock.html:83
+#: company/views.py:265 part/templates/part/stock.html:82
 msgid "Create new Supplier Part"
 msgstr "Neues Zuliefererteil anlegen"
 
@@ -1544,7 +1565,7 @@ msgid "Purchase Order Attachments"
 msgstr "Bestellanhänge"
 
 #: order/templates/order/po_tabs.html:8 order/templates/order/so_tabs.html:16
-#: part/templates/part/tabs.html:70 stock/templates/stock/tabs.html:32
+#: part/templates/part/tabs.html:61 stock/templates/stock/tabs.html:32
 msgid "Attachments"
 msgstr "Anhänge"
 
@@ -1560,7 +1581,7 @@ msgstr "Bestellpositionen"
 
 #: order/templates/order/purchase_order_detail.html:39
 #: order/templates/order/purchase_order_detail.html:119
-#: stock/templates/stock/location.html:17
+#: stock/templates/stock/location.html:16
 msgid "Create new stock location"
 msgstr "Neuen Lagerort anlegen"
 
@@ -1599,7 +1620,7 @@ msgid "Select parts to receive against this order"
 msgstr ""
 
 #: order/templates/order/receive_parts.html:21
-#: part/templates/part/part_base.html:131 templates/js/part.html:219
+#: part/templates/part/part_base.html:129 templates/js/part.html:219
 msgid "On Order"
 msgstr "bestellt"
 
@@ -1996,13 +2017,13 @@ msgstr "Bemerkungen - unterstüzt Markdown-Formatierung"
 msgid "Stored BOM checksum"
 msgstr "Prüfsumme der Stückliste gespeichert"
 
-#: part/models.py:1212
+#: part/models.py:1221
 #, fuzzy
 #| msgid "Stock item cannot be created for a template Part"
 msgid "Test templates can only be created for trackable parts"
 msgstr "Lagerobjekt kann nicht für Vorlagen-Teile angelegt werden"
 
-#: part/models.py:1229
+#: part/models.py:1238
 #, fuzzy
 #| msgid ""
 #| "A stock item with this serial number already exists for template part "
@@ -2012,117 +2033,117 @@ msgstr ""
 "Ein Teil mit dieser Seriennummer existiert bereits für die Teilevorlage "
 "{part}"
 
-#: part/models.py:1248 templates/js/part.html:350 templates/js/stock.html:89
+#: part/models.py:1257 templates/js/part.html:350 templates/js/stock.html:89
 #, fuzzy
 #| msgid "Instance Name"
 msgid "Test Name"
 msgstr "Instanzname"
 
-#: part/models.py:1249
+#: part/models.py:1258
 #, fuzzy
 #| msgid "Serial number for this item"
 msgid "Enter a name for the test"
 msgstr "Seriennummer für dieses Teil"
 
-#: part/models.py:1254
+#: part/models.py:1263
 #, fuzzy
 #| msgid "Description"
 msgid "Test Description"
 msgstr "Beschreibung"
 
-#: part/models.py:1255
+#: part/models.py:1264
 #, fuzzy
 #| msgid "Brief description of the build"
 msgid "Enter description for this test"
 msgstr "Kurze Beschreibung des Baus"
 
-#: part/models.py:1261
+#: part/models.py:1270
 msgid "Is this test required to pass?"
 msgstr ""
 
-#: part/models.py:1266 templates/js/part.html:367
+#: part/models.py:1275 templates/js/part.html:367
 #, fuzzy
 #| msgid "Required Parts"
 msgid "Requires Value"
 msgstr "benötigte Teile"
 
-#: part/models.py:1267
+#: part/models.py:1276
 msgid "Does this test require a value when adding a test result?"
 msgstr ""
 
-#: part/models.py:1272 templates/js/part.html:374
+#: part/models.py:1281 templates/js/part.html:374
 #, fuzzy
 #| msgid "Delete Attachment"
 msgid "Requires Attachment"
 msgstr "Anhang löschen"
 
-#: part/models.py:1273
+#: part/models.py:1282
 msgid "Does this test require a file attachment when adding a test result?"
 msgstr ""
 
-#: part/models.py:1306
+#: part/models.py:1315
 msgid "Parameter template name must be unique"
 msgstr "Vorlagen-Name des Parameters muss eindeutig sein"
 
-#: part/models.py:1311
+#: part/models.py:1320
 msgid "Parameter Name"
 msgstr "Name des Parameters"
 
-#: part/models.py:1313
+#: part/models.py:1322
 msgid "Parameter Units"
 msgstr "Parameter Einheit"
 
-#: part/models.py:1339
+#: part/models.py:1348
 msgid "Parent Part"
 msgstr "Ausgangsteil"
 
-#: part/models.py:1341
+#: part/models.py:1350
 msgid "Parameter Template"
 msgstr "Parameter Vorlage"
 
-#: part/models.py:1343
+#: part/models.py:1352
 msgid "Parameter Value"
 msgstr "Parameter Wert"
 
-#: part/models.py:1372
+#: part/models.py:1381
 msgid "Select parent part"
 msgstr "Ausgangsteil auswählen"
 
-#: part/models.py:1380
+#: part/models.py:1389
 msgid "Select part to be used in BOM"
 msgstr "Teil für die Nutzung in der Stückliste auswählen"
 
-#: part/models.py:1386
+#: part/models.py:1395
 msgid "BOM quantity for this BOM item"
 msgstr "Stücklisten-Anzahl für dieses Stücklisten-Teil"
 
-#: part/models.py:1389
+#: part/models.py:1398
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr "Geschätzter Ausschuss (absolut oder prozentual)"
 
-#: part/models.py:1392
+#: part/models.py:1401
 msgid "BOM item reference"
 msgstr "Referenz des Objekts auf der Stückliste"
 
-#: part/models.py:1395
+#: part/models.py:1404
 msgid "BOM item notes"
 msgstr "Notizen zum Stücklisten-Objekt"
 
-#: part/models.py:1397
+#: part/models.py:1406
 msgid "BOM line checksum"
 msgstr "Prüfsumme der Stückliste"
 
-#: part/models.py:1461 stock/models.py:233
+#: part/models.py:1470 stock/models.py:233
 #, fuzzy
 #| msgid "Overage must be an integer value or a percentage"
 msgid "Quantity must be integer value for trackable parts"
 msgstr "Überschuss muss eine Ganzzahl oder ein Prozentwert sein"
 
-#: part/models.py:1470
+#: part/models.py:1479
 msgid "Part cannot be added to its own Bill of Materials"
 msgstr "Teil kann nicht zu seiner eigenen Stückliste hinzugefügt werden"
 
-#: part/models.py:1477
+#: part/models.py:1486
 #, python-brace-format
 msgid "Part '{p1}' is  used in BOM for '{p2}' (recursive)"
 msgstr "Teil '{p1}' wird in Stückliste für Teil '{p2}' benutzt (rekursiv)"
@@ -2144,12 +2165,12 @@ msgstr "Bestellung"
 #: stock/templates/stock/item_base.html:58
 #: stock/templates/stock/item_base.html:224
 #: stock/templates/stock/stock_adjust.html:16 templates/js/build.html:106
-#: templates/js/stock.html:623
+#: templates/js/stock.html:630
 msgid "Stock Item"
 msgstr "Lagerobjekt"
 
 #: part/templates/part/allocation.html:20
-#: stock/templates/stock/item_base.html:165
+#: stock/templates/stock/item_base.html:178
 msgid "Build Order"
 msgstr "Bauauftrag"
 
@@ -2230,7 +2251,7 @@ msgstr "Teile (inklusive Unter-Kategorien)"
 msgid "Part Details"
 msgstr "Teile-Details"
 
-#: part/templates/part/detail.html:25 part/templates/part/part_base.html:81
+#: part/templates/part/detail.html:25 part/templates/part/part_base.html:79
 msgid "IPN"
 msgstr "IPN (Interne Produktnummer)"
 
@@ -2290,7 +2311,7 @@ msgid "Part is not a virtual part"
 msgstr "Teil ist nicht virtuell"
 
 #: part/templates/part/detail.html:139 stock/forms.py:194
-#: templates/js/table_filters.html:122
+#: templates/js/table_filters.html:149
 msgid "Template"
 msgstr "Vorlage"
 
@@ -2306,7 +2327,7 @@ msgstr "Teil kann keine Vorlage sein wenn es Variante eines anderen Teils ist"
 msgid "Part is not a template part"
 msgstr "Teil ist nicht virtuell"
 
-#: part/templates/part/detail.html:148 templates/js/table_filters.html:134
+#: part/templates/part/detail.html:148 templates/js/table_filters.html:161
 msgid "Assembly"
 msgstr "Baugruppe"
 
@@ -2318,7 +2339,7 @@ msgstr "Teil kann aus anderen Teilen angefertigt werden"
 msgid "Part cannot be assembled from other parts"
 msgstr "Teil kann nicht aus anderen Teilen angefertigt werden"
 
-#: part/templates/part/detail.html:157 templates/js/table_filters.html:138
+#: part/templates/part/detail.html:157 templates/js/table_filters.html:165
 msgid "Component"
 msgstr "Komponente"
 
@@ -2330,7 +2351,7 @@ msgstr "Teil kann in Baugruppen benutzt werden"
 msgid "Part cannot be used in assemblies"
 msgstr "Teil kann nicht in Baugruppen benutzt werden"
 
-#: part/templates/part/detail.html:166 templates/js/table_filters.html:150
+#: part/templates/part/detail.html:166 templates/js/table_filters.html:177
 msgid "Trackable"
 msgstr "nachverfolgbar"
 
@@ -2350,7 +2371,7 @@ msgstr "Kaufbar"
 msgid "Part can be purchased from external suppliers"
 msgstr "Teil kann von externen Zulieferern gekauft werden"
 
-#: part/templates/part/detail.html:184 templates/js/table_filters.html:146
+#: part/templates/part/detail.html:184 templates/js/table_filters.html:173
 msgid "Salable"
 msgstr "Verkäuflich"
 
@@ -2362,7 +2383,7 @@ msgstr "Teil kann an Kunden verkauft werden"
 msgid "Part cannot be sold to customers"
 msgstr "Teil kann nicht an Kunden verkauft werden"
 
-#: part/templates/part/detail.html:193 templates/js/table_filters.html:117
+#: part/templates/part/detail.html:193 templates/js/table_filters.html:144
 msgid "Active"
 msgstr "Aktiv"
 
@@ -2438,35 +2459,81 @@ msgstr "Dieses Teil ist eine Variante von"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: part/templates/part/part_base.html:41
+#: part/templates/part/part_base.html:39
 msgid "Star this part"
 msgstr "Teil favorisieren"
 
+#: part/templates/part/part_base.html:44
+#: stock/templates/stock/item_base.html:78
+#: stock/templates/stock/location.html:22
+#, fuzzy
+#| msgid "Source Location"
+msgid "Barcode actions"
+msgstr "Quell-Standort"
+
+#: part/templates/part/part_base.html:46
+#: stock/templates/stock/item_base.html:80
+#: stock/templates/stock/location.html:24
+#, fuzzy
+#| msgid "Part QR Code"
+msgid "Show QR Code"
+msgstr "Teil-QR-Code"
+
 #: part/templates/part/part_base.html:47
+#: stock/templates/stock/item_base.html:81
+#: stock/templates/stock/location.html:25
+msgid "Print Label"
+msgstr ""
+
+#: part/templates/part/part_base.html:51
 msgid "Show pricing information"
 msgstr "Kosteninformationen ansehen"
 
-#: part/templates/part/part_base.html:104
+#: part/templates/part/part_base.html:64
+#, fuzzy
+#| msgid "Source Location"
+msgid "Part actions"
+msgstr "Quell-Standort"
+
+#: part/templates/part/part_base.html:66
+#, fuzzy
+#| msgid "Duplicate Part"
+msgid "Duplicate part"
+msgstr "Teil duplizieren"
+
+#: part/templates/part/part_base.html:67
+#, fuzzy
+#| msgid "Edit Template"
+msgid "Edit part"
+msgstr "Vorlage bearbeiten"
+
+#: part/templates/part/part_base.html:69
+#, fuzzy
+#| msgid "Delete Parts"
+msgid "Delete part"
+msgstr "Teile löschen"
+
+#: part/templates/part/part_base.html:102
 msgid "Available Stock"
 msgstr "Verfügbarer Lagerbestand"
 
-#: part/templates/part/part_base.html:110
+#: part/templates/part/part_base.html:108 templates/js/table_filters.html:37
 msgid "In Stock"
 msgstr "Auf Lager"
 
-#: part/templates/part/part_base.html:117
+#: part/templates/part/part_base.html:115
 msgid "Allocated to Build Orders"
 msgstr "Zu Bauaufträgen zugeordnet"
 
-#: part/templates/part/part_base.html:124
+#: part/templates/part/part_base.html:122
 msgid "Allocated to Sales Orders"
 msgstr "Zu Aufträgen zugeordnet"
 
-#: part/templates/part/part_base.html:146
+#: part/templates/part/part_base.html:144
 msgid "Can Build"
 msgstr "Herstellbar?"
 
-#: part/templates/part/part_base.html:152
+#: part/templates/part/part_base.html:150
 msgid "Underway"
 msgstr "unterwegs"
 
@@ -2510,7 +2577,7 @@ msgstr "Teil entfernen"
 msgid "Part Stock"
 msgstr "Teilbestand"
 
-#: part/templates/part/stock.html:77
+#: part/templates/part/stock.html:76
 msgid "Create New Part"
 msgstr "Neues Teil anlegen"
 
@@ -2563,11 +2630,7 @@ msgstr "Stückliste"
 msgid "Used In"
 msgstr "Benutzt in"
 
-#: part/templates/part/tabs.html:57 stock/templates/stock/tabs.html:6
-msgid "Tracking"
-msgstr "Tracking"
-
-#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:268
+#: part/templates/part/tabs.html:55 stock/templates/stock/item_base.html:268
 msgid "Tests"
 msgstr ""
 
@@ -2846,10 +2909,6 @@ msgstr "Teil kann nicht zu sich selbst gehören"
 msgid "Parent Stock Item"
 msgstr "Eltern-Lagerobjekt"
 
-#: stock/models.py:322 stock/templates/stock/item_base.html:138
-msgid "Base Part"
-msgstr "Basisteil"
-
 #: stock/models.py:323
 msgid "Base part"
 msgstr "Basis-Teil"
@@ -3009,7 +3068,7 @@ msgstr "Name des Teils"
 msgid "Result"
 msgstr "Suchergebnisse"
 
-#: stock/models.py:1247 templates/js/table_filters.html:53
+#: stock/models.py:1247 templates/js/table_filters.html:80
 msgid "Test result"
 msgstr ""
 
@@ -3078,24 +3137,8 @@ msgstr ""
 "Dieses Lagerobjekt wird automatisch gelöscht wenn der Lagerbestand "
 "aufgebraucht ist."
 
-#: stock/templates/stock/item_base.html:78
-#, fuzzy
-#| msgid "Source Location"
-msgid "Barcode actions"
-msgstr "Quell-Standort"
-
-#: stock/templates/stock/item_base.html:80
-#, fuzzy
-#| msgid "Part QR Code"
-msgid "Show QR Code"
-msgstr "Teil-QR-Code"
-
-#: stock/templates/stock/item_base.html:81
-msgid "Print Label"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:263
-#: templates/js/barcode.html:268
+#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:283
+#: templates/js/barcode.html:288
 msgid "Unlink Barcode"
 msgstr ""
 
@@ -3109,7 +3152,8 @@ msgstr ""
 msgid "Stock adjustment actions"
 msgstr "Bestands-Anpassung bestätigen"
 
-#: stock/templates/stock/item_base.html:95 templates/stock_table.html:14
+#: stock/templates/stock/item_base.html:95
+#: stock/templates/stock/location.html:33 templates/stock_table.html:14
 msgid "Count stock"
 msgstr "Bestand zählen"
 
@@ -3128,6 +3172,7 @@ msgid "Transfer stock"
 msgstr "Bestand bestellen"
 
 #: stock/templates/stock/item_base.html:105
+#: stock/templates/stock/location.html:30
 #, fuzzy
 #| msgid "Stock Locations"
 msgid "Stock actions"
@@ -3177,17 +3222,17 @@ msgstr ""
 msgid "Stock Item Details"
 msgstr "Lagerbestands-Details"
 
-#: stock/templates/stock/item_base.html:153
+#: stock/templates/stock/item_base.html:166
 msgid "Belongs To"
 msgstr "Gehört zu"
 
-#: stock/templates/stock/item_base.html:175
+#: stock/templates/stock/item_base.html:188
 #, fuzzy
 #| msgid "No stock location set"
 msgid "No location set"
 msgstr "Kein Lagerort gesetzt"
 
-#: stock/templates/stock/item_base.html:182
+#: stock/templates/stock/item_base.html:195
 msgid "Unique Identifier"
 msgstr "Eindeutiger Bezeichner"
 
@@ -3215,6 +3260,12 @@ msgstr "Kind-Lagerobjekte"
 msgid "This stock item does not have any child items"
 msgstr "Dieses Lagerobjekt hat keine Kinder"
 
+#: stock/templates/stock/item_delete.html:9
+#, fuzzy
+#| msgid "Are you sure you want to delete this attachment?"
+msgid "Are you sure you want to delete this stock item?"
+msgstr "Sind Sie sicher, dass Sie diesen Anhang löschen wollen?"
+
 #: stock/templates/stock/item_tests.html:10 stock/templates/stock/tabs.html:13
 msgid "Test Data"
 msgstr ""
@@ -3237,49 +3288,67 @@ msgstr ""
 msgid "All stock items"
 msgstr "Alle Lagerobjekte"
 
-#: stock/templates/stock/location.html:22
-msgid "Count stock items"
-msgstr "Lagerobjekte zählen"
-
-#: stock/templates/stock/location.html:25
-msgid "Edit stock location"
-msgstr "Lagerort bearbeiten"
-
-#: stock/templates/stock/location.html:28
-msgid "Delete stock location"
-msgstr "Lagerort löschen"
+#: stock/templates/stock/location.html:26
+#, fuzzy
+#| msgid "Child Stock Items"
+msgid "Check-in Items"
+msgstr "Kind-Lagerobjekte"
 
 #: stock/templates/stock/location.html:37
+#, fuzzy
+#| msgid "Location Description"
+msgid "Location actions"
+msgstr "Standort-Beschreibung"
+
+#: stock/templates/stock/location.html:39
+#, fuzzy
+#| msgid "Edit stock location"
+msgid "Edit location"
+msgstr "Lagerort bearbeiten"
+
+#: stock/templates/stock/location.html:40
+#, fuzzy
+#| msgid "Delete stock location"
+msgid "Delete location"
+msgstr "Lagerort löschen"
+
+#: stock/templates/stock/location.html:48
 msgid "Location Details"
 msgstr "Standort-Details"
 
-#: stock/templates/stock/location.html:42
+#: stock/templates/stock/location.html:53
 msgid "Location Path"
 msgstr "Standord-Pfad"
 
-#: stock/templates/stock/location.html:47
+#: stock/templates/stock/location.html:58
 msgid "Location Description"
 msgstr "Standort-Beschreibung"
 
-#: stock/templates/stock/location.html:52
+#: stock/templates/stock/location.html:63
 msgid "Sublocations"
 msgstr "Sub-Standorte"
 
-#: stock/templates/stock/location.html:57
-#: stock/templates/stock/location.html:72 templates/stats.html:21
+#: stock/templates/stock/location.html:68
+#: stock/templates/stock/location.html:83 templates/stats.html:21
 #: templates/stats.html:30
 msgid "Stock Items"
 msgstr "Lagerobjekte"
 
-#: stock/templates/stock/location.html:62
+#: stock/templates/stock/location.html:73
 msgid "Stock Details"
 msgstr "Objekt-Details"
 
-#: stock/templates/stock/location.html:67
+#: stock/templates/stock/location.html:78
 #: templates/InvenTree/search_stock_location.html:6 templates/stats.html:25
 msgid "Stock Locations"
 msgstr "Lagerobjekt-Standorte"
 
+#: stock/templates/stock/location_delete.html:7
+#, fuzzy
+#| msgid "Are you sure you want to delete this attachment?"
+msgid "Are you sure you want to delete this stock location?"
+msgstr "Sind Sie sicher, dass Sie diesen Anhang löschen wollen?"
+
 #: stock/templates/stock/stockitem_convert.html:7 stock/views.py:934
 #, fuzzy
 #| msgid "Count Stock Items"
@@ -3300,6 +3369,10 @@ msgstr ""
 msgid "This action cannot be easily undone"
 msgstr ""
 
+#: stock/templates/stock/tabs.html:6
+msgid "Tracking"
+msgstr "Tracking"
+
 #: stock/templates/stock/tabs.html:21
 msgid "Builds"
 msgstr "Baue"
@@ -3603,49 +3676,109 @@ msgstr ""
 msgid "Delete attachment"
 msgstr "Anhang löschen"
 
-#: templates/js/barcode.html:28
+#: templates/js/barcode.html:8
 #, fuzzy
 #| msgid "No barcode data provided"
 msgid "Scan barcode data here using wedge scanner"
 msgstr "Keine Strichcodedaten bereitgestellt"
 
-#: templates/js/barcode.html:34
+#: templates/js/barcode.html:12
 #, fuzzy
 #| msgid "Source Location"
 msgid "Barcode"
 msgstr "Quell-Standort"
 
-#: templates/js/barcode.html:42
+#: templates/js/barcode.html:20
 #, fuzzy
 #| msgid "No barcode data provided"
 msgid "Enter barcode data"
 msgstr "Keine Strichcodedaten bereitgestellt"
 
-#: templates/js/barcode.html:140
+#: templates/js/barcode.html:42
+msgid "Invalid server response"
+msgstr ""
+
+#: templates/js/barcode.html:143
 #, fuzzy
 #| msgid "No barcode data provided"
 msgid "Scan barcode data below"
 msgstr "Keine Strichcodedaten bereitgestellt"
 
-#: templates/js/barcode.html:195 templates/js/barcode.html:243
+#: templates/js/barcode.html:217 templates/js/barcode.html:263
 #, fuzzy
 #| msgid "Unknown barcode format"
 msgid "Unknown response from server"
 msgstr "Unbekanntes Strichcode-Format"
 
-#: templates/js/barcode.html:198 templates/js/barcode.html:247
-msgid "Invalid server response"
-msgstr ""
+#: templates/js/barcode.html:239
+#, fuzzy
+#| msgid "Parent Stock Item"
+msgid "Link Barcode to Stock Item"
+msgstr "Eltern-Lagerobjekt"
 
-#: templates/js/barcode.html:265
+#: templates/js/barcode.html:285
 msgid ""
 "This will remove the association between this stock item and the barcode"
 msgstr ""
 
-#: templates/js/barcode.html:271
+#: templates/js/barcode.html:291
 msgid "Unlink"
 msgstr ""
 
+#: templates/js/barcode.html:350
+#, fuzzy
+#| msgid "Remove stock"
+msgid "Remove stock item"
+msgstr "Bestand entfernen"
+
+#: templates/js/barcode.html:397
+#, fuzzy
+#| msgid "Entry notes"
+msgid "Enter notes"
+msgstr "Eintrags-Notizen"
+
+#: templates/js/barcode.html:399
+msgid "Enter optional notes for stock transfer"
+msgstr ""
+
+#: templates/js/barcode.html:404
+#, fuzzy
+#| msgid "Include stock items in sub locations"
+msgid "Check Stock Items into Location"
+msgstr "Lagerobjekte in untergeordneten Lagerorten einschließen"
+
+#: templates/js/barcode.html:408
+msgid "Check In"
+msgstr ""
+
+#: templates/js/barcode.html:466
+msgid "Server error"
+msgstr ""
+
+#: templates/js/barcode.html:485
+#, fuzzy
+#| msgid "Stock Item Details"
+msgid "Stock Item already scanned"
+msgstr "Lagerbestands-Details"
+
+#: templates/js/barcode.html:489
+#, fuzzy
+#| msgid "Include stock items in sub locations"
+msgid "Stock Item already in this location"
+msgstr "Lagerobjekte in untergeordneten Lagerorten einschließen"
+
+#: templates/js/barcode.html:496
+#, fuzzy
+#| msgid "Added stock to {n} items"
+msgid "Added stock item"
+msgstr "Vorrat zu {n} Lagerobjekten hinzugefügt"
+
+#: templates/js/barcode.html:503
+#, fuzzy
+#| msgid "Create new Stock Item"
+msgid "Barcode does not match Stock Item"
+msgstr "Neues Lagerobjekt hinzufügen"
+
 #: templates/js/bom.html:143
 msgid "Open subassembly"
 msgstr "Unterbaugruppe öffnen"
@@ -3706,7 +3839,7 @@ msgstr "Link"
 msgid "No purchase orders found"
 msgstr "Keine Bestellungen gefunden"
 
-#: templates/js/order.html:170 templates/js/stock.html:605
+#: templates/js/order.html:170 templates/js/stock.html:612
 msgid "Date"
 msgstr "Datum"
 
@@ -3718,7 +3851,7 @@ msgstr "Keine Aufträge gefunden"
 msgid "Shipment Date"
 msgstr "Versanddatum"
 
-#: templates/js/part.html:106 templates/js/stock.html:403
+#: templates/js/part.html:106 templates/js/stock.html:405
 msgid "Select"
 msgstr "Auswählen"
 
@@ -3734,7 +3867,7 @@ msgstr "Verkäufliches Teil"
 msgid "No category"
 msgstr "Keine Kategorie"
 
-#: templates/js/part.html:214 templates/js/table_filters.html:130
+#: templates/js/part.html:214 templates/js/table_filters.html:157
 msgid "Low stock"
 msgstr "Bestand niedrig"
 
@@ -3806,119 +3939,135 @@ msgstr "Keine Ergebnisse gefunden"
 msgid "Test Date"
 msgstr "Versanddatum"
 
-#: templates/js/stock.html:258
+#: templates/js/stock.html:260
 msgid "No stock items matching query"
 msgstr "Keine zur Anfrage passenden Lagerobjekte"
 
-#: templates/js/stock.html:355 templates/js/stock.html:370
+#: templates/js/stock.html:357 templates/js/stock.html:372
 #, fuzzy
 #| msgid "Include sublocations"
 msgid "Undefined location"
 msgstr "Unterlagerorte einschließen"
 
-#: templates/js/stock.html:467
+#: templates/js/stock.html:469
 msgid "StockItem has been allocated"
 msgstr "Lagerobjekt wurde zugewiesen"
 
-#: templates/js/stock.html:472
+#: templates/js/stock.html:474
 msgid "StockItem is lost"
 msgstr "Lagerobjekt verloren"
 
-#: templates/js/stock.html:500
+#: templates/js/stock.html:503
+#, fuzzy
+#| msgid "Item assigned to customer?"
+msgid "Shipped to customer"
+msgstr "Ist dieses Objekt einem Kunden zugeteilt?"
+
+#: templates/js/stock.html:506
 msgid "No stock location set"
 msgstr "Kein Lagerort gesetzt"
 
-#: templates/js/stock.html:671
+#: templates/js/stock.html:678
 msgid "No user information"
 msgstr "Keine Benutzerinformation"
 
-#: templates/js/table_filters.html:19
-msgid "Include sublocations"
-msgstr "Unterlagerorte einschließen"
+#: templates/js/table_filters.html:19 templates/js/table_filters.html:62
+#, fuzzy
+#| msgid "Serialize Stock"
+msgid "Is Serialized"
+msgstr "Lagerbestand erfassen"
 
-#: templates/js/table_filters.html:20
-msgid "Include stock in sublocations"
-msgstr "Bestand in Unterlagerorten einschließen"
-
-#: templates/js/table_filters.html:24
-msgid "Active parts"
-msgstr "Aktive Teile"
-
-#: templates/js/table_filters.html:25
-msgid "Show stock for active parts"
-msgstr "Bestand aktiver Teile anzeigen"
-
-#: templates/js/table_filters.html:29 templates/js/table_filters.html:30
-msgid "Stock status"
-msgstr "Bestandsstatus"
-
-#: templates/js/table_filters.html:34
-msgid "Is allocated"
-msgstr "Ist zugeordnet"
-
-#: templates/js/table_filters.html:35
-msgid "Item has been alloacted"
-msgstr "Position wurde zugeordnet"
-
-#: templates/js/table_filters.html:38
+#: templates/js/table_filters.html:22 templates/js/table_filters.html:65
 #, fuzzy
 #| msgid "Serial Number"
 msgid "Serial number GTE"
 msgstr "Seriennummer"
 
-#: templates/js/table_filters.html:39
+#: templates/js/table_filters.html:23 templates/js/table_filters.html:66
 #, fuzzy
 #| msgid "Serial number for this item"
 msgid "Serial number greater than or equal to"
 msgstr "Seriennummer für dieses Teil"
 
-#: templates/js/table_filters.html:42
+#: templates/js/table_filters.html:26 templates/js/table_filters.html:69
 #, fuzzy
 #| msgid "Serial Number"
 msgid "Serial number LTE"
 msgstr "Seriennummer"
 
-#: templates/js/table_filters.html:43
+#: templates/js/table_filters.html:27 templates/js/table_filters.html:70
 #, fuzzy
 #| msgid "Serial numbers already exist: "
 msgid "Serial number less than or equal to"
 msgstr "Seriennummern existieren bereits:"
 
-#: templates/js/table_filters.html:72
+#: templates/js/table_filters.html:38
+msgid "Show items which are in stock"
+msgstr ""
+
+#: templates/js/table_filters.html:42
+msgid "Include sublocations"
+msgstr "Unterlagerorte einschließen"
+
+#: templates/js/table_filters.html:43
+msgid "Include stock in sublocations"
+msgstr "Bestand in Unterlagerorten einschließen"
+
+#: templates/js/table_filters.html:47
+msgid "Active parts"
+msgstr "Aktive Teile"
+
+#: templates/js/table_filters.html:48
+msgid "Show stock for active parts"
+msgstr "Bestand aktiver Teile anzeigen"
+
+#: templates/js/table_filters.html:52 templates/js/table_filters.html:53
+msgid "Stock status"
+msgstr "Bestandsstatus"
+
+#: templates/js/table_filters.html:57
+msgid "Is allocated"
+msgstr "Ist zugeordnet"
+
+#: templates/js/table_filters.html:58
+msgid "Item has been alloacted"
+msgstr "Position wurde zugeordnet"
+
+#: templates/js/table_filters.html:99
 msgid "Build status"
 msgstr "Bau-Status"
 
-#: templates/js/table_filters.html:84 templates/js/table_filters.html:97
+#: templates/js/table_filters.html:111 templates/js/table_filters.html:124
 msgid "Order status"
 msgstr "Bestellstatus"
 
-#: templates/js/table_filters.html:89 templates/js/table_filters.html:102
+#: templates/js/table_filters.html:116 templates/js/table_filters.html:129
 #, fuzzy
 #| msgid "Cascading"
 msgid "Outstanding"
 msgstr "Kaskadierend"
 
-#: templates/js/table_filters.html:112
+#: templates/js/table_filters.html:139
 msgid "Include subcategories"
 msgstr "Unterkategorien einschließen"
 
-#: templates/js/table_filters.html:113
+#: templates/js/table_filters.html:140
 msgid "Include parts in subcategories"
 msgstr "Teile in Unterkategorien einschließen"
 
-#: templates/js/table_filters.html:118
+#: templates/js/table_filters.html:145
 msgid "Show active parts"
 msgstr "Aktive Teile anzeigen"
 
-#: templates/js/table_filters.html:126
+#: templates/js/table_filters.html:153
 msgid "Stock available"
 msgstr "Bestand verfügbar"
 
-#: templates/js/table_filters.html:142
+#: templates/js/table_filters.html:169
 msgid "Starred"
 msgstr "Favorit"
 
-#: templates/js/table_filters.html:154
+#: templates/js/table_filters.html:181
 msgid "Purchasable"
 msgstr "Käuflich"
 
@@ -3974,6 +4123,9 @@ msgstr "Bestand bestellen"
 msgid "Delete Stock"
 msgstr "Bestand löschen"
 
+#~ msgid "Count stock items"
+#~ msgstr "Lagerobjekte zählen"
+
 #~ msgid "Barcode successfully decoded"
 #~ msgstr "Strichcode erfolgreich dekodiert"
 
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index c539fbcae5..972a9ee6af 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: 2020-06-12 00:43+0000\n"
+"POT-Creation-Date: 2020-07-30 10:24+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"
@@ -78,7 +78,7 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:68 templates/js/stock.html:662
+#: InvenTree/models.py:68 templates/js/stock.html:669
 msgid "User"
 msgstr ""
 
@@ -286,9 +286,10 @@ msgstr ""
 #: order/templates/order/purchase_order_detail.html:145
 #: order/templates/order/receive_parts.html:19 part/models.py:240
 #: part/templates/part/part_app_base.html:7
-#: part/templates/part/set_category.html:13 templates/js/bom.html:135
-#: templates/js/build.html:41 templates/js/company.html:109
-#: templates/js/part.html:120 templates/js/stock.html:422
+#: part/templates/part/set_category.html:13 templates/js/barcode.html:336
+#: templates/js/bom.html:135 templates/js/build.html:41
+#: templates/js/company.html:109 templates/js/part.html:120
+#: templates/js/stock.html:424
 msgid "Part"
 msgstr ""
 
@@ -322,7 +323,7 @@ msgstr ""
 msgid "Number of parts to build"
 msgstr ""
 
-#: build/models.py:128 part/templates/part/part_base.html:141
+#: build/models.py:128 part/templates/part/part_base.html:139
 msgid "Build Status"
 msgstr ""
 
@@ -341,7 +342,7 @@ msgstr ""
 #: build/models.py:155 build/templates/build/detail.html:55
 #: company/templates/company/supplier_part_base.html:60
 #: company/templates/company/supplier_part_detail.html:24
-#: part/templates/part/detail.html:74 part/templates/part/part_base.html:88
+#: part/templates/part/detail.html:74 part/templates/part/part_base.html:86
 #: stock/models.py:368 stock/templates/stock/item_base.html:230
 msgid "External Link"
 msgstr ""
@@ -350,13 +351,13 @@ msgstr ""
 msgid "Link to external URL"
 msgstr ""
 
-#: build/models.py:160 build/templates/build/tabs.html:14 company/models.py:302
+#: build/models.py:160 build/templates/build/tabs.html:14 company/models.py:307
 #: company/templates/company/tabs.html:33 order/templates/order/po_tabs.html:15
 #: order/templates/order/purchase_order_detail.html:200
-#: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:73
+#: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:64
 #: stock/models.py:436 stock/models.py:1265 stock/templates/stock/tabs.html:26
-#: templates/js/bom.html:229 templates/js/stock.html:113
-#: templates/js/stock.html:506
+#: templates/js/barcode.html:391 templates/js/bom.html:229
+#: templates/js/stock.html:113 templates/js/stock.html:513
 msgid "Notes"
 msgstr ""
 
@@ -422,7 +423,7 @@ msgstr ""
 #: build/templates/build/allocate.html:161
 #: order/templates/order/sales_order_detail.html:68
 #: order/templates/order/sales_order_detail.html:150 stock/models.py:362
-#: stock/templates/stock/item_base.html:189
+#: stock/templates/stock/item_base.html:146
 msgid "Serial Number"
 msgstr ""
 
@@ -439,16 +440,18 @@ msgstr ""
 #: part/templates/part/allocation.html:49
 #: stock/templates/stock/item_base.html:26
 #: stock/templates/stock/item_base.html:32
-#: stock/templates/stock/item_base.html:195
-#: stock/templates/stock/stock_adjust.html:18 templates/js/bom.html:172
-#: templates/js/build.html:52 templates/js/stock.html:653
+#: stock/templates/stock/item_base.html:152
+#: stock/templates/stock/stock_adjust.html:18 templates/js/barcode.html:338
+#: templates/js/bom.html:172 templates/js/build.html:52
+#: templates/js/stock.html:660
 msgid "Quantity"
 msgstr ""
 
 #: build/templates/build/allocate.html:177
 #: build/templates/build/auto_allocate.html:20
-#: stock/templates/stock/item_base.html:171
-#: stock/templates/stock/stock_adjust.html:17 templates/js/stock.html:493
+#: stock/templates/stock/item_base.html:184
+#: stock/templates/stock/stock_adjust.html:17 templates/js/barcode.html:337
+#: templates/js/stock.html:495
 msgid "Location"
 msgstr ""
 
@@ -474,7 +477,7 @@ msgstr ""
 #: templates/js/bom.html:157 templates/js/company.html:60
 #: templates/js/order.html:157 templates/js/order.html:230
 #: templates/js/part.html:176 templates/js/part.html:355
-#: templates/js/stock.html:443 templates/js/stock.html:634
+#: templates/js/stock.html:445 templates/js/stock.html:641
 msgid "Description"
 msgstr ""
 
@@ -484,8 +487,8 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: build/templates/build/allocate.html:338 part/models.py:1260
-#: templates/js/part.html:359 templates/js/table_filters.html:63
+#: build/templates/build/allocate.html:338 part/models.py:1269
+#: templates/js/part.html:359 templates/js/table_filters.html:90
 msgid "Required"
 msgstr ""
 
@@ -548,9 +551,9 @@ msgstr ""
 #: build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:42
 #: order/templates/order/receive_parts.html:24
-#: stock/templates/stock/item_base.html:262 templates/js/build.html:57
-#: templates/js/order.html:162 templates/js/order.html:235
-#: templates/js/stock.html:480
+#: stock/templates/stock/item_base.html:262 templates/js/barcode.html:42
+#: templates/js/build.html:57 templates/js/order.html:162
+#: templates/js/order.html:235 templates/js/stock.html:482
 msgid "Status"
 msgstr ""
 
@@ -560,7 +563,7 @@ msgstr ""
 #: order/templates/order/sales_order_notes.html:10
 #: order/templates/order/sales_order_ship.html:25
 #: part/templates/part/allocation.html:27
-#: stock/templates/stock/item_base.html:159 templates/js/order.html:209
+#: stock/templates/stock/item_base.html:172 templates/js/order.html:209
 msgid "Sales Order"
 msgstr ""
 
@@ -627,7 +630,7 @@ msgid "Stock can be taken from any available location."
 msgstr ""
 
 #: build/templates/build/detail.html:48
-#: stock/templates/stock/item_base.html:202 templates/js/stock.html:488
+#: stock/templates/stock/item_base.html:202 templates/js/stock.html:490
 msgid "Batch"
 msgstr ""
 
@@ -847,83 +850,113 @@ msgstr ""
 msgid "Delete Currency"
 msgstr ""
 
-#: company/models.py:83
+#: company/models.py:83 company/models.py:84
 msgid "Company name"
 msgstr ""
 
-#: company/models.py:85
+#: company/models.py:86
+msgid "Company description"
+msgstr ""
+
+#: company/models.py:86
 msgid "Description of the company"
 msgstr ""
 
-#: company/models.py:87
+#: company/models.py:88 company/templates/company/company_base.html:48
+#: templates/js/company.html:65
+msgid "Website"
+msgstr ""
+
+#: company/models.py:88
 msgid "Company website URL"
 msgstr ""
 
-#: company/models.py:90
+#: company/models.py:91 company/templates/company/company_base.html:55
+msgid "Address"
+msgstr ""
+
+#: company/models.py:92
 msgid "Company address"
 msgstr ""
 
-#: company/models.py:93
+#: company/models.py:95
+msgid "Phone number"
+msgstr ""
+
+#: company/models.py:96
 msgid "Contact phone number"
 msgstr ""
 
-#: company/models.py:95
-msgid "Contact email address"
+#: company/models.py:98 company/templates/company/company_base.html:69
+msgid "Email"
 msgstr ""
 
 #: company/models.py:98
+msgid "Contact email address"
+msgstr ""
+
+#: company/models.py:101 company/templates/company/company_base.html:76
+msgid "Contact"
+msgstr ""
+
+#: company/models.py:102
 msgid "Point of contact"
 msgstr ""
 
-#: company/models.py:100
+#: company/models.py:104
 msgid "Link to external company information"
 msgstr ""
 
-#: company/models.py:112
+#: company/models.py:116
 msgid "Do you sell items to this company?"
 msgstr ""
 
-#: company/models.py:114
+#: company/models.py:118
 msgid "Do you purchase items from this company?"
 msgstr ""
 
-#: company/models.py:116
+#: company/models.py:120
 msgid "Does this company manufacture parts?"
 msgstr ""
 
-#: company/models.py:276
+#: company/models.py:276 stock/models.py:322
+#: stock/templates/stock/item_base.html:138
+msgid "Base Part"
+msgstr ""
+
+#: company/models.py:281
 msgid "Select part"
 msgstr ""
 
-#: company/models.py:282
+#: company/models.py:287
 msgid "Select supplier"
 msgstr ""
 
-#: company/models.py:285
+#: company/models.py:290
 msgid "Supplier stock keeping unit"
 msgstr ""
 
-#: company/models.py:292
+#: company/models.py:297
 msgid "Select manufacturer"
 msgstr ""
 
-#: company/models.py:296
+#: company/models.py:301
 msgid "Manufacturer part number"
 msgstr ""
 
-#: company/models.py:298
+#: company/models.py:303
 msgid "URL for external supplier part link"
 msgstr ""
 
-#: company/models.py:300
+#: company/models.py:305
 msgid "Supplier part description"
 msgstr ""
 
-#: company/models.py:304
+#: company/models.py:309
 msgid "Minimum charge (e.g. stocking fee)"
 msgstr ""
 
-#: company/models.py:306
+#: company/models.py:311
 msgid "Part packaging"
 msgstr ""
 
@@ -942,26 +975,10 @@ msgstr ""
 msgid "Company Details"
 msgstr ""
 
-#: company/templates/company/company_base.html:48 templates/js/company.html:65
-msgid "Website"
-msgstr ""
-
-#: company/templates/company/company_base.html:55
-msgid "Address"
-msgstr ""
-
 #: company/templates/company/company_base.html:62
 msgid "Phone"
 msgstr ""
 
-#: company/templates/company/company_base.html:69
-msgid "Email"
-msgstr ""
-
-#: company/templates/company/company_base.html:76
-msgid "Contact"
-msgstr ""
-
 #: company/templates/company/detail.html:16
 #: company/templates/company/supplier_part_base.html:76
 #: company/templates/company/supplier_part_detail.html:30
@@ -981,7 +998,7 @@ msgstr ""
 
 #: company/templates/company/detail.html:26 order/models.py:314
 #: order/templates/order/sales_order_base.html:73 stock/models.py:357
-#: stock/models.py:358 stock/templates/stock/item_base.html:146
+#: stock/models.py:358 stock/templates/stock/item_base.html:159
 #: templates/js/company.html:44 templates/js/order.html:217
 msgid "Customer"
 msgstr ""
@@ -992,7 +1009,7 @@ msgstr ""
 
 #: company/templates/company/detail_part.html:13
 #: order/templates/order/purchase_order_detail.html:67
-#: part/templates/part/stock.html:82 part/templates/part/supplier.html:12
+#: part/templates/part/stock.html:81 part/templates/part/supplier.html:12
 msgid "New Supplier Part"
 msgstr ""
 
@@ -1006,7 +1023,7 @@ msgid "Delete Parts"
 msgstr ""
 
 #: company/templates/company/detail_part.html:43
-#: part/templates/part/stock.html:76
+#: part/templates/part/stock.html:75
 msgid "New Part"
 msgstr ""
 
@@ -1038,7 +1055,7 @@ msgstr ""
 
 #: company/templates/company/detail_stock.html:34
 #: company/templates/company/supplier_part_stock.html:33
-#: part/templates/part/stock.html:54 templates/stock_table.html:5
+#: part/templates/part/stock.html:53 templates/stock_table.html:5
 msgid "Export"
 msgstr ""
 
@@ -1178,12 +1195,12 @@ msgstr ""
 #: company/templates/company/supplier_part_stock.html:56
 #: order/templates/order/purchase_order_detail.html:38
 #: order/templates/order/purchase_order_detail.html:118
-#: part/templates/part/stock.html:91
+#: part/templates/part/stock.html:90
 msgid "New Location"
 msgstr ""
 
 #: company/templates/company/supplier_part_stock.html:57
-#: part/templates/part/stock.html:92
+#: part/templates/part/stock.html:91
 msgid "Create New Location"
 msgstr ""
 
@@ -1194,7 +1211,7 @@ msgstr ""
 #: company/templates/company/supplier_part_tabs.html:8
 #: company/templates/company/tabs.html:12 part/templates/part/tabs.html:18
 #: stock/templates/stock/location.html:12 templates/js/part.html:203
-#: templates/js/stock.html:451 templates/navbar.html:11
+#: templates/js/stock.html:453 templates/navbar.html:11
 msgid "Stock"
 msgstr ""
 
@@ -1274,7 +1291,7 @@ msgstr ""
 msgid "Edit Supplier Part"
 msgstr ""
 
-#: company/views.py:265 part/templates/part/stock.html:83
+#: company/views.py:265 part/templates/part/stock.html:82
 msgid "Create new Supplier Part"
 msgstr ""
 
@@ -1508,7 +1525,7 @@ msgid "Purchase Order Attachments"
 msgstr ""
 
 #: order/templates/order/po_tabs.html:8 order/templates/order/so_tabs.html:16
-#: part/templates/part/tabs.html:70 stock/templates/stock/tabs.html:32
+#: part/templates/part/tabs.html:61 stock/templates/stock/tabs.html:32
 msgid "Attachments"
 msgstr ""
 
@@ -1524,7 +1541,7 @@ msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:39
 #: order/templates/order/purchase_order_detail.html:119
-#: stock/templates/stock/location.html:17
+#: stock/templates/stock/location.html:16
 msgid "Create new stock location"
 msgstr ""
 
@@ -1563,7 +1580,7 @@ msgid "Select parts to receive against this order"
 msgstr ""
 
 #: order/templates/order/receive_parts.html:21
-#: part/templates/part/part_base.html:131 templates/js/part.html:219
+#: part/templates/part/part_base.html:129 templates/js/part.html:219
 msgid "On Order"
 msgstr ""
 
@@ -1952,111 +1969,111 @@ msgstr ""
 msgid "Stored BOM checksum"
 msgstr ""
 
-#: part/models.py:1212
+#: part/models.py:1221
 msgid "Test templates can only be created for trackable parts"
 msgstr ""
 
-#: part/models.py:1229
+#: part/models.py:1238
 msgid "Test with this name already exists for this part"
 msgstr ""
 
-#: part/models.py:1248 templates/js/part.html:350 templates/js/stock.html:89
+#: part/models.py:1257 templates/js/part.html:350 templates/js/stock.html:89
 msgid "Test Name"
 msgstr ""
 
-#: part/models.py:1249
+#: part/models.py:1258
 msgid "Enter a name for the test"
 msgstr ""
 
-#: part/models.py:1254
+#: part/models.py:1263
 msgid "Test Description"
 msgstr ""
 
-#: part/models.py:1255
+#: part/models.py:1264
 msgid "Enter description for this test"
 msgstr ""
 
-#: part/models.py:1261
+#: part/models.py:1270
 msgid "Is this test required to pass?"
 msgstr ""
 
-#: part/models.py:1266 templates/js/part.html:367
+#: part/models.py:1275 templates/js/part.html:367
 msgid "Requires Value"
 msgstr ""
 
-#: part/models.py:1267
+#: part/models.py:1276
 msgid "Does this test require a value when adding a test result?"
 msgstr ""
 
-#: part/models.py:1272 templates/js/part.html:374
+#: part/models.py:1281 templates/js/part.html:374
 msgid "Requires Attachment"
 msgstr ""
 
-#: part/models.py:1273
+#: part/models.py:1282
 msgid "Does this test require a file attachment when adding a test result?"
 msgstr ""
 
-#: part/models.py:1306
+#: part/models.py:1315
 msgid "Parameter template name must be unique"
 msgstr ""
 
-#: part/models.py:1311
+#: part/models.py:1320
 msgid "Parameter Name"
 msgstr ""
 
-#: part/models.py:1313
+#: part/models.py:1322
 msgid "Parameter Units"
 msgstr ""
 
-#: part/models.py:1339
+#: part/models.py:1348
 msgid "Parent Part"
 msgstr ""
 
-#: part/models.py:1341
+#: part/models.py:1350
 msgid "Parameter Template"
 msgstr ""
 
-#: part/models.py:1343
+#: part/models.py:1352
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:1372
+#: part/models.py:1381
 msgid "Select parent part"
 msgstr ""
 
-#: part/models.py:1380
+#: part/models.py:1389
 msgid "Select part to be used in BOM"
 msgstr ""
 
-#: part/models.py:1386
+#: part/models.py:1395
 msgid "BOM quantity for this BOM item"
 msgstr ""
 
-#: part/models.py:1389
+#: part/models.py:1398
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr ""
 
-#: part/models.py:1392
+#: part/models.py:1401
 msgid "BOM item reference"
 msgstr ""
 
-#: part/models.py:1395
+#: part/models.py:1404
 msgid "BOM item notes"
 msgstr ""
 
-#: part/models.py:1397
+#: part/models.py:1406
 msgid "BOM line checksum"
 msgstr ""
 
-#: part/models.py:1461 stock/models.py:233
+#: part/models.py:1470 stock/models.py:233
 msgid "Quantity must be integer value for trackable parts"
 msgstr ""
 
-#: part/models.py:1470
+#: part/models.py:1479
 msgid "Part cannot be added to its own Bill of Materials"
 msgstr ""
 
-#: part/models.py:1477
+#: part/models.py:1486
 #, python-brace-format
 msgid "Part '{p1}' is  used in BOM for '{p2}' (recursive)"
 msgstr ""
@@ -2078,12 +2095,12 @@ msgstr ""
 #: stock/templates/stock/item_base.html:58
 #: stock/templates/stock/item_base.html:224
 #: stock/templates/stock/stock_adjust.html:16 templates/js/build.html:106
-#: templates/js/stock.html:623
+#: templates/js/stock.html:630
 msgid "Stock Item"
 msgstr ""
 
 #: part/templates/part/allocation.html:20
-#: stock/templates/stock/item_base.html:165
+#: stock/templates/stock/item_base.html:178
 msgid "Build Order"
 msgstr ""
 
@@ -2164,7 +2181,7 @@ msgstr ""
 msgid "Part Details"
 msgstr ""
 
-#: part/templates/part/detail.html:25 part/templates/part/part_base.html:81
+#: part/templates/part/detail.html:25 part/templates/part/part_base.html:79
 msgid "IPN"
 msgstr ""
 
@@ -2222,7 +2239,7 @@ msgid "Part is not a virtual part"
 msgstr ""
 
 #: part/templates/part/detail.html:139 stock/forms.py:194
-#: templates/js/table_filters.html:122
+#: templates/js/table_filters.html:149
 msgid "Template"
 msgstr ""
 
@@ -2234,7 +2251,7 @@ msgstr ""
 msgid "Part is not a template part"
 msgstr ""
 
-#: part/templates/part/detail.html:148 templates/js/table_filters.html:134
+#: part/templates/part/detail.html:148 templates/js/table_filters.html:161
 msgid "Assembly"
 msgstr ""
 
@@ -2246,7 +2263,7 @@ msgstr ""
 msgid "Part cannot be assembled from other parts"
 msgstr ""
 
-#: part/templates/part/detail.html:157 templates/js/table_filters.html:138
+#: part/templates/part/detail.html:157 templates/js/table_filters.html:165
 msgid "Component"
 msgstr ""
 
@@ -2258,7 +2275,7 @@ msgstr ""
 msgid "Part cannot be used in assemblies"
 msgstr ""
 
-#: part/templates/part/detail.html:166 templates/js/table_filters.html:150
+#: part/templates/part/detail.html:166 templates/js/table_filters.html:177
 msgid "Trackable"
 msgstr ""
 
@@ -2278,7 +2295,7 @@ msgstr ""
 msgid "Part can be purchased from external suppliers"
 msgstr ""
 
-#: part/templates/part/detail.html:184 templates/js/table_filters.html:146
+#: part/templates/part/detail.html:184 templates/js/table_filters.html:173
 msgid "Salable"
 msgstr ""
 
@@ -2290,7 +2307,7 @@ msgstr ""
 msgid "Part cannot be sold to customers"
 msgstr ""
 
-#: part/templates/part/detail.html:193 templates/js/table_filters.html:117
+#: part/templates/part/detail.html:193 templates/js/table_filters.html:144
 msgid "Active"
 msgstr ""
 
@@ -2360,35 +2377,69 @@ msgstr ""
 msgid "Inactive"
 msgstr ""
 
-#: part/templates/part/part_base.html:41
+#: part/templates/part/part_base.html:39
 msgid "Star this part"
 msgstr ""
 
+#: part/templates/part/part_base.html:44
+#: stock/templates/stock/item_base.html:78
+#: stock/templates/stock/location.html:22
+msgid "Barcode actions"
+msgstr ""
+
+#: part/templates/part/part_base.html:46
+#: stock/templates/stock/item_base.html:80
+#: stock/templates/stock/location.html:24
+msgid "Show QR Code"
+msgstr ""
+
 #: part/templates/part/part_base.html:47
+#: stock/templates/stock/item_base.html:81
+#: stock/templates/stock/location.html:25
+msgid "Print Label"
+msgstr ""
+
+#: part/templates/part/part_base.html:51
 msgid "Show pricing information"
 msgstr ""
 
-#: part/templates/part/part_base.html:104
+#: part/templates/part/part_base.html:64
+msgid "Part actions"
+msgstr ""
+
+#: part/templates/part/part_base.html:66
+msgid "Duplicate part"
+msgstr ""
+
+#: part/templates/part/part_base.html:67
+msgid "Edit part"
+msgstr ""
+
+#: part/templates/part/part_base.html:69
+msgid "Delete part"
+msgstr ""
+
+#: part/templates/part/part_base.html:102
 msgid "Available Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:110
+#: part/templates/part/part_base.html:108 templates/js/table_filters.html:37
 msgid "In Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:117
+#: part/templates/part/part_base.html:115
 msgid "Allocated to Build Orders"
 msgstr ""
 
-#: part/templates/part/part_base.html:124
+#: part/templates/part/part_base.html:122
 msgid "Allocated to Sales Orders"
 msgstr ""
 
-#: part/templates/part/part_base.html:146
+#: part/templates/part/part_base.html:144
 msgid "Can Build"
 msgstr ""
 
-#: part/templates/part/part_base.html:152
+#: part/templates/part/part_base.html:150
 msgid "Underway"
 msgstr ""
 
@@ -2428,7 +2479,7 @@ msgstr ""
 msgid "Part Stock"
 msgstr ""
 
-#: part/templates/part/stock.html:77
+#: part/templates/part/stock.html:76
 msgid "Create New Part"
 msgstr ""
 
@@ -2473,11 +2524,7 @@ msgstr ""
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/tabs.html:57 stock/templates/stock/tabs.html:6
-msgid "Tracking"
-msgstr ""
-
-#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:268
+#: part/templates/part/tabs.html:55 stock/templates/stock/item_base.html:268
 msgid "Tests"
 msgstr ""
 
@@ -2739,10 +2786,6 @@ msgstr ""
 msgid "Parent Stock Item"
 msgstr ""
 
-#: stock/models.py:322 stock/templates/stock/item_base.html:138
-msgid "Base Part"
-msgstr ""
-
 #: stock/models.py:323
 msgid "Base part"
 msgstr ""
@@ -2890,7 +2933,7 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: stock/models.py:1247 templates/js/table_filters.html:53
+#: stock/models.py:1247 templates/js/table_filters.html:80
 msgid "Test result"
 msgstr ""
 
@@ -2945,20 +2988,8 @@ msgid ""
 "This stock item will be automatically deleted when all stock is depleted."
 msgstr ""
 
-#: stock/templates/stock/item_base.html:78
-msgid "Barcode actions"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:80
-msgid "Show QR Code"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:81
-msgid "Print Label"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:263
-#: templates/js/barcode.html:268
+#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:283
+#: templates/js/barcode.html:288
 msgid "Unlink Barcode"
 msgstr ""
 
@@ -2970,7 +3001,8 @@ msgstr ""
 msgid "Stock adjustment actions"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:95 templates/stock_table.html:14
+#: stock/templates/stock/item_base.html:95
+#: stock/templates/stock/location.html:33 templates/stock_table.html:14
 msgid "Count stock"
 msgstr ""
 
@@ -2987,6 +3019,7 @@ msgid "Transfer stock"
 msgstr ""
 
 #: stock/templates/stock/item_base.html:105
+#: stock/templates/stock/location.html:30
 msgid "Stock actions"
 msgstr ""
 
@@ -3022,15 +3055,15 @@ msgstr ""
 msgid "Stock Item Details"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:153
+#: stock/templates/stock/item_base.html:166
 msgid "Belongs To"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:175
+#: stock/templates/stock/item_base.html:188
 msgid "No location set"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:182
+#: stock/templates/stock/item_base.html:195
 msgid "Unique Identifier"
 msgstr ""
 
@@ -3058,6 +3091,10 @@ msgstr ""
 msgid "This stock item does not have any child items"
 msgstr ""
 
+#: stock/templates/stock/item_delete.html:9
+msgid "Are you sure you want to delete this stock item?"
+msgstr ""
+
 #: stock/templates/stock/item_tests.html:10 stock/templates/stock/tabs.html:13
 msgid "Test Data"
 msgstr ""
@@ -3078,49 +3115,57 @@ msgstr ""
 msgid "All stock items"
 msgstr ""
 
-#: stock/templates/stock/location.html:22
-msgid "Count stock items"
-msgstr ""
-
-#: stock/templates/stock/location.html:25
-msgid "Edit stock location"
-msgstr ""
-
-#: stock/templates/stock/location.html:28
-msgid "Delete stock location"
+#: stock/templates/stock/location.html:26
+msgid "Check-in Items"
 msgstr ""
 
 #: stock/templates/stock/location.html:37
+msgid "Location actions"
+msgstr ""
+
+#: stock/templates/stock/location.html:39
+msgid "Edit location"
+msgstr ""
+
+#: stock/templates/stock/location.html:40
+msgid "Delete location"
+msgstr ""
+
+#: stock/templates/stock/location.html:48
 msgid "Location Details"
 msgstr ""
 
-#: stock/templates/stock/location.html:42
+#: stock/templates/stock/location.html:53
 msgid "Location Path"
 msgstr ""
 
-#: stock/templates/stock/location.html:47
+#: stock/templates/stock/location.html:58
 msgid "Location Description"
 msgstr ""
 
-#: stock/templates/stock/location.html:52
+#: stock/templates/stock/location.html:63
 msgid "Sublocations"
 msgstr ""
 
-#: stock/templates/stock/location.html:57
-#: stock/templates/stock/location.html:72 templates/stats.html:21
+#: stock/templates/stock/location.html:68
+#: stock/templates/stock/location.html:83 templates/stats.html:21
 #: templates/stats.html:30
 msgid "Stock Items"
 msgstr ""
 
-#: stock/templates/stock/location.html:62
+#: stock/templates/stock/location.html:73
 msgid "Stock Details"
 msgstr ""
 
-#: stock/templates/stock/location.html:67
+#: stock/templates/stock/location.html:78
 #: templates/InvenTree/search_stock_location.html:6 templates/stats.html:25
 msgid "Stock Locations"
 msgstr ""
 
+#: stock/templates/stock/location_delete.html:7
+msgid "Are you sure you want to delete this stock location?"
+msgstr ""
+
 #: stock/templates/stock/stockitem_convert.html:7 stock/views.py:934
 msgid "Convert Stock Item"
 msgstr ""
@@ -3137,6 +3182,10 @@ msgstr ""
 msgid "This action cannot be easily undone"
 msgstr ""
 
+#: stock/templates/stock/tabs.html:6
+msgid "Tracking"
+msgstr ""
+
 #: stock/templates/stock/tabs.html:21
 msgid "Builds"
 msgstr ""
@@ -3416,39 +3465,83 @@ msgstr ""
 msgid "Delete attachment"
 msgstr ""
 
-#: templates/js/barcode.html:28
+#: templates/js/barcode.html:8
 msgid "Scan barcode data here using wedge scanner"
 msgstr ""
 
-#: templates/js/barcode.html:34
+#: templates/js/barcode.html:12
 msgid "Barcode"
 msgstr ""
 
-#: templates/js/barcode.html:42
+#: templates/js/barcode.html:20
 msgid "Enter barcode data"
 msgstr ""
 
-#: templates/js/barcode.html:140
-msgid "Scan barcode data below"
-msgstr ""
-
-#: templates/js/barcode.html:195 templates/js/barcode.html:243
-msgid "Unknown response from server"
-msgstr ""
-
-#: templates/js/barcode.html:198 templates/js/barcode.html:247
+#: templates/js/barcode.html:42
 msgid "Invalid server response"
 msgstr ""
 
-#: templates/js/barcode.html:265
+#: templates/js/barcode.html:143
+msgid "Scan barcode data below"
+msgstr ""
+
+#: templates/js/barcode.html:217 templates/js/barcode.html:263
+msgid "Unknown response from server"
+msgstr ""
+
+#: templates/js/barcode.html:239
+msgid "Link Barcode to Stock Item"
+msgstr ""
+
+#: templates/js/barcode.html:285
 msgid ""
 "This will remove the association between this stock item and the barcode"
 msgstr ""
 
-#: templates/js/barcode.html:271
+#: templates/js/barcode.html:291
 msgid "Unlink"
 msgstr ""
 
+#: templates/js/barcode.html:350
+msgid "Remove stock item"
+msgstr ""
+
+#: templates/js/barcode.html:397
+msgid "Enter notes"
+msgstr ""
+
+#: templates/js/barcode.html:399
+msgid "Enter optional notes for stock transfer"
+msgstr ""
+
+#: templates/js/barcode.html:404
+msgid "Check Stock Items into Location"
+msgstr ""
+
+#: templates/js/barcode.html:408
+msgid "Check In"
+msgstr ""
+
+#: templates/js/barcode.html:466
+msgid "Server error"
+msgstr ""
+
+#: templates/js/barcode.html:485
+msgid "Stock Item already scanned"
+msgstr ""
+
+#: templates/js/barcode.html:489
+msgid "Stock Item already in this location"
+msgstr ""
+
+#: templates/js/barcode.html:496
+msgid "Added stock item"
+msgstr ""
+
+#: templates/js/barcode.html:503
+msgid "Barcode does not match Stock Item"
+msgstr ""
+
 #: templates/js/bom.html:143
 msgid "Open subassembly"
 msgstr ""
@@ -3509,7 +3602,7 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/order.html:170 templates/js/stock.html:605
+#: templates/js/order.html:170 templates/js/stock.html:612
 msgid "Date"
 msgstr ""
 
@@ -3521,7 +3614,7 @@ msgstr ""
 msgid "Shipment Date"
 msgstr ""
 
-#: templates/js/part.html:106 templates/js/stock.html:403
+#: templates/js/part.html:106 templates/js/stock.html:405
 msgid "Select"
 msgstr ""
 
@@ -3537,7 +3630,7 @@ msgstr ""
 msgid "No category"
 msgstr ""
 
-#: templates/js/part.html:214 templates/js/table_filters.html:130
+#: templates/js/part.html:214 templates/js/table_filters.html:157
 msgid "Low stock"
 msgstr ""
 
@@ -3597,107 +3690,119 @@ msgstr ""
 msgid "Test Date"
 msgstr ""
 
-#: templates/js/stock.html:258
+#: templates/js/stock.html:260
 msgid "No stock items matching query"
 msgstr ""
 
-#: templates/js/stock.html:355 templates/js/stock.html:370
+#: templates/js/stock.html:357 templates/js/stock.html:372
 msgid "Undefined location"
 msgstr ""
 
-#: templates/js/stock.html:467
+#: templates/js/stock.html:469
 msgid "StockItem has been allocated"
 msgstr ""
 
-#: templates/js/stock.html:472
+#: templates/js/stock.html:474
 msgid "StockItem is lost"
 msgstr ""
 
-#: templates/js/stock.html:500
+#: templates/js/stock.html:503
+msgid "Shipped to customer"
+msgstr ""
+
+#: templates/js/stock.html:506
 msgid "No stock location set"
 msgstr ""
 
-#: templates/js/stock.html:671
+#: templates/js/stock.html:678
 msgid "No user information"
 msgstr ""
 
-#: templates/js/table_filters.html:19
-msgid "Include sublocations"
+#: templates/js/table_filters.html:19 templates/js/table_filters.html:62
+msgid "Is Serialized"
 msgstr ""
 
-#: templates/js/table_filters.html:20
-msgid "Include stock in sublocations"
-msgstr ""
-
-#: templates/js/table_filters.html:24
-msgid "Active parts"
-msgstr ""
-
-#: templates/js/table_filters.html:25
-msgid "Show stock for active parts"
-msgstr ""
-
-#: templates/js/table_filters.html:29 templates/js/table_filters.html:30
-msgid "Stock status"
-msgstr ""
-
-#: templates/js/table_filters.html:34
-msgid "Is allocated"
-msgstr ""
-
-#: templates/js/table_filters.html:35
-msgid "Item has been alloacted"
-msgstr ""
-
-#: templates/js/table_filters.html:38
+#: templates/js/table_filters.html:22 templates/js/table_filters.html:65
 msgid "Serial number GTE"
 msgstr ""
 
-#: templates/js/table_filters.html:39
+#: templates/js/table_filters.html:23 templates/js/table_filters.html:66
 msgid "Serial number greater than or equal to"
 msgstr ""
 
-#: templates/js/table_filters.html:42
+#: templates/js/table_filters.html:26 templates/js/table_filters.html:69
 msgid "Serial number LTE"
 msgstr ""
 
-#: templates/js/table_filters.html:43
+#: templates/js/table_filters.html:27 templates/js/table_filters.html:70
 msgid "Serial number less than or equal to"
 msgstr ""
 
-#: templates/js/table_filters.html:72
+#: templates/js/table_filters.html:38
+msgid "Show items which are in stock"
+msgstr ""
+
+#: templates/js/table_filters.html:42
+msgid "Include sublocations"
+msgstr ""
+
+#: templates/js/table_filters.html:43
+msgid "Include stock in sublocations"
+msgstr ""
+
+#: templates/js/table_filters.html:47
+msgid "Active parts"
+msgstr ""
+
+#: templates/js/table_filters.html:48
+msgid "Show stock for active parts"
+msgstr ""
+
+#: templates/js/table_filters.html:52 templates/js/table_filters.html:53
+msgid "Stock status"
+msgstr ""
+
+#: templates/js/table_filters.html:57
+msgid "Is allocated"
+msgstr ""
+
+#: templates/js/table_filters.html:58
+msgid "Item has been alloacted"
+msgstr ""
+
+#: templates/js/table_filters.html:99
 msgid "Build status"
 msgstr ""
 
-#: templates/js/table_filters.html:84 templates/js/table_filters.html:97
+#: templates/js/table_filters.html:111 templates/js/table_filters.html:124
 msgid "Order status"
 msgstr ""
 
-#: templates/js/table_filters.html:89 templates/js/table_filters.html:102
+#: templates/js/table_filters.html:116 templates/js/table_filters.html:129
 msgid "Outstanding"
 msgstr ""
 
-#: templates/js/table_filters.html:112
+#: templates/js/table_filters.html:139
 msgid "Include subcategories"
 msgstr ""
 
-#: templates/js/table_filters.html:113
+#: templates/js/table_filters.html:140
 msgid "Include parts in subcategories"
 msgstr ""
 
-#: templates/js/table_filters.html:118
+#: templates/js/table_filters.html:145
 msgid "Show active parts"
 msgstr ""
 
-#: templates/js/table_filters.html:126
+#: templates/js/table_filters.html:153
 msgid "Stock available"
 msgstr ""
 
-#: templates/js/table_filters.html:142
+#: templates/js/table_filters.html:169
 msgid "Starred"
 msgstr ""
 
-#: templates/js/table_filters.html:154
+#: templates/js/table_filters.html:181
 msgid "Purchasable"
 msgstr ""
 
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index c539fbcae5..972a9ee6af 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: 2020-06-12 00:43+0000\n"
+"POT-Creation-Date: 2020-07-30 10:24+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"
@@ -78,7 +78,7 @@ msgstr ""
 msgid "File comment"
 msgstr ""
 
-#: InvenTree/models.py:68 templates/js/stock.html:662
+#: InvenTree/models.py:68 templates/js/stock.html:669
 msgid "User"
 msgstr ""
 
@@ -286,9 +286,10 @@ msgstr ""
 #: order/templates/order/purchase_order_detail.html:145
 #: order/templates/order/receive_parts.html:19 part/models.py:240
 #: part/templates/part/part_app_base.html:7
-#: part/templates/part/set_category.html:13 templates/js/bom.html:135
-#: templates/js/build.html:41 templates/js/company.html:109
-#: templates/js/part.html:120 templates/js/stock.html:422
+#: part/templates/part/set_category.html:13 templates/js/barcode.html:336
+#: templates/js/bom.html:135 templates/js/build.html:41
+#: templates/js/company.html:109 templates/js/part.html:120
+#: templates/js/stock.html:424
 msgid "Part"
 msgstr ""
 
@@ -322,7 +323,7 @@ msgstr ""
 msgid "Number of parts to build"
 msgstr ""
 
-#: build/models.py:128 part/templates/part/part_base.html:141
+#: build/models.py:128 part/templates/part/part_base.html:139
 msgid "Build Status"
 msgstr ""
 
@@ -341,7 +342,7 @@ msgstr ""
 #: build/models.py:155 build/templates/build/detail.html:55
 #: company/templates/company/supplier_part_base.html:60
 #: company/templates/company/supplier_part_detail.html:24
-#: part/templates/part/detail.html:74 part/templates/part/part_base.html:88
+#: part/templates/part/detail.html:74 part/templates/part/part_base.html:86
 #: stock/models.py:368 stock/templates/stock/item_base.html:230
 msgid "External Link"
 msgstr ""
@@ -350,13 +351,13 @@ msgstr ""
 msgid "Link to external URL"
 msgstr ""
 
-#: build/models.py:160 build/templates/build/tabs.html:14 company/models.py:302
+#: build/models.py:160 build/templates/build/tabs.html:14 company/models.py:307
 #: company/templates/company/tabs.html:33 order/templates/order/po_tabs.html:15
 #: order/templates/order/purchase_order_detail.html:200
-#: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:73
+#: order/templates/order/so_tabs.html:23 part/templates/part/tabs.html:64
 #: stock/models.py:436 stock/models.py:1265 stock/templates/stock/tabs.html:26
-#: templates/js/bom.html:229 templates/js/stock.html:113
-#: templates/js/stock.html:506
+#: templates/js/barcode.html:391 templates/js/bom.html:229
+#: templates/js/stock.html:113 templates/js/stock.html:513
 msgid "Notes"
 msgstr ""
 
@@ -422,7 +423,7 @@ msgstr ""
 #: build/templates/build/allocate.html:161
 #: order/templates/order/sales_order_detail.html:68
 #: order/templates/order/sales_order_detail.html:150 stock/models.py:362
-#: stock/templates/stock/item_base.html:189
+#: stock/templates/stock/item_base.html:146
 msgid "Serial Number"
 msgstr ""
 
@@ -439,16 +440,18 @@ msgstr ""
 #: part/templates/part/allocation.html:49
 #: stock/templates/stock/item_base.html:26
 #: stock/templates/stock/item_base.html:32
-#: stock/templates/stock/item_base.html:195
-#: stock/templates/stock/stock_adjust.html:18 templates/js/bom.html:172
-#: templates/js/build.html:52 templates/js/stock.html:653
+#: stock/templates/stock/item_base.html:152
+#: stock/templates/stock/stock_adjust.html:18 templates/js/barcode.html:338
+#: templates/js/bom.html:172 templates/js/build.html:52
+#: templates/js/stock.html:660
 msgid "Quantity"
 msgstr ""
 
 #: build/templates/build/allocate.html:177
 #: build/templates/build/auto_allocate.html:20
-#: stock/templates/stock/item_base.html:171
-#: stock/templates/stock/stock_adjust.html:17 templates/js/stock.html:493
+#: stock/templates/stock/item_base.html:184
+#: stock/templates/stock/stock_adjust.html:17 templates/js/barcode.html:337
+#: templates/js/stock.html:495
 msgid "Location"
 msgstr ""
 
@@ -474,7 +477,7 @@ msgstr ""
 #: templates/js/bom.html:157 templates/js/company.html:60
 #: templates/js/order.html:157 templates/js/order.html:230
 #: templates/js/part.html:176 templates/js/part.html:355
-#: templates/js/stock.html:443 templates/js/stock.html:634
+#: templates/js/stock.html:445 templates/js/stock.html:641
 msgid "Description"
 msgstr ""
 
@@ -484,8 +487,8 @@ msgstr ""
 msgid "Reference"
 msgstr ""
 
-#: build/templates/build/allocate.html:338 part/models.py:1260
-#: templates/js/part.html:359 templates/js/table_filters.html:63
+#: build/templates/build/allocate.html:338 part/models.py:1269
+#: templates/js/part.html:359 templates/js/table_filters.html:90
 msgid "Required"
 msgstr ""
 
@@ -548,9 +551,9 @@ msgstr ""
 #: build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:42
 #: order/templates/order/receive_parts.html:24
-#: stock/templates/stock/item_base.html:262 templates/js/build.html:57
-#: templates/js/order.html:162 templates/js/order.html:235
-#: templates/js/stock.html:480
+#: stock/templates/stock/item_base.html:262 templates/js/barcode.html:42
+#: templates/js/build.html:57 templates/js/order.html:162
+#: templates/js/order.html:235 templates/js/stock.html:482
 msgid "Status"
 msgstr ""
 
@@ -560,7 +563,7 @@ msgstr ""
 #: order/templates/order/sales_order_notes.html:10
 #: order/templates/order/sales_order_ship.html:25
 #: part/templates/part/allocation.html:27
-#: stock/templates/stock/item_base.html:159 templates/js/order.html:209
+#: stock/templates/stock/item_base.html:172 templates/js/order.html:209
 msgid "Sales Order"
 msgstr ""
 
@@ -627,7 +630,7 @@ msgid "Stock can be taken from any available location."
 msgstr ""
 
 #: build/templates/build/detail.html:48
-#: stock/templates/stock/item_base.html:202 templates/js/stock.html:488
+#: stock/templates/stock/item_base.html:202 templates/js/stock.html:490
 msgid "Batch"
 msgstr ""
 
@@ -847,83 +850,113 @@ msgstr ""
 msgid "Delete Currency"
 msgstr ""
 
-#: company/models.py:83
+#: company/models.py:83 company/models.py:84
 msgid "Company name"
 msgstr ""
 
-#: company/models.py:85
+#: company/models.py:86
+msgid "Company description"
+msgstr ""
+
+#: company/models.py:86
 msgid "Description of the company"
 msgstr ""
 
-#: company/models.py:87
+#: company/models.py:88 company/templates/company/company_base.html:48
+#: templates/js/company.html:65
+msgid "Website"
+msgstr ""
+
+#: company/models.py:88
 msgid "Company website URL"
 msgstr ""
 
-#: company/models.py:90
+#: company/models.py:91 company/templates/company/company_base.html:55
+msgid "Address"
+msgstr ""
+
+#: company/models.py:92
 msgid "Company address"
 msgstr ""
 
-#: company/models.py:93
+#: company/models.py:95
+msgid "Phone number"
+msgstr ""
+
+#: company/models.py:96
 msgid "Contact phone number"
 msgstr ""
 
-#: company/models.py:95
-msgid "Contact email address"
+#: company/models.py:98 company/templates/company/company_base.html:69
+msgid "Email"
 msgstr ""
 
 #: company/models.py:98
+msgid "Contact email address"
+msgstr ""
+
+#: company/models.py:101 company/templates/company/company_base.html:76
+msgid "Contact"
+msgstr ""
+
+#: company/models.py:102
 msgid "Point of contact"
 msgstr ""
 
-#: company/models.py:100
+#: company/models.py:104
 msgid "Link to external company information"
 msgstr ""
 
-#: company/models.py:112
+#: company/models.py:116
 msgid "Do you sell items to this company?"
 msgstr ""
 
-#: company/models.py:114
+#: company/models.py:118
 msgid "Do you purchase items from this company?"
 msgstr ""
 
-#: company/models.py:116
+#: company/models.py:120
 msgid "Does this company manufacture parts?"
 msgstr ""
 
-#: company/models.py:276
+#: company/models.py:276 stock/models.py:322
+#: stock/templates/stock/item_base.html:138
+msgid "Base Part"
+msgstr ""
+
+#: company/models.py:281
 msgid "Select part"
 msgstr ""
 
-#: company/models.py:282
+#: company/models.py:287
 msgid "Select supplier"
 msgstr ""
 
-#: company/models.py:285
+#: company/models.py:290
 msgid "Supplier stock keeping unit"
 msgstr ""
 
-#: company/models.py:292
+#: company/models.py:297
 msgid "Select manufacturer"
 msgstr ""
 
-#: company/models.py:296
+#: company/models.py:301
 msgid "Manufacturer part number"
 msgstr ""
 
-#: company/models.py:298
+#: company/models.py:303
 msgid "URL for external supplier part link"
 msgstr ""
 
-#: company/models.py:300
+#: company/models.py:305
 msgid "Supplier part description"
 msgstr ""
 
-#: company/models.py:304
+#: company/models.py:309
 msgid "Minimum charge (e.g. stocking fee)"
 msgstr ""
 
-#: company/models.py:306
+#: company/models.py:311
 msgid "Part packaging"
 msgstr ""
 
@@ -942,26 +975,10 @@ msgstr ""
 msgid "Company Details"
 msgstr ""
 
-#: company/templates/company/company_base.html:48 templates/js/company.html:65
-msgid "Website"
-msgstr ""
-
-#: company/templates/company/company_base.html:55
-msgid "Address"
-msgstr ""
-
 #: company/templates/company/company_base.html:62
 msgid "Phone"
 msgstr ""
 
-#: company/templates/company/company_base.html:69
-msgid "Email"
-msgstr ""
-
-#: company/templates/company/company_base.html:76
-msgid "Contact"
-msgstr ""
-
 #: company/templates/company/detail.html:16
 #: company/templates/company/supplier_part_base.html:76
 #: company/templates/company/supplier_part_detail.html:30
@@ -981,7 +998,7 @@ msgstr ""
 
 #: company/templates/company/detail.html:26 order/models.py:314
 #: order/templates/order/sales_order_base.html:73 stock/models.py:357
-#: stock/models.py:358 stock/templates/stock/item_base.html:146
+#: stock/models.py:358 stock/templates/stock/item_base.html:159
 #: templates/js/company.html:44 templates/js/order.html:217
 msgid "Customer"
 msgstr ""
@@ -992,7 +1009,7 @@ msgstr ""
 
 #: company/templates/company/detail_part.html:13
 #: order/templates/order/purchase_order_detail.html:67
-#: part/templates/part/stock.html:82 part/templates/part/supplier.html:12
+#: part/templates/part/stock.html:81 part/templates/part/supplier.html:12
 msgid "New Supplier Part"
 msgstr ""
 
@@ -1006,7 +1023,7 @@ msgid "Delete Parts"
 msgstr ""
 
 #: company/templates/company/detail_part.html:43
-#: part/templates/part/stock.html:76
+#: part/templates/part/stock.html:75
 msgid "New Part"
 msgstr ""
 
@@ -1038,7 +1055,7 @@ msgstr ""
 
 #: company/templates/company/detail_stock.html:34
 #: company/templates/company/supplier_part_stock.html:33
-#: part/templates/part/stock.html:54 templates/stock_table.html:5
+#: part/templates/part/stock.html:53 templates/stock_table.html:5
 msgid "Export"
 msgstr ""
 
@@ -1178,12 +1195,12 @@ msgstr ""
 #: company/templates/company/supplier_part_stock.html:56
 #: order/templates/order/purchase_order_detail.html:38
 #: order/templates/order/purchase_order_detail.html:118
-#: part/templates/part/stock.html:91
+#: part/templates/part/stock.html:90
 msgid "New Location"
 msgstr ""
 
 #: company/templates/company/supplier_part_stock.html:57
-#: part/templates/part/stock.html:92
+#: part/templates/part/stock.html:91
 msgid "Create New Location"
 msgstr ""
 
@@ -1194,7 +1211,7 @@ msgstr ""
 #: company/templates/company/supplier_part_tabs.html:8
 #: company/templates/company/tabs.html:12 part/templates/part/tabs.html:18
 #: stock/templates/stock/location.html:12 templates/js/part.html:203
-#: templates/js/stock.html:451 templates/navbar.html:11
+#: templates/js/stock.html:453 templates/navbar.html:11
 msgid "Stock"
 msgstr ""
 
@@ -1274,7 +1291,7 @@ msgstr ""
 msgid "Edit Supplier Part"
 msgstr ""
 
-#: company/views.py:265 part/templates/part/stock.html:83
+#: company/views.py:265 part/templates/part/stock.html:82
 msgid "Create new Supplier Part"
 msgstr ""
 
@@ -1508,7 +1525,7 @@ msgid "Purchase Order Attachments"
 msgstr ""
 
 #: order/templates/order/po_tabs.html:8 order/templates/order/so_tabs.html:16
-#: part/templates/part/tabs.html:70 stock/templates/stock/tabs.html:32
+#: part/templates/part/tabs.html:61 stock/templates/stock/tabs.html:32
 msgid "Attachments"
 msgstr ""
 
@@ -1524,7 +1541,7 @@ msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:39
 #: order/templates/order/purchase_order_detail.html:119
-#: stock/templates/stock/location.html:17
+#: stock/templates/stock/location.html:16
 msgid "Create new stock location"
 msgstr ""
 
@@ -1563,7 +1580,7 @@ msgid "Select parts to receive against this order"
 msgstr ""
 
 #: order/templates/order/receive_parts.html:21
-#: part/templates/part/part_base.html:131 templates/js/part.html:219
+#: part/templates/part/part_base.html:129 templates/js/part.html:219
 msgid "On Order"
 msgstr ""
 
@@ -1952,111 +1969,111 @@ msgstr ""
 msgid "Stored BOM checksum"
 msgstr ""
 
-#: part/models.py:1212
+#: part/models.py:1221
 msgid "Test templates can only be created for trackable parts"
 msgstr ""
 
-#: part/models.py:1229
+#: part/models.py:1238
 msgid "Test with this name already exists for this part"
 msgstr ""
 
-#: part/models.py:1248 templates/js/part.html:350 templates/js/stock.html:89
+#: part/models.py:1257 templates/js/part.html:350 templates/js/stock.html:89
 msgid "Test Name"
 msgstr ""
 
-#: part/models.py:1249
+#: part/models.py:1258
 msgid "Enter a name for the test"
 msgstr ""
 
-#: part/models.py:1254
+#: part/models.py:1263
 msgid "Test Description"
 msgstr ""
 
-#: part/models.py:1255
+#: part/models.py:1264
 msgid "Enter description for this test"
 msgstr ""
 
-#: part/models.py:1261
+#: part/models.py:1270
 msgid "Is this test required to pass?"
 msgstr ""
 
-#: part/models.py:1266 templates/js/part.html:367
+#: part/models.py:1275 templates/js/part.html:367
 msgid "Requires Value"
 msgstr ""
 
-#: part/models.py:1267
+#: part/models.py:1276
 msgid "Does this test require a value when adding a test result?"
 msgstr ""
 
-#: part/models.py:1272 templates/js/part.html:374
+#: part/models.py:1281 templates/js/part.html:374
 msgid "Requires Attachment"
 msgstr ""
 
-#: part/models.py:1273
+#: part/models.py:1282
 msgid "Does this test require a file attachment when adding a test result?"
 msgstr ""
 
-#: part/models.py:1306
+#: part/models.py:1315
 msgid "Parameter template name must be unique"
 msgstr ""
 
-#: part/models.py:1311
+#: part/models.py:1320
 msgid "Parameter Name"
 msgstr ""
 
-#: part/models.py:1313
+#: part/models.py:1322
 msgid "Parameter Units"
 msgstr ""
 
-#: part/models.py:1339
+#: part/models.py:1348
 msgid "Parent Part"
 msgstr ""
 
-#: part/models.py:1341
+#: part/models.py:1350
 msgid "Parameter Template"
 msgstr ""
 
-#: part/models.py:1343
+#: part/models.py:1352
 msgid "Parameter Value"
 msgstr ""
 
-#: part/models.py:1372
+#: part/models.py:1381
 msgid "Select parent part"
 msgstr ""
 
-#: part/models.py:1380
+#: part/models.py:1389
 msgid "Select part to be used in BOM"
 msgstr ""
 
-#: part/models.py:1386
+#: part/models.py:1395
 msgid "BOM quantity for this BOM item"
 msgstr ""
 
-#: part/models.py:1389
+#: part/models.py:1398
 msgid "Estimated build wastage quantity (absolute or percentage)"
 msgstr ""
 
-#: part/models.py:1392
+#: part/models.py:1401
 msgid "BOM item reference"
 msgstr ""
 
-#: part/models.py:1395
+#: part/models.py:1404
 msgid "BOM item notes"
 msgstr ""
 
-#: part/models.py:1397
+#: part/models.py:1406
 msgid "BOM line checksum"
 msgstr ""
 
-#: part/models.py:1461 stock/models.py:233
+#: part/models.py:1470 stock/models.py:233
 msgid "Quantity must be integer value for trackable parts"
 msgstr ""
 
-#: part/models.py:1470
+#: part/models.py:1479
 msgid "Part cannot be added to its own Bill of Materials"
 msgstr ""
 
-#: part/models.py:1477
+#: part/models.py:1486
 #, python-brace-format
 msgid "Part '{p1}' is  used in BOM for '{p2}' (recursive)"
 msgstr ""
@@ -2078,12 +2095,12 @@ msgstr ""
 #: stock/templates/stock/item_base.html:58
 #: stock/templates/stock/item_base.html:224
 #: stock/templates/stock/stock_adjust.html:16 templates/js/build.html:106
-#: templates/js/stock.html:623
+#: templates/js/stock.html:630
 msgid "Stock Item"
 msgstr ""
 
 #: part/templates/part/allocation.html:20
-#: stock/templates/stock/item_base.html:165
+#: stock/templates/stock/item_base.html:178
 msgid "Build Order"
 msgstr ""
 
@@ -2164,7 +2181,7 @@ msgstr ""
 msgid "Part Details"
 msgstr ""
 
-#: part/templates/part/detail.html:25 part/templates/part/part_base.html:81
+#: part/templates/part/detail.html:25 part/templates/part/part_base.html:79
 msgid "IPN"
 msgstr ""
 
@@ -2222,7 +2239,7 @@ msgid "Part is not a virtual part"
 msgstr ""
 
 #: part/templates/part/detail.html:139 stock/forms.py:194
-#: templates/js/table_filters.html:122
+#: templates/js/table_filters.html:149
 msgid "Template"
 msgstr ""
 
@@ -2234,7 +2251,7 @@ msgstr ""
 msgid "Part is not a template part"
 msgstr ""
 
-#: part/templates/part/detail.html:148 templates/js/table_filters.html:134
+#: part/templates/part/detail.html:148 templates/js/table_filters.html:161
 msgid "Assembly"
 msgstr ""
 
@@ -2246,7 +2263,7 @@ msgstr ""
 msgid "Part cannot be assembled from other parts"
 msgstr ""
 
-#: part/templates/part/detail.html:157 templates/js/table_filters.html:138
+#: part/templates/part/detail.html:157 templates/js/table_filters.html:165
 msgid "Component"
 msgstr ""
 
@@ -2258,7 +2275,7 @@ msgstr ""
 msgid "Part cannot be used in assemblies"
 msgstr ""
 
-#: part/templates/part/detail.html:166 templates/js/table_filters.html:150
+#: part/templates/part/detail.html:166 templates/js/table_filters.html:177
 msgid "Trackable"
 msgstr ""
 
@@ -2278,7 +2295,7 @@ msgstr ""
 msgid "Part can be purchased from external suppliers"
 msgstr ""
 
-#: part/templates/part/detail.html:184 templates/js/table_filters.html:146
+#: part/templates/part/detail.html:184 templates/js/table_filters.html:173
 msgid "Salable"
 msgstr ""
 
@@ -2290,7 +2307,7 @@ msgstr ""
 msgid "Part cannot be sold to customers"
 msgstr ""
 
-#: part/templates/part/detail.html:193 templates/js/table_filters.html:117
+#: part/templates/part/detail.html:193 templates/js/table_filters.html:144
 msgid "Active"
 msgstr ""
 
@@ -2360,35 +2377,69 @@ msgstr ""
 msgid "Inactive"
 msgstr ""
 
-#: part/templates/part/part_base.html:41
+#: part/templates/part/part_base.html:39
 msgid "Star this part"
 msgstr ""
 
+#: part/templates/part/part_base.html:44
+#: stock/templates/stock/item_base.html:78
+#: stock/templates/stock/location.html:22
+msgid "Barcode actions"
+msgstr ""
+
+#: part/templates/part/part_base.html:46
+#: stock/templates/stock/item_base.html:80
+#: stock/templates/stock/location.html:24
+msgid "Show QR Code"
+msgstr ""
+
 #: part/templates/part/part_base.html:47
+#: stock/templates/stock/item_base.html:81
+#: stock/templates/stock/location.html:25
+msgid "Print Label"
+msgstr ""
+
+#: part/templates/part/part_base.html:51
 msgid "Show pricing information"
 msgstr ""
 
-#: part/templates/part/part_base.html:104
+#: part/templates/part/part_base.html:64
+msgid "Part actions"
+msgstr ""
+
+#: part/templates/part/part_base.html:66
+msgid "Duplicate part"
+msgstr ""
+
+#: part/templates/part/part_base.html:67
+msgid "Edit part"
+msgstr ""
+
+#: part/templates/part/part_base.html:69
+msgid "Delete part"
+msgstr ""
+
+#: part/templates/part/part_base.html:102
 msgid "Available Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:110
+#: part/templates/part/part_base.html:108 templates/js/table_filters.html:37
 msgid "In Stock"
 msgstr ""
 
-#: part/templates/part/part_base.html:117
+#: part/templates/part/part_base.html:115
 msgid "Allocated to Build Orders"
 msgstr ""
 
-#: part/templates/part/part_base.html:124
+#: part/templates/part/part_base.html:122
 msgid "Allocated to Sales Orders"
 msgstr ""
 
-#: part/templates/part/part_base.html:146
+#: part/templates/part/part_base.html:144
 msgid "Can Build"
 msgstr ""
 
-#: part/templates/part/part_base.html:152
+#: part/templates/part/part_base.html:150
 msgid "Underway"
 msgstr ""
 
@@ -2428,7 +2479,7 @@ msgstr ""
 msgid "Part Stock"
 msgstr ""
 
-#: part/templates/part/stock.html:77
+#: part/templates/part/stock.html:76
 msgid "Create New Part"
 msgstr ""
 
@@ -2473,11 +2524,7 @@ msgstr ""
 msgid "Used In"
 msgstr ""
 
-#: part/templates/part/tabs.html:57 stock/templates/stock/tabs.html:6
-msgid "Tracking"
-msgstr ""
-
-#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:268
+#: part/templates/part/tabs.html:55 stock/templates/stock/item_base.html:268
 msgid "Tests"
 msgstr ""
 
@@ -2739,10 +2786,6 @@ msgstr ""
 msgid "Parent Stock Item"
 msgstr ""
 
-#: stock/models.py:322 stock/templates/stock/item_base.html:138
-msgid "Base Part"
-msgstr ""
-
 #: stock/models.py:323
 msgid "Base part"
 msgstr ""
@@ -2890,7 +2933,7 @@ msgstr ""
 msgid "Result"
 msgstr ""
 
-#: stock/models.py:1247 templates/js/table_filters.html:53
+#: stock/models.py:1247 templates/js/table_filters.html:80
 msgid "Test result"
 msgstr ""
 
@@ -2945,20 +2988,8 @@ msgid ""
 "This stock item will be automatically deleted when all stock is depleted."
 msgstr ""
 
-#: stock/templates/stock/item_base.html:78
-msgid "Barcode actions"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:80
-msgid "Show QR Code"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:81
-msgid "Print Label"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:263
-#: templates/js/barcode.html:268
+#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:283
+#: templates/js/barcode.html:288
 msgid "Unlink Barcode"
 msgstr ""
 
@@ -2970,7 +3001,8 @@ msgstr ""
 msgid "Stock adjustment actions"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:95 templates/stock_table.html:14
+#: stock/templates/stock/item_base.html:95
+#: stock/templates/stock/location.html:33 templates/stock_table.html:14
 msgid "Count stock"
 msgstr ""
 
@@ -2987,6 +3019,7 @@ msgid "Transfer stock"
 msgstr ""
 
 #: stock/templates/stock/item_base.html:105
+#: stock/templates/stock/location.html:30
 msgid "Stock actions"
 msgstr ""
 
@@ -3022,15 +3055,15 @@ msgstr ""
 msgid "Stock Item Details"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:153
+#: stock/templates/stock/item_base.html:166
 msgid "Belongs To"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:175
+#: stock/templates/stock/item_base.html:188
 msgid "No location set"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:182
+#: stock/templates/stock/item_base.html:195
 msgid "Unique Identifier"
 msgstr ""
 
@@ -3058,6 +3091,10 @@ msgstr ""
 msgid "This stock item does not have any child items"
 msgstr ""
 
+#: stock/templates/stock/item_delete.html:9
+msgid "Are you sure you want to delete this stock item?"
+msgstr ""
+
 #: stock/templates/stock/item_tests.html:10 stock/templates/stock/tabs.html:13
 msgid "Test Data"
 msgstr ""
@@ -3078,49 +3115,57 @@ msgstr ""
 msgid "All stock items"
 msgstr ""
 
-#: stock/templates/stock/location.html:22
-msgid "Count stock items"
-msgstr ""
-
-#: stock/templates/stock/location.html:25
-msgid "Edit stock location"
-msgstr ""
-
-#: stock/templates/stock/location.html:28
-msgid "Delete stock location"
+#: stock/templates/stock/location.html:26
+msgid "Check-in Items"
 msgstr ""
 
 #: stock/templates/stock/location.html:37
+msgid "Location actions"
+msgstr ""
+
+#: stock/templates/stock/location.html:39
+msgid "Edit location"
+msgstr ""
+
+#: stock/templates/stock/location.html:40
+msgid "Delete location"
+msgstr ""
+
+#: stock/templates/stock/location.html:48
 msgid "Location Details"
 msgstr ""
 
-#: stock/templates/stock/location.html:42
+#: stock/templates/stock/location.html:53
 msgid "Location Path"
 msgstr ""
 
-#: stock/templates/stock/location.html:47
+#: stock/templates/stock/location.html:58
 msgid "Location Description"
 msgstr ""
 
-#: stock/templates/stock/location.html:52
+#: stock/templates/stock/location.html:63
 msgid "Sublocations"
 msgstr ""
 
-#: stock/templates/stock/location.html:57
-#: stock/templates/stock/location.html:72 templates/stats.html:21
+#: stock/templates/stock/location.html:68
+#: stock/templates/stock/location.html:83 templates/stats.html:21
 #: templates/stats.html:30
 msgid "Stock Items"
 msgstr ""
 
-#: stock/templates/stock/location.html:62
+#: stock/templates/stock/location.html:73
 msgid "Stock Details"
 msgstr ""
 
-#: stock/templates/stock/location.html:67
+#: stock/templates/stock/location.html:78
 #: templates/InvenTree/search_stock_location.html:6 templates/stats.html:25
 msgid "Stock Locations"
 msgstr ""
 
+#: stock/templates/stock/location_delete.html:7
+msgid "Are you sure you want to delete this stock location?"
+msgstr ""
+
 #: stock/templates/stock/stockitem_convert.html:7 stock/views.py:934
 msgid "Convert Stock Item"
 msgstr ""
@@ -3137,6 +3182,10 @@ msgstr ""
 msgid "This action cannot be easily undone"
 msgstr ""
 
+#: stock/templates/stock/tabs.html:6
+msgid "Tracking"
+msgstr ""
+
 #: stock/templates/stock/tabs.html:21
 msgid "Builds"
 msgstr ""
@@ -3416,39 +3465,83 @@ msgstr ""
 msgid "Delete attachment"
 msgstr ""
 
-#: templates/js/barcode.html:28
+#: templates/js/barcode.html:8
 msgid "Scan barcode data here using wedge scanner"
 msgstr ""
 
-#: templates/js/barcode.html:34
+#: templates/js/barcode.html:12
 msgid "Barcode"
 msgstr ""
 
-#: templates/js/barcode.html:42
+#: templates/js/barcode.html:20
 msgid "Enter barcode data"
 msgstr ""
 
-#: templates/js/barcode.html:140
-msgid "Scan barcode data below"
-msgstr ""
-
-#: templates/js/barcode.html:195 templates/js/barcode.html:243
-msgid "Unknown response from server"
-msgstr ""
-
-#: templates/js/barcode.html:198 templates/js/barcode.html:247
+#: templates/js/barcode.html:42
 msgid "Invalid server response"
 msgstr ""
 
-#: templates/js/barcode.html:265
+#: templates/js/barcode.html:143
+msgid "Scan barcode data below"
+msgstr ""
+
+#: templates/js/barcode.html:217 templates/js/barcode.html:263
+msgid "Unknown response from server"
+msgstr ""
+
+#: templates/js/barcode.html:239
+msgid "Link Barcode to Stock Item"
+msgstr ""
+
+#: templates/js/barcode.html:285
 msgid ""
 "This will remove the association between this stock item and the barcode"
 msgstr ""
 
-#: templates/js/barcode.html:271
+#: templates/js/barcode.html:291
 msgid "Unlink"
 msgstr ""
 
+#: templates/js/barcode.html:350
+msgid "Remove stock item"
+msgstr ""
+
+#: templates/js/barcode.html:397
+msgid "Enter notes"
+msgstr ""
+
+#: templates/js/barcode.html:399
+msgid "Enter optional notes for stock transfer"
+msgstr ""
+
+#: templates/js/barcode.html:404
+msgid "Check Stock Items into Location"
+msgstr ""
+
+#: templates/js/barcode.html:408
+msgid "Check In"
+msgstr ""
+
+#: templates/js/barcode.html:466
+msgid "Server error"
+msgstr ""
+
+#: templates/js/barcode.html:485
+msgid "Stock Item already scanned"
+msgstr ""
+
+#: templates/js/barcode.html:489
+msgid "Stock Item already in this location"
+msgstr ""
+
+#: templates/js/barcode.html:496
+msgid "Added stock item"
+msgstr ""
+
+#: templates/js/barcode.html:503
+msgid "Barcode does not match Stock Item"
+msgstr ""
+
 #: templates/js/bom.html:143
 msgid "Open subassembly"
 msgstr ""
@@ -3509,7 +3602,7 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/order.html:170 templates/js/stock.html:605
+#: templates/js/order.html:170 templates/js/stock.html:612
 msgid "Date"
 msgstr ""
 
@@ -3521,7 +3614,7 @@ msgstr ""
 msgid "Shipment Date"
 msgstr ""
 
-#: templates/js/part.html:106 templates/js/stock.html:403
+#: templates/js/part.html:106 templates/js/stock.html:405
 msgid "Select"
 msgstr ""
 
@@ -3537,7 +3630,7 @@ msgstr ""
 msgid "No category"
 msgstr ""
 
-#: templates/js/part.html:214 templates/js/table_filters.html:130
+#: templates/js/part.html:214 templates/js/table_filters.html:157
 msgid "Low stock"
 msgstr ""
 
@@ -3597,107 +3690,119 @@ msgstr ""
 msgid "Test Date"
 msgstr ""
 
-#: templates/js/stock.html:258
+#: templates/js/stock.html:260
 msgid "No stock items matching query"
 msgstr ""
 
-#: templates/js/stock.html:355 templates/js/stock.html:370
+#: templates/js/stock.html:357 templates/js/stock.html:372
 msgid "Undefined location"
 msgstr ""
 
-#: templates/js/stock.html:467
+#: templates/js/stock.html:469
 msgid "StockItem has been allocated"
 msgstr ""
 
-#: templates/js/stock.html:472
+#: templates/js/stock.html:474
 msgid "StockItem is lost"
 msgstr ""
 
-#: templates/js/stock.html:500
+#: templates/js/stock.html:503
+msgid "Shipped to customer"
+msgstr ""
+
+#: templates/js/stock.html:506
 msgid "No stock location set"
 msgstr ""
 
-#: templates/js/stock.html:671
+#: templates/js/stock.html:678
 msgid "No user information"
 msgstr ""
 
-#: templates/js/table_filters.html:19
-msgid "Include sublocations"
+#: templates/js/table_filters.html:19 templates/js/table_filters.html:62
+msgid "Is Serialized"
 msgstr ""
 
-#: templates/js/table_filters.html:20
-msgid "Include stock in sublocations"
-msgstr ""
-
-#: templates/js/table_filters.html:24
-msgid "Active parts"
-msgstr ""
-
-#: templates/js/table_filters.html:25
-msgid "Show stock for active parts"
-msgstr ""
-
-#: templates/js/table_filters.html:29 templates/js/table_filters.html:30
-msgid "Stock status"
-msgstr ""
-
-#: templates/js/table_filters.html:34
-msgid "Is allocated"
-msgstr ""
-
-#: templates/js/table_filters.html:35
-msgid "Item has been alloacted"
-msgstr ""
-
-#: templates/js/table_filters.html:38
+#: templates/js/table_filters.html:22 templates/js/table_filters.html:65
 msgid "Serial number GTE"
 msgstr ""
 
-#: templates/js/table_filters.html:39
+#: templates/js/table_filters.html:23 templates/js/table_filters.html:66
 msgid "Serial number greater than or equal to"
 msgstr ""
 
-#: templates/js/table_filters.html:42
+#: templates/js/table_filters.html:26 templates/js/table_filters.html:69
 msgid "Serial number LTE"
 msgstr ""
 
-#: templates/js/table_filters.html:43
+#: templates/js/table_filters.html:27 templates/js/table_filters.html:70
 msgid "Serial number less than or equal to"
 msgstr ""
 
-#: templates/js/table_filters.html:72
+#: templates/js/table_filters.html:38
+msgid "Show items which are in stock"
+msgstr ""
+
+#: templates/js/table_filters.html:42
+msgid "Include sublocations"
+msgstr ""
+
+#: templates/js/table_filters.html:43
+msgid "Include stock in sublocations"
+msgstr ""
+
+#: templates/js/table_filters.html:47
+msgid "Active parts"
+msgstr ""
+
+#: templates/js/table_filters.html:48
+msgid "Show stock for active parts"
+msgstr ""
+
+#: templates/js/table_filters.html:52 templates/js/table_filters.html:53
+msgid "Stock status"
+msgstr ""
+
+#: templates/js/table_filters.html:57
+msgid "Is allocated"
+msgstr ""
+
+#: templates/js/table_filters.html:58
+msgid "Item has been alloacted"
+msgstr ""
+
+#: templates/js/table_filters.html:99
 msgid "Build status"
 msgstr ""
 
-#: templates/js/table_filters.html:84 templates/js/table_filters.html:97
+#: templates/js/table_filters.html:111 templates/js/table_filters.html:124
 msgid "Order status"
 msgstr ""
 
-#: templates/js/table_filters.html:89 templates/js/table_filters.html:102
+#: templates/js/table_filters.html:116 templates/js/table_filters.html:129
 msgid "Outstanding"
 msgstr ""
 
-#: templates/js/table_filters.html:112
+#: templates/js/table_filters.html:139
 msgid "Include subcategories"
 msgstr ""
 
-#: templates/js/table_filters.html:113
+#: templates/js/table_filters.html:140
 msgid "Include parts in subcategories"
 msgstr ""
 
-#: templates/js/table_filters.html:118
+#: templates/js/table_filters.html:145
 msgid "Show active parts"
 msgstr ""
 
-#: templates/js/table_filters.html:126
+#: templates/js/table_filters.html:153
 msgid "Stock available"
 msgstr ""
 
-#: templates/js/table_filters.html:142
+#: templates/js/table_filters.html:169
 msgid "Starred"
 msgstr ""
 
-#: templates/js/table_filters.html:154
+#: templates/js/table_filters.html:181
 msgid "Purchasable"
 msgstr ""