diff --git a/InvenTree/InvenTree/urls.py b/InvenTree/InvenTree/urls.py
index 92ea257ce2..c2d0d0f48f 100644
--- a/InvenTree/InvenTree/urls.py
+++ b/InvenTree/InvenTree/urls.py
@@ -76,7 +76,9 @@ settings_urls = [
     url(r'^.*$', SettingsView.as_view(template_name='InvenTree/settings/user.html'), name='settings'),
 ]
 
+# Some javascript files are served 'dynamically', allowing them to pass through the Django translation layer
 dynamic_javascript_urls = [
+    url(r'^barcode.js', DynamicJsView.as_view(template_name='js/barcode.html'), name='barcode.js'),
     url(r'^part.js', DynamicJsView.as_view(template_name='js/part.html'), name='part.js'),
     url(r'^stock.js', DynamicJsView.as_view(template_name='js/stock.html'), name='stock.js'),
     url(r'^build.js', DynamicJsView.as_view(template_name='js/build.html'), name='build.js'),
diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index 2d5cb5b980..18a24b1387 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:13+0000\n"
+"POT-Creation-Date: 2020-06-12 00:43+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"
@@ -361,7 +361,7 @@ msgstr "Chargennummer für diese Bau-Ausgabe"
 #: 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
-#: stock/models.py:368 stock/templates/stock/item_base.html:229
+#: stock/models.py:368 stock/templates/stock/item_base.html:230
 msgid "External Link"
 msgstr "Externer Link"
 
@@ -442,7 +442,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:188
+#: stock/templates/stock/item_base.html:189
 msgid "Serial Number"
 msgstr "Seriennummer"
 
@@ -459,7 +459,7 @@ 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:194
+#: 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
 msgid "Quantity"
@@ -467,7 +467,7 @@ msgstr "Anzahl"
 
 #: build/templates/build/allocate.html:177
 #: build/templates/build/auto_allocate.html:20
-#: stock/templates/stock/item_base.html:170
+#: stock/templates/stock/item_base.html:171
 #: stock/templates/stock/stock_adjust.html:17 templates/js/stock.html:493
 msgid "Location"
 msgstr "Standort"
@@ -549,7 +549,7 @@ msgstr "Keine Lagerobjekt gefunden, die diesem Bau zugewiesen werden können"
 #: build/templates/build/build_base.html:8
 #: build/templates/build/build_base.html:34
 #: build/templates/build/complete.html:6
-#: stock/templates/stock/item_base.html:208 templates/js/build.html:33
+#: stock/templates/stock/item_base.html:209 templates/js/build.html:33
 #: templates/navbar.html:12
 msgid "Build"
 msgstr "Bau"
@@ -569,7 +569,7 @@ 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:261 templates/js/build.html:57
+#: 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
 msgid "Status"
@@ -581,7 +581,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:158 templates/js/order.html:209
+#: stock/templates/stock/item_base.html:159 templates/js/order.html:209
 msgid "Sales Order"
 msgstr "Bestellung"
 
@@ -650,7 +650,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:201 templates/js/stock.html:488
+#: stock/templates/stock/item_base.html:202 templates/js/stock.html:488
 msgid "Batch"
 msgstr "Los"
 
@@ -1004,14 +1004,14 @@ msgstr "Hersteller"
 #: company/templates/company/supplier_part_detail.html:21 order/models.py:148
 #: order/templates/order/order_base.html:74
 #: order/templates/order/order_wizard/select_pos.html:30
-#: stock/templates/stock/item_base.html:236 templates/js/company.html:52
+#: stock/templates/stock/item_base.html:237 templates/js/company.html:52
 #: templates/js/company.html:134 templates/js/order.html:144
 msgid "Supplier"
 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:145
+#: stock/models.py:358 stock/templates/stock/item_base.html:146
 #: templates/js/company.html:44 templates/js/order.html:217
 msgid "Customer"
 msgstr "Kunde"
@@ -1126,7 +1126,7 @@ msgstr "Neuer Auftrag"
 
 #: company/templates/company/supplier_part_base.html:6
 #: company/templates/company/supplier_part_base.html:19 stock/models.py:331
-#: stock/templates/stock/item_base.html:241 templates/js/company.html:150
+#: stock/templates/stock/item_base.html:242 templates/js/company.html:150
 msgid "Supplier Part"
 msgstr "Zulieferer-Teil"
 
@@ -1413,7 +1413,7 @@ msgstr "Position - Notizen"
 
 #: order/models.py:466 order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:23
-#: stock/templates/stock/item_base.html:215 templates/js/order.html:136
+#: stock/templates/stock/item_base.html:216 templates/js/order.html:136
 msgid "Purchase Order"
 msgstr "Kaufvertrag"
 
@@ -2142,14 +2142,14 @@ msgstr "Bestellung"
 #: part/templates/part/allocation.html:45
 #: stock/templates/stock/item_base.html:8
 #: stock/templates/stock/item_base.html:58
-#: stock/templates/stock/item_base.html:223
+#: stock/templates/stock/item_base.html:224
 #: stock/templates/stock/stock_adjust.html:16 templates/js/build.html:106
 #: templates/js/stock.html:623
 msgid "Stock Item"
 msgstr "Lagerobjekt"
 
 #: part/templates/part/allocation.html:20
-#: stock/templates/stock/item_base.html:164
+#: stock/templates/stock/item_base.html:165
 msgid "Build Order"
 msgstr "Bauauftrag"
 
@@ -2567,7 +2567,7 @@ msgstr "Benutzt in"
 msgid "Tracking"
 msgstr "Tracking"
 
-#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:267
+#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:268
 msgid "Tests"
 msgstr ""
 
@@ -2846,7 +2846,7 @@ 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:137
+#: stock/models.py:322 stock/templates/stock/item_base.html:138
 msgid "Base Part"
 msgstr "Basisteil"
 
@@ -3094,115 +3094,116 @@ msgstr "Teil-QR-Code"
 msgid "Print Label"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:82
-msgid "Link Barcode"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:84
+#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:263
+#: templates/js/barcode.html:268
 msgid "Unlink Barcode"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:91
+#: stock/templates/stock/item_base.html:85
+msgid "Link Barcode"
+msgstr ""
+
+#: stock/templates/stock/item_base.html:92
 #, fuzzy
 #| msgid "Confirm stock adjustment"
 msgid "Stock adjustment actions"
 msgstr "Bestands-Anpassung bestätigen"
 
-#: stock/templates/stock/item_base.html:94 templates/stock_table.html:14
+#: stock/templates/stock/item_base.html:95 templates/stock_table.html:14
 msgid "Count stock"
 msgstr "Bestand zählen"
 
-#: stock/templates/stock/item_base.html:95 templates/stock_table.html:12
+#: stock/templates/stock/item_base.html:96 templates/stock_table.html:12
 msgid "Add stock"
 msgstr "Bestand hinzufügen"
 
-#: stock/templates/stock/item_base.html:96 templates/stock_table.html:13
+#: stock/templates/stock/item_base.html:97 templates/stock_table.html:13
 msgid "Remove stock"
 msgstr "Bestand entfernen"
 
-#: stock/templates/stock/item_base.html:98
+#: stock/templates/stock/item_base.html:99
 #, fuzzy
 #| msgid "Order stock"
 msgid "Transfer stock"
 msgstr "Bestand bestellen"
 
-#: stock/templates/stock/item_base.html:104
+#: stock/templates/stock/item_base.html:105
 #, fuzzy
 #| msgid "Stock Locations"
 msgid "Stock actions"
 msgstr "Lagerobjekt-Standorte"
 
-#: stock/templates/stock/item_base.html:107
+#: stock/templates/stock/item_base.html:108
 #, fuzzy
 #| msgid "Serialize Stock"
 msgid "Serialize stock"
 msgstr "Lagerbestand erfassen"
 
-#: stock/templates/stock/item_base.html:110
+#: stock/templates/stock/item_base.html:111
 #, fuzzy
 #| msgid "Item assigned to customer?"
 msgid "Assign to customer"
 msgstr "Ist dieses Objekt einem Kunden zugeteilt?"
 
-#: stock/templates/stock/item_base.html:113
+#: stock/templates/stock/item_base.html:114
 #, fuzzy
 #| msgid "Count stock items"
 msgid "Convert to variant"
 msgstr "Lagerobjekte zählen"
 
-#: stock/templates/stock/item_base.html:115
+#: stock/templates/stock/item_base.html:116
 #, fuzzy
 #| msgid "Count stock items"
 msgid "Duplicate stock item"
 msgstr "Lagerobjekte zählen"
 
-#: stock/templates/stock/item_base.html:116
+#: stock/templates/stock/item_base.html:117
 #, fuzzy
 #| msgid "Edit Stock Item"
 msgid "Edit stock item"
 msgstr "Lagerobjekt bearbeiten"
 
-#: stock/templates/stock/item_base.html:118
+#: stock/templates/stock/item_base.html:119
 #, fuzzy
 #| msgid "Delete Stock Item"
 msgid "Delete stock item"
 msgstr "Lagerobjekt löschen"
 
-#: stock/templates/stock/item_base.html:123
+#: stock/templates/stock/item_base.html:124
 msgid "Generate test report"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:132
+#: stock/templates/stock/item_base.html:133
 msgid "Stock Item Details"
 msgstr "Lagerbestands-Details"
 
-#: stock/templates/stock/item_base.html:152
+#: stock/templates/stock/item_base.html:153
 msgid "Belongs To"
 msgstr "Gehört zu"
 
-#: stock/templates/stock/item_base.html:174
+#: stock/templates/stock/item_base.html:175
 #, fuzzy
 #| msgid "No stock location set"
 msgid "No location set"
 msgstr "Kein Lagerort gesetzt"
 
-#: stock/templates/stock/item_base.html:181
+#: stock/templates/stock/item_base.html:182
 msgid "Unique Identifier"
 msgstr "Eindeutiger Bezeichner"
 
-#: stock/templates/stock/item_base.html:222
+#: stock/templates/stock/item_base.html:223
 msgid "Parent Item"
 msgstr "Elternposition"
 
-#: stock/templates/stock/item_base.html:247
+#: stock/templates/stock/item_base.html:248
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: stock/templates/stock/item_base.html:252
+#: stock/templates/stock/item_base.html:253
 msgid "Last Stocktake"
 msgstr "Letzte Inventur"
 
-#: stock/templates/stock/item_base.html:256
+#: stock/templates/stock/item_base.html:257
 msgid "No stocktake performed"
 msgstr "Keine Inventur ausgeführt"
 
@@ -3602,6 +3603,49 @@ msgstr ""
 msgid "Delete attachment"
 msgstr "Anhang löschen"
 
+#: templates/js/barcode.html:28
+#, fuzzy
+#| msgid "No barcode data provided"
+msgid "Scan barcode data here using wedge scanner"
+msgstr "Keine Strichcodedaten bereitgestellt"
+
+#: templates/js/barcode.html:34
+#, fuzzy
+#| msgid "Source Location"
+msgid "Barcode"
+msgstr "Quell-Standort"
+
+#: templates/js/barcode.html:42
+#, fuzzy
+#| msgid "No barcode data provided"
+msgid "Enter barcode data"
+msgstr "Keine Strichcodedaten bereitgestellt"
+
+#: templates/js/barcode.html:140
+#, 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
+#, 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:265
+msgid ""
+"This will remove the association between this stock item and the barcode"
+msgstr ""
+
+#: templates/js/barcode.html:271
+msgid "Unlink"
+msgstr ""
+
 #: templates/js/bom.html:143
 msgid "Open subassembly"
 msgstr "Unterbaugruppe öffnen"
@@ -3745,8 +3789,10 @@ msgid "NO RESULT"
 msgstr ""
 
 #: templates/js/stock.html:58
+#, fuzzy
+#| msgid "Edit Sales Order"
 msgid "Add test result"
-msgstr ""
+msgstr "Auftrag bearbeiten"
 
 #: templates/js/stock.html:76
 #, fuzzy
@@ -3928,18 +3974,12 @@ msgstr "Bestand bestellen"
 msgid "Delete Stock"
 msgstr "Bestand löschen"
 
-#~ msgid "No barcode data provided"
-#~ msgstr "Keine Strichcodedaten bereitgestellt"
-
 #~ msgid "Barcode successfully decoded"
 #~ msgstr "Strichcode erfolgreich dekodiert"
 
 #~ msgid "Barcode plugin returned incorrect response"
 #~ msgstr "Ungültige Antwort vom Strichcode-Plugin"
 
-#~ msgid "Unknown barcode format"
-#~ msgstr "Unbekanntes Strichcode-Format"
-
 #~ msgid "Part does not exist"
 #~ msgstr "Teil existiert nicht"
 
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index 70f1e96161..c539fbcae5 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:13+0000\n"
+"POT-Creation-Date: 2020-06-12 00:43+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"
@@ -342,7 +342,7 @@ msgstr ""
 #: 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
-#: stock/models.py:368 stock/templates/stock/item_base.html:229
+#: stock/models.py:368 stock/templates/stock/item_base.html:230
 msgid "External Link"
 msgstr ""
 
@@ -422,7 +422,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:188
+#: stock/templates/stock/item_base.html:189
 msgid "Serial Number"
 msgstr ""
 
@@ -439,7 +439,7 @@ 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:194
+#: 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
 msgid "Quantity"
@@ -447,7 +447,7 @@ msgstr ""
 
 #: build/templates/build/allocate.html:177
 #: build/templates/build/auto_allocate.html:20
-#: stock/templates/stock/item_base.html:170
+#: stock/templates/stock/item_base.html:171
 #: stock/templates/stock/stock_adjust.html:17 templates/js/stock.html:493
 msgid "Location"
 msgstr ""
@@ -528,7 +528,7 @@ msgstr ""
 #: build/templates/build/build_base.html:8
 #: build/templates/build/build_base.html:34
 #: build/templates/build/complete.html:6
-#: stock/templates/stock/item_base.html:208 templates/js/build.html:33
+#: stock/templates/stock/item_base.html:209 templates/js/build.html:33
 #: templates/navbar.html:12
 msgid "Build"
 msgstr ""
@@ -548,7 +548,7 @@ 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:261 templates/js/build.html:57
+#: 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
 msgid "Status"
@@ -560,7 +560,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:158 templates/js/order.html:209
+#: stock/templates/stock/item_base.html:159 templates/js/order.html:209
 msgid "Sales Order"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgid "Stock can be taken from any available location."
 msgstr ""
 
 #: build/templates/build/detail.html:48
-#: stock/templates/stock/item_base.html:201 templates/js/stock.html:488
+#: stock/templates/stock/item_base.html:202 templates/js/stock.html:488
 msgid "Batch"
 msgstr ""
 
@@ -974,14 +974,14 @@ msgstr ""
 #: company/templates/company/supplier_part_detail.html:21 order/models.py:148
 #: order/templates/order/order_base.html:74
 #: order/templates/order/order_wizard/select_pos.html:30
-#: stock/templates/stock/item_base.html:236 templates/js/company.html:52
+#: stock/templates/stock/item_base.html:237 templates/js/company.html:52
 #: templates/js/company.html:134 templates/js/order.html:144
 msgid "Supplier"
 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:145
+#: stock/models.py:358 stock/templates/stock/item_base.html:146
 #: templates/js/company.html:44 templates/js/order.html:217
 msgid "Customer"
 msgstr ""
@@ -1095,7 +1095,7 @@ msgstr ""
 
 #: company/templates/company/supplier_part_base.html:6
 #: company/templates/company/supplier_part_base.html:19 stock/models.py:331
-#: stock/templates/stock/item_base.html:241 templates/js/company.html:150
+#: stock/templates/stock/item_base.html:242 templates/js/company.html:150
 msgid "Supplier Part"
 msgstr ""
 
@@ -1378,7 +1378,7 @@ msgstr ""
 
 #: order/models.py:466 order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:23
-#: stock/templates/stock/item_base.html:215 templates/js/order.html:136
+#: stock/templates/stock/item_base.html:216 templates/js/order.html:136
 msgid "Purchase Order"
 msgstr ""
 
@@ -2076,14 +2076,14 @@ msgstr ""
 #: part/templates/part/allocation.html:45
 #: stock/templates/stock/item_base.html:8
 #: stock/templates/stock/item_base.html:58
-#: stock/templates/stock/item_base.html:223
+#: stock/templates/stock/item_base.html:224
 #: stock/templates/stock/stock_adjust.html:16 templates/js/build.html:106
 #: templates/js/stock.html:623
 msgid "Stock Item"
 msgstr ""
 
 #: part/templates/part/allocation.html:20
-#: stock/templates/stock/item_base.html:164
+#: stock/templates/stock/item_base.html:165
 msgid "Build Order"
 msgstr ""
 
@@ -2477,7 +2477,7 @@ msgstr ""
 msgid "Tracking"
 msgstr ""
 
-#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:267
+#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:268
 msgid "Tests"
 msgstr ""
 
@@ -2739,7 +2739,7 @@ msgstr ""
 msgid "Parent Stock Item"
 msgstr ""
 
-#: stock/models.py:322 stock/templates/stock/item_base.html:137
+#: stock/models.py:322 stock/templates/stock/item_base.html:138
 msgid "Base Part"
 msgstr ""
 
@@ -2957,95 +2957,96 @@ msgstr ""
 msgid "Print Label"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:82
-msgid "Link Barcode"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:84
+#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:263
+#: templates/js/barcode.html:268
 msgid "Unlink Barcode"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:91
+#: stock/templates/stock/item_base.html:85
+msgid "Link Barcode"
+msgstr ""
+
+#: stock/templates/stock/item_base.html:92
 msgid "Stock adjustment actions"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:94 templates/stock_table.html:14
+#: stock/templates/stock/item_base.html:95 templates/stock_table.html:14
 msgid "Count stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:95 templates/stock_table.html:12
+#: stock/templates/stock/item_base.html:96 templates/stock_table.html:12
 msgid "Add stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:96 templates/stock_table.html:13
+#: stock/templates/stock/item_base.html:97 templates/stock_table.html:13
 msgid "Remove stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:98
+#: stock/templates/stock/item_base.html:99
 msgid "Transfer stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:104
+#: stock/templates/stock/item_base.html:105
 msgid "Stock actions"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:107
+#: stock/templates/stock/item_base.html:108
 msgid "Serialize stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:110
+#: stock/templates/stock/item_base.html:111
 msgid "Assign to customer"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:113
+#: stock/templates/stock/item_base.html:114
 msgid "Convert to variant"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:115
+#: stock/templates/stock/item_base.html:116
 msgid "Duplicate stock item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:116
+#: stock/templates/stock/item_base.html:117
 msgid "Edit stock item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:118
+#: stock/templates/stock/item_base.html:119
 msgid "Delete stock item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:123
+#: stock/templates/stock/item_base.html:124
 msgid "Generate test report"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:132
+#: stock/templates/stock/item_base.html:133
 msgid "Stock Item Details"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:152
+#: stock/templates/stock/item_base.html:153
 msgid "Belongs To"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:174
+#: stock/templates/stock/item_base.html:175
 msgid "No location set"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:181
+#: stock/templates/stock/item_base.html:182
 msgid "Unique Identifier"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:222
+#: stock/templates/stock/item_base.html:223
 msgid "Parent Item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:247
+#: stock/templates/stock/item_base.html:248
 msgid "Last Updated"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:252
+#: stock/templates/stock/item_base.html:253
 msgid "Last Stocktake"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:256
+#: stock/templates/stock/item_base.html:257
 msgid "No stocktake performed"
 msgstr ""
 
@@ -3415,6 +3416,39 @@ msgstr ""
 msgid "Delete attachment"
 msgstr ""
 
+#: templates/js/barcode.html:28
+msgid "Scan barcode data here using wedge scanner"
+msgstr ""
+
+#: templates/js/barcode.html:34
+msgid "Barcode"
+msgstr ""
+
+#: templates/js/barcode.html:42
+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
+msgid "Invalid server response"
+msgstr ""
+
+#: templates/js/barcode.html:265
+msgid ""
+"This will remove the association between this stock item and the barcode"
+msgstr ""
+
+#: templates/js/barcode.html:271
+msgid "Unlink"
+msgstr ""
+
 #: templates/js/bom.html:143
 msgid "Open subassembly"
 msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 70f1e96161..c539fbcae5 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:13+0000\n"
+"POT-Creation-Date: 2020-06-12 00:43+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"
@@ -342,7 +342,7 @@ msgstr ""
 #: 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
-#: stock/models.py:368 stock/templates/stock/item_base.html:229
+#: stock/models.py:368 stock/templates/stock/item_base.html:230
 msgid "External Link"
 msgstr ""
 
@@ -422,7 +422,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:188
+#: stock/templates/stock/item_base.html:189
 msgid "Serial Number"
 msgstr ""
 
@@ -439,7 +439,7 @@ 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:194
+#: 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
 msgid "Quantity"
@@ -447,7 +447,7 @@ msgstr ""
 
 #: build/templates/build/allocate.html:177
 #: build/templates/build/auto_allocate.html:20
-#: stock/templates/stock/item_base.html:170
+#: stock/templates/stock/item_base.html:171
 #: stock/templates/stock/stock_adjust.html:17 templates/js/stock.html:493
 msgid "Location"
 msgstr ""
@@ -528,7 +528,7 @@ msgstr ""
 #: build/templates/build/build_base.html:8
 #: build/templates/build/build_base.html:34
 #: build/templates/build/complete.html:6
-#: stock/templates/stock/item_base.html:208 templates/js/build.html:33
+#: stock/templates/stock/item_base.html:209 templates/js/build.html:33
 #: templates/navbar.html:12
 msgid "Build"
 msgstr ""
@@ -548,7 +548,7 @@ 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:261 templates/js/build.html:57
+#: 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
 msgid "Status"
@@ -560,7 +560,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:158 templates/js/order.html:209
+#: stock/templates/stock/item_base.html:159 templates/js/order.html:209
 msgid "Sales Order"
 msgstr ""
 
@@ -627,7 +627,7 @@ msgid "Stock can be taken from any available location."
 msgstr ""
 
 #: build/templates/build/detail.html:48
-#: stock/templates/stock/item_base.html:201 templates/js/stock.html:488
+#: stock/templates/stock/item_base.html:202 templates/js/stock.html:488
 msgid "Batch"
 msgstr ""
 
@@ -974,14 +974,14 @@ msgstr ""
 #: company/templates/company/supplier_part_detail.html:21 order/models.py:148
 #: order/templates/order/order_base.html:74
 #: order/templates/order/order_wizard/select_pos.html:30
-#: stock/templates/stock/item_base.html:236 templates/js/company.html:52
+#: stock/templates/stock/item_base.html:237 templates/js/company.html:52
 #: templates/js/company.html:134 templates/js/order.html:144
 msgid "Supplier"
 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:145
+#: stock/models.py:358 stock/templates/stock/item_base.html:146
 #: templates/js/company.html:44 templates/js/order.html:217
 msgid "Customer"
 msgstr ""
@@ -1095,7 +1095,7 @@ msgstr ""
 
 #: company/templates/company/supplier_part_base.html:6
 #: company/templates/company/supplier_part_base.html:19 stock/models.py:331
-#: stock/templates/stock/item_base.html:241 templates/js/company.html:150
+#: stock/templates/stock/item_base.html:242 templates/js/company.html:150
 msgid "Supplier Part"
 msgstr ""
 
@@ -1378,7 +1378,7 @@ msgstr ""
 
 #: order/models.py:466 order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:23
-#: stock/templates/stock/item_base.html:215 templates/js/order.html:136
+#: stock/templates/stock/item_base.html:216 templates/js/order.html:136
 msgid "Purchase Order"
 msgstr ""
 
@@ -2076,14 +2076,14 @@ msgstr ""
 #: part/templates/part/allocation.html:45
 #: stock/templates/stock/item_base.html:8
 #: stock/templates/stock/item_base.html:58
-#: stock/templates/stock/item_base.html:223
+#: stock/templates/stock/item_base.html:224
 #: stock/templates/stock/stock_adjust.html:16 templates/js/build.html:106
 #: templates/js/stock.html:623
 msgid "Stock Item"
 msgstr ""
 
 #: part/templates/part/allocation.html:20
-#: stock/templates/stock/item_base.html:164
+#: stock/templates/stock/item_base.html:165
 msgid "Build Order"
 msgstr ""
 
@@ -2477,7 +2477,7 @@ msgstr ""
 msgid "Tracking"
 msgstr ""
 
-#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:267
+#: part/templates/part/tabs.html:64 stock/templates/stock/item_base.html:268
 msgid "Tests"
 msgstr ""
 
@@ -2739,7 +2739,7 @@ msgstr ""
 msgid "Parent Stock Item"
 msgstr ""
 
-#: stock/models.py:322 stock/templates/stock/item_base.html:137
+#: stock/models.py:322 stock/templates/stock/item_base.html:138
 msgid "Base Part"
 msgstr ""
 
@@ -2957,95 +2957,96 @@ msgstr ""
 msgid "Print Label"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:82
-msgid "Link Barcode"
-msgstr ""
-
-#: stock/templates/stock/item_base.html:84
+#: stock/templates/stock/item_base.html:83 templates/js/barcode.html:263
+#: templates/js/barcode.html:268
 msgid "Unlink Barcode"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:91
+#: stock/templates/stock/item_base.html:85
+msgid "Link Barcode"
+msgstr ""
+
+#: stock/templates/stock/item_base.html:92
 msgid "Stock adjustment actions"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:94 templates/stock_table.html:14
+#: stock/templates/stock/item_base.html:95 templates/stock_table.html:14
 msgid "Count stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:95 templates/stock_table.html:12
+#: stock/templates/stock/item_base.html:96 templates/stock_table.html:12
 msgid "Add stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:96 templates/stock_table.html:13
+#: stock/templates/stock/item_base.html:97 templates/stock_table.html:13
 msgid "Remove stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:98
+#: stock/templates/stock/item_base.html:99
 msgid "Transfer stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:104
+#: stock/templates/stock/item_base.html:105
 msgid "Stock actions"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:107
+#: stock/templates/stock/item_base.html:108
 msgid "Serialize stock"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:110
+#: stock/templates/stock/item_base.html:111
 msgid "Assign to customer"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:113
+#: stock/templates/stock/item_base.html:114
 msgid "Convert to variant"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:115
+#: stock/templates/stock/item_base.html:116
 msgid "Duplicate stock item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:116
+#: stock/templates/stock/item_base.html:117
 msgid "Edit stock item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:118
+#: stock/templates/stock/item_base.html:119
 msgid "Delete stock item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:123
+#: stock/templates/stock/item_base.html:124
 msgid "Generate test report"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:132
+#: stock/templates/stock/item_base.html:133
 msgid "Stock Item Details"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:152
+#: stock/templates/stock/item_base.html:153
 msgid "Belongs To"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:174
+#: stock/templates/stock/item_base.html:175
 msgid "No location set"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:181
+#: stock/templates/stock/item_base.html:182
 msgid "Unique Identifier"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:222
+#: stock/templates/stock/item_base.html:223
 msgid "Parent Item"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:247
+#: stock/templates/stock/item_base.html:248
 msgid "Last Updated"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:252
+#: stock/templates/stock/item_base.html:253
 msgid "Last Stocktake"
 msgstr ""
 
-#: stock/templates/stock/item_base.html:256
+#: stock/templates/stock/item_base.html:257
 msgid "No stocktake performed"
 msgstr ""
 
@@ -3415,6 +3416,39 @@ msgstr ""
 msgid "Delete attachment"
 msgstr ""
 
+#: templates/js/barcode.html:28
+msgid "Scan barcode data here using wedge scanner"
+msgstr ""
+
+#: templates/js/barcode.html:34
+msgid "Barcode"
+msgstr ""
+
+#: templates/js/barcode.html:42
+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
+msgid "Invalid server response"
+msgstr ""
+
+#: templates/js/barcode.html:265
+msgid ""
+"This will remove the association between this stock item and the barcode"
+msgstr ""
+
+#: templates/js/barcode.html:271
+msgid "Unlink"
+msgstr ""
+
 #: templates/js/bom.html:143
 msgid "Open subassembly"
 msgstr ""
diff --git a/InvenTree/templates/base.html b/InvenTree/templates/base.html
index 376ca98c7b..1c869a8ca4 100644
--- a/InvenTree/templates/base.html
+++ b/InvenTree/templates/base.html
@@ -107,8 +107,8 @@ InvenTree
 <script type='text/javascript' src="{% static 'script/inventree/modals.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/inventree/notification.js' %}"></script>
 <script type='text/javascript' src="{% static 'script/inventree/sidenav.js' %}"></script>
-<script type='text/javascript' src="{% static 'script/inventree/barcode.js' %}"></script>
 
+<script type='text/javascript' src="{% url 'barcode.js' %}"></script>
 <script type='text/javascript' src="{% url 'bom.js' %}"></script>
 <script type='text/javascript' src="{% url 'company.js' %}"></script>
 <script type='text/javascript' src="{% url 'part.js' %}"></script>
diff --git a/InvenTree/InvenTree/static/script/inventree/barcode.js b/InvenTree/templates/js/barcode.html
similarity index 84%
rename from InvenTree/InvenTree/static/script/inventree/barcode.js
rename to InvenTree/templates/js/barcode.html
index 2ccf4a69d9..ced4ebbf7e 100644
--- a/InvenTree/InvenTree/static/script/inventree/barcode.js
+++ b/InvenTree/templates/js/barcode.html
@@ -1,12 +1,10 @@
+{% load i18n %}
 
 /*
  * Pass barcode data to the server.
  */
 function scanBarcode(barcode, options={}) {
 
-    console.log('Sending barcode data:');
-    console.log(barcode);
-
     inventreePut(
         '/api/barcode/',
         {
@@ -27,11 +25,13 @@ function makeBarcodeInput(placeholderText='') {
      * Generate HTML for a barcode input
      */
 
+    placeholderText = placeholderText || '{% trans "Scan barcode data here using wedge scanner" %}';
+
     var html = `
     <div id='barcode-error-message'></div>
     <form class='js-modal-form' method='post'>
     <div class='form-group'>
-        <label class='control-label' for='barcode'>Barcode</label>
+        <label class='control-label' for='barcode'>{% trans "Barcode" %}</label>
         <div class='controls'>
             <div class='input-group'>
                 <span class='input-group-addon'>
@@ -39,7 +39,7 @@ function makeBarcodeInput(placeholderText='') {
                 </span>
                 <input id='barcode' class='textinput textInput form-control' type='text' name='barcode' placeholder='${placeholderText}'>
             </div>
-            <div id='hint_barcode_data' class='help-block'>Enter barcode data</div>
+            <div id='hint_barcode_data' class='help-block'>{% trans "Enter barcode data" %}</div>
         </div>
     </div>
     </form>
@@ -137,7 +137,7 @@ function barcodeDialog(title, options={}) {
         content += options.headerContent;
     }
 
-    content += `<div class='alert alert-info alert-block'>Scan barcode data below</div>`;
+    content += `<div class='alert alert-info alert-block'>{% trans "Scan barcode data below" %}</div>`;
 
     content += makeBarcodeInput();
 
@@ -178,8 +178,6 @@ function barcodeScanDialog() {
                         method: 'POST',
                         success: function(response, status) {
 
-                            console.log(response);
-
                             enableBarcodeInput(modal, true);
 
                             if (status == 'success') {
@@ -194,10 +192,10 @@ function barcodeScanDialog() {
                                 } else if ('error' in response) {
                                     showBarcodeError(modal, response.error, 'warning');
                                 } else {
-                                    showBarcodeError(modal, "Unknown response from server", 'warning');
+                                    showBarcodeError(modal, "{% trans 'Unknown response from server' %}", 'warning');
                                 }
                             } else {
-                                showBarcodeError(modal, `Invalid server response.<br>Status code: '${status}'`);
+                                showBarcodeError(modal, `{% trans "Invalid server response" %}.<br>Status code: '${status}'`);
                             }      
                         },
                     },
@@ -242,11 +240,11 @@ function linkBarcodeDialog(stockitem, options={}) {
                                 } else if ('error' in response) {
                                     showBarcodeError(modal, response.error, 'warning');
                                 } else {
-                                    showBarcodeError(modal, "Unknown response from server", warning);
+                                    showBarcodeError(modal, "{% trans 'Unknown response from server' %}", warning);
                                 }
 
                             } else {
-                                showBarcodeError(modal, `Invalid server response.<br>Status code: '${status}'`);
+                                showBarcodeError(modal, `{% trans "Invalid server response" %}.<br>Status code: '${status}'`);
                             }
                         },
                     },
@@ -262,11 +260,15 @@ function linkBarcodeDialog(stockitem, options={}) {
  */
 function unlinkBarcode(stockitem) {
 
+    var html = `<b>{% trans "Unlink Barcode" %}</b><br>`;
+
+    html += "{% trans 'This will remove the association between this stock item and the barcode' %}";
+
     showQuestionDialog(
-        "Unlink Barcode",
-        "Remove barcode association from this Stock Item",
+        "{% trans 'Unlink Barcode' %}",
+        html,
         {
-            accept_text: "Unlink",
+            accept_text: "{% trans 'Unlink' %}",
             accept: function() {
                 inventreePut(
                     `/api/stock/${stockitem}/`,