From b91097c3ef9cd69814c908a3849db05447ebc552 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 7 Aug 2021 12:29:03 +0000
Subject: [PATCH] updated translation base
---
InvenTree/locale/de/LC_MESSAGES/django.po | 141 +++++++++++++--------
InvenTree/locale/el/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/en/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/es/LC_MESSAGES/django.po | 139 +++++++++++++--------
InvenTree/locale/fr/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/he/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/id/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/it/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/ja/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/ko/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/nl/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/no/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/pl/LC_MESSAGES/django.po | 143 ++++++++++++++--------
InvenTree/locale/ru/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/sv/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/th/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/tr/LC_MESSAGES/django.po | 143 ++++++++++++++--------
InvenTree/locale/vi/LC_MESSAGES/django.po | 137 +++++++++++++--------
InvenTree/locale/zh/LC_MESSAGES/django.po | 137 +++++++++++++--------
19 files changed, 1617 insertions(+), 1004 deletions(-)
diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index 66aead7dea..db1f760f23 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: German\n"
@@ -68,36 +68,36 @@ msgstr "Neues Passwort bestätigen"
msgid "Select Category"
msgstr "Kategorie auswählen"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr "Doppelte Seriennummer: {n}"
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "Keine gültige Menge"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr "Keine Seriennummer angegeben"
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Ungültige Gruppe: {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr "Doppelte Seriennummer: {g}"
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Keine Seriennummern gefunden"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr "Anzahl der eindeutigen Seriennummern ({s}) muss mit der Anzahl ({q}) übereinstimmen"
@@ -118,8 +118,8 @@ msgstr "Kommentar"
msgid "File comment"
msgstr "Datei-Kommentar"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr "Zieldatum für Bauauftrag-Fertigstellung."
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr "Bauauftrag"
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr "Bauaufträge"
@@ -1556,7 +1556,7 @@ msgstr "{name.title()} Datei"
msgid "Select {name} file to upload"
msgstr "{name} Datei zum Hochladen auswählen"
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr "Einstellungs-Schlüssel (muss einzigartig sein, Groß-/ Kleinschreibung wird nicht beachtet)"
@@ -2059,27 +2059,47 @@ msgid "Show overdue SOs on the homepage"
msgstr "Überfällige SOs auf der Startseite anzeigen"
#: common/models.py:930
+#, fuzzy
+#| msgid "View list display"
+msgid "Inline label display"
+msgstr "Listenansicht anzeigen"
+
+#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+#, fuzzy
+#| msgid "View list display"
+msgid "Inline report display"
+msgstr "Listenansicht anzeigen"
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
msgid "Search Preview Results"
msgstr "Anzahl Suchergebnisse"
-#: common/models.py:931
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr "Anzahl der Ergebnisse, die in der Vorschau angezeigt werden sollen"
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr "Preisstaffelungs Anzahl"
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr "Preis"
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr "Stückpreis für die angegebene Anzahl"
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr "Standard"
@@ -2523,8 +2543,8 @@ msgstr "Zulieferer-Bestand"
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr "Bestellungen"
@@ -2547,8 +2567,8 @@ msgstr "Neue Bestellung"
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr "Aufträge"
@@ -2684,8 +2704,8 @@ msgstr "Herstellerteil-Bestand"
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3499,8 @@ msgstr "Ausstehende Teile für %(order)s - %(desc)s empfangen"
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4010,7 @@ msgstr "Schlüsselworte um die Sichtbarkeit in Suchergebnissen zu verbessern"
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr "Kategorie"
@@ -4181,7 +4201,7 @@ msgid "Parameter Units"
msgstr "Einheit des Parameters"
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr "Parameter Vorlage"
@@ -4193,7 +4213,7 @@ msgstr "Wert"
msgid "Parameter Value"
msgstr "Parameter Wert"
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr "Standard-Wert"
@@ -6230,38 +6250,52 @@ msgstr "Startseite"
msgid "Search"
msgstr "Suche"
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+#, fuzzy
+#| msgid "Label"
+msgid "Labels"
+msgstr "Label"
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+#, fuzzy
+#| msgid "Reporting"
+msgid "Reports"
+msgstr "Berichte"
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr "Einstellungen"
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr "InvenTree-Einstellungen"
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
+#: templates/InvenTree/settings/navbar.html:59
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
msgid "Server"
msgstr "Server"
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
+#: templates/InvenTree/settings/navbar.html:65
+#: templates/InvenTree/settings/navbar.html:67
msgid "Barcodes"
msgstr "Barcodes"
-#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
msgid "Currencies"
msgstr "Währungen"
-#: templates/InvenTree/settings/navbar.html:65
-#: templates/InvenTree/settings/navbar.html:67
+#: templates/InvenTree/settings/navbar.html:77
+#: templates/InvenTree/settings/navbar.html:79
msgid "Reporting"
msgstr "Berichte"
-#: templates/InvenTree/settings/navbar.html:77
-#: templates/InvenTree/settings/navbar.html:79
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr "Kategorien"
@@ -6290,6 +6324,7 @@ msgid "Purchase Order Settings"
msgstr "Bestellungs-Einstellungen"
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr "Berichts-Einstellungen"
@@ -6301,21 +6336,21 @@ msgstr "Kein Wert angegeben"
msgid "Edit setting"
msgstr "Einstellungen ändern"
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr "Keine Kategorie-Parametervorlagen gefunden"
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr "Vorlage bearbeiten"
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr "Vorlage löschen"
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr "Keine Teilparametervorlagen gefunden"
@@ -6396,6 +6431,12 @@ msgstr ""
msgid "Home Page Settings"
msgstr "Startseite-Einstellungen"
+#: templates/InvenTree/settings/user_labels.html:9
+#, fuzzy
+#| msgid "Email Settings"
+msgid "Label Settings"
+msgstr "E-Mail-Einstellungen"
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr "Sucheinstellungen"
diff --git a/InvenTree/locale/el/LC_MESSAGES/django.po b/InvenTree/locale/el/LC_MESSAGES/django.po
index 45c8f3e2a1..12a6928ba3 100644
--- a/InvenTree/locale/el/LC_MESSAGES/django.po
+++ b/InvenTree/locale/el/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Greek\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index ec98c4c0b7..25b70d71f0 100644
--- a/InvenTree/locale/en/LC_MESSAGES/django.po
+++ b/InvenTree/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -69,36 +69,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -119,8 +119,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -523,7 +523,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -661,8 +661,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1557,7 +1557,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2060,27 +2060,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2524,8 +2540,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2548,8 +2564,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2685,8 +2701,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3480,8 +3496,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3991,7 +4007,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4181,7 +4197,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4193,7 +4209,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6230,38 +6246,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6290,6 +6316,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6301,21 +6328,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6394,6 +6421,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 346d985c3b..ccf7e51ab9 100644
--- a/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Spanish\n"
@@ -68,36 +68,36 @@ msgstr "Confirmar contraseña nueva"
msgid "Select Category"
msgstr "Seleccionar Categoría"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "Cantidad proporcionada no válida"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Grupo no válido: un {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Numeros de serie no encontrados"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr "Comentario"
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,50 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+#, fuzzy
+#| msgid "Export"
+msgid "Reports"
+msgstr "Exportar"
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6317,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6329,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6422,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/fr/LC_MESSAGES/django.po b/InvenTree/locale/fr/LC_MESSAGES/django.po
index 157a52c198..bbd8b9bb70 100644
--- a/InvenTree/locale/fr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/fr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: French\n"
@@ -68,36 +68,36 @@ msgstr "Confirmer le nouveau mot de passe"
msgid "Select Category"
msgstr "Sélectionnez une catégorie"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr "Dupliquer le numéro de série: {n}"
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "Quantité fournie invalide"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr "Chaîne de numéro de série vide"
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Groupe invalide : {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr "Numéro de série dupliqué: {g}"
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Aucun numéro de série trouvé"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr "Le nombre de numéros de série uniques ({s}) doit correspondre à la quantité ({q})"
@@ -118,8 +118,8 @@ msgstr "Commentaire"
msgid "File comment"
msgstr "Commentaire du fichier"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr "{name.title()} Fichier"
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4181,7 +4197,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4193,7 +4209,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6230,38 +6246,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6290,6 +6316,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6301,21 +6328,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6394,6 +6421,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/he/LC_MESSAGES/django.po b/InvenTree/locale/he/LC_MESSAGES/django.po
index 8bc3e9c128..6a94e9e30d 100644
--- a/InvenTree/locale/he/LC_MESSAGES/django.po
+++ b/InvenTree/locale/he/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Hebrew\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/id/LC_MESSAGES/django.po b/InvenTree/locale/id/LC_MESSAGES/django.po
index 99149d10a5..1a8d444e48 100644
--- a/InvenTree/locale/id/LC_MESSAGES/django.po
+++ b/InvenTree/locale/id/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Indonesian\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/it/LC_MESSAGES/django.po b/InvenTree/locale/it/LC_MESSAGES/django.po
index 5982240a9f..e93a7b756c 100644
--- a/InvenTree/locale/it/LC_MESSAGES/django.po
+++ b/InvenTree/locale/it/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Italian\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/ja/LC_MESSAGES/django.po b/InvenTree/locale/ja/LC_MESSAGES/django.po
index 360549bef9..b20998c3e3 100644
--- a/InvenTree/locale/ja/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ja/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Japanese\n"
@@ -68,36 +68,36 @@ msgstr "新しいパスワードの確認"
msgid "Select Category"
msgstr "カテゴリの選択"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "数量コードが無効です"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr "シリアル番号は空です"
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "無効なグループ: {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr "重複シリアル: {g}"
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "シリアル番号が見つかりません"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr "コメント:"
msgid "File comment"
msgstr "ファイルコメント"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr "メーカー・パーツの在庫"
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr "%(order)s - %(desc)s の未処理のパーツを受け取
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/ko/LC_MESSAGES/django.po b/InvenTree/locale/ko/LC_MESSAGES/django.po
index f435a15c8d..7a9f31bb6d 100644
--- a/InvenTree/locale/ko/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ko/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Korean\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/nl/LC_MESSAGES/django.po b/InvenTree/locale/nl/LC_MESSAGES/django.po
index 03590e313a..aaac7934bb 100644
--- a/InvenTree/locale/nl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/nl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Dutch\n"
@@ -68,36 +68,36 @@ msgstr "Nieuw wachtwoord bevestigen"
msgid "Select Category"
msgstr "Categorie selecteren"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "Ongeldige hoeveeldheid ingevoerd"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Ongeldige groep: {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Geen serienummers gevonden"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr "Aantal unieke serienummer ({s}) moet overeenkomen met de hoeveelheid ({q})"
@@ -118,8 +118,8 @@ msgstr "Opmerking"
msgid "File comment"
msgstr "Bijlage opmerking"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/no/LC_MESSAGES/django.po b/InvenTree/locale/no/LC_MESSAGES/django.po
index 3915efcf85..b6b6d9a8d4 100644
--- a/InvenTree/locale/no/LC_MESSAGES/django.po
+++ b/InvenTree/locale/no/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Norwegian\n"
@@ -68,36 +68,36 @@ msgstr "Bekreft nytt passord"
msgid "Select Category"
msgstr "Velg kategori"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr "Dupliser serie: {n}"
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "Ugyldig mengde oppgitt"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr "Tom serienummerstreng"
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Ugyldig gruppe: {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr "Dupliser serie: {g}"
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Ingen serienummer funnet"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr "Antall unike serienummer ({s}) må samsvare mengde ({q})"
@@ -118,8 +118,8 @@ msgstr "Kommenter"
msgid "File comment"
msgstr "Kommentar til fil"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/pl/LC_MESSAGES/django.po b/InvenTree/locale/pl/LC_MESSAGES/django.po
index 9e8544aaa7..eb703c6f51 100644
--- a/InvenTree/locale/pl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/pl/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Polish\n"
@@ -68,36 +68,36 @@ msgstr "Potwierdź nowe hasło"
msgid "Select Category"
msgstr "Wybierz kategorię"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr "Powtórzony numer seryjny: {n}"
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "Podano nieprawidłową ilość"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr "Pusty ciąg numeru seryjnego"
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Nieprawidłowa grupa: {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr "Powtórzony numer seryjny: {g}"
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Nie znaleziono numerów seryjnych"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr "Ilość numerów seryjnych ({s}) musi odpowiadać ilości ({q})"
@@ -118,8 +118,8 @@ msgstr "Komentarz"
msgid "File comment"
msgstr "Komentarz pliku"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr "Zlecenie Budowy"
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr "Zlecenia budowy"
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr "Cena"
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr "Domyślny"
@@ -2523,8 +2539,8 @@ msgstr "Zapasy dostawcy"
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr "Kategoria"
@@ -4181,7 +4197,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4193,7 +4209,7 @@ msgstr "Dane"
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr "Wartość domyślna"
@@ -6230,38 +6246,52 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+#, fuzzy
+#| msgid "Label"
+msgid "Labels"
+msgstr "Etykieta"
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+#, fuzzy
+#| msgid "Test Reports"
+msgid "Reports"
+msgstr "Raporty testów"
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6290,6 +6320,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6301,21 +6332,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6394,6 +6425,12 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+#, fuzzy
+#| msgid "Change Setting"
+msgid "Label Settings"
+msgstr "Zmień ustawienie"
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/ru/LC_MESSAGES/django.po b/InvenTree/locale/ru/LC_MESSAGES/django.po
index 4fceb98c3b..9e8dda0bd6 100644
--- a/InvenTree/locale/ru/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ru/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Russian\n"
@@ -68,36 +68,36 @@ msgstr "Подтвердите новый пароль"
msgid "Select Category"
msgstr "Выбрать категорию"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr "Дублировать серийный номер: {n}"
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "недопустимое количество"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr "Пустая строка серийного номера"
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Некорректный идентификатор группы {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr "Повторяющийся серийный {g}"
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Серийных номеров не найдено"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr "Число уникальных серийных номеров ({s}) должно соответствовать количеству ({q})"
@@ -118,8 +118,8 @@ msgstr "Комментарий"
msgid "File comment"
msgstr "Комментарий к файлу"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr "Целевая дата для сборки. Сборка будет п
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr "Порядок сборки"
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr "Порядок сборки"
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4181,7 +4197,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4193,7 +4209,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6230,38 +6246,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6290,6 +6316,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6301,21 +6328,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6394,6 +6421,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/sv/LC_MESSAGES/django.po b/InvenTree/locale/sv/LC_MESSAGES/django.po
index 29367e52f4..0b0d0d918b 100644
--- a/InvenTree/locale/sv/LC_MESSAGES/django.po
+++ b/InvenTree/locale/sv/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Swedish\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/th/LC_MESSAGES/django.po b/InvenTree/locale/th/LC_MESSAGES/django.po
index 3dec4cbc8e..7369977671 100644
--- a/InvenTree/locale/th/LC_MESSAGES/django.po
+++ b/InvenTree/locale/th/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Thai\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/tr/LC_MESSAGES/django.po b/InvenTree/locale/tr/LC_MESSAGES/django.po
index e0f7153b18..76542a3983 100644
--- a/InvenTree/locale/tr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/tr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Turkish\n"
@@ -68,36 +68,36 @@ msgstr "Yeni parolayı doğrulayın"
msgid "Select Category"
msgstr "Kategori Seçin"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr "Tekrarlanan seri {n}"
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr "Geçersiz veri sağlandı"
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr "Boş seri numarası dizesi"
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr "Geçersiz grup: {g}"
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr "Tekrarlanan seri {g}"
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "Seri numarası bulunamadı"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr "Benzersiz seri numaralarının sayısı ({s}) girilen miktarla eşleşmeli ({q})"
@@ -118,8 +118,8 @@ msgstr "Yorum"
msgid "File comment"
msgstr "Dosya yorumu"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr "Yapım işinin tamamlanması için hedef tarih. Bu tarihten sonra yapım
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr "Yapım İşi Emri"
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr "Yapım İşi Emirleri"
@@ -1556,7 +1556,7 @@ msgstr "{name.title()} Dosya"
msgid "Select {name} file to upload"
msgstr "{name} dosyasını yüklemek için seçin"
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr "Fiyat"
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr "Varsayılan"
@@ -2523,8 +2539,8 @@ msgstr "Tedarikçi Stoku"
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr "Satın Alma Emirleri"
@@ -2547,8 +2563,8 @@ msgstr "Yeni Satın Alma Emri"
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr "Satış Emirleri"
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4181,7 +4197,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr "Parametre Şablonu"
@@ -4193,7 +4209,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6230,38 +6246,52 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+#, fuzzy
+#| msgid "Label"
+msgid "Labels"
+msgstr "Etiket"
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+#, fuzzy
+#| msgid "Test Reports"
+msgid "Reports"
+msgstr "Test Raporları"
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6290,6 +6320,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6301,21 +6332,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr "Kategori parametre şablonu bulunamadı"
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr "Şablonu Düzenle"
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr "Şablonu Sil"
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr "Parça parametre şablonu bulunamadı"
@@ -6394,6 +6425,12 @@ msgstr ""
msgid "Home Page Settings"
msgstr "Ana Sayfa Ayarları"
+#: templates/InvenTree/settings/user_labels.html:9
+#, fuzzy
+#| msgid "Language Settings"
+msgid "Label Settings"
+msgstr "Dil Ayarları"
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr "Arama Ayarları"
diff --git a/InvenTree/locale/vi/LC_MESSAGES/django.po b/InvenTree/locale/vi/LC_MESSAGES/django.po
index 5538569e94..db2fb6325e 100644
--- a/InvenTree/locale/vi/LC_MESSAGES/django.po
+++ b/InvenTree/locale/vi/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Vietnamese\n"
@@ -68,36 +68,36 @@ msgstr ""
msgid "Select Category"
msgstr ""
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr ""
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr ""
msgid "File comment"
msgstr ""
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""
diff --git a/InvenTree/locale/zh/LC_MESSAGES/django.po b/InvenTree/locale/zh/LC_MESSAGES/django.po
index 8334998cc3..e89761d69e 100644
--- a/InvenTree/locale/zh/LC_MESSAGES/django.po
+++ b/InvenTree/locale/zh/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: inventree\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-08-07 12:01+0000\n"
+"POT-Creation-Date: 2021-08-07 12:28+0000\n"
"PO-Revision-Date: 2021-08-05 03:29\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
@@ -68,36 +68,36 @@ msgstr "确认新密码"
msgid "Select Category"
msgstr "选择分类"
-#: InvenTree/helpers.py:396
+#: InvenTree/helpers.py:401
#, python-brace-format
msgid "Duplicate serial: {n}"
msgstr ""
-#: InvenTree/helpers.py:403 order/models.py:315 order/models.py:425
+#: InvenTree/helpers.py:408 order/models.py:315 order/models.py:425
#: stock/views.py:1363
msgid "Invalid quantity provided"
msgstr ""
-#: InvenTree/helpers.py:406
+#: InvenTree/helpers.py:411
msgid "Empty serial number string"
msgstr ""
-#: InvenTree/helpers.py:428 InvenTree/helpers.py:431 InvenTree/helpers.py:434
-#: InvenTree/helpers.py:459
+#: InvenTree/helpers.py:433 InvenTree/helpers.py:436 InvenTree/helpers.py:439
+#: InvenTree/helpers.py:464
#, python-brace-format
msgid "Invalid group: {g}"
msgstr ""
-#: InvenTree/helpers.py:464
+#: InvenTree/helpers.py:469
#, python-brace-format
msgid "Duplicate serial: {g}"
msgstr ""
-#: InvenTree/helpers.py:472
+#: InvenTree/helpers.py:477
msgid "No serial numbers found"
msgstr "未找到序列号"
-#: InvenTree/helpers.py:476
+#: InvenTree/helpers.py:481
#, python-brace-format
msgid "Number of unique serial number ({s}) must match quantity ({q})"
msgstr ""
@@ -118,8 +118,8 @@ msgstr "注释"
msgid "File comment"
msgstr "文件注释"
-#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:955
-#: common/models.py:956 part/models.py:2035
+#: InvenTree/models.py:70 InvenTree/models.py:71 common/models.py:969
+#: common/models.py:970 part/models.py:2035
#: report/templates/report/inventree_test_report_base.html:91
#: templates/js/translated/stock.js:1537
msgid "User"
@@ -522,7 +522,7 @@ msgstr ""
#: build/templates/build/allocation_card.html:23
#: build/templates/build/auto_allocate.html:17
#: build/templates/build/build_base.html:133
-#: build/templates/build/detail.html:34 common/models.py:984
+#: build/templates/build/detail.html:34 common/models.py:1001
#: company/forms.py:42 company/templates/company/supplier_part.html:226
#: order/forms.py:120 order/forms.py:142 order/forms.py:159 order/models.py:706
#: order/models.py:952 order/templates/order/order_wizard/match_parts.html:30
@@ -660,8 +660,8 @@ msgstr ""
#: order/templates/order/so_navbar.html:22 part/templates/part/navbar.html:42
#: part/templates/part/navbar.html:45 templates/InvenTree/index.html:229
#: templates/InvenTree/search.html:185
-#: templates/InvenTree/settings/navbar.html:89
-#: templates/InvenTree/settings/navbar.html:91 users/models.py:44
+#: templates/InvenTree/settings/navbar.html:101
+#: templates/InvenTree/settings/navbar.html:103 users/models.py:44
msgid "Build Orders"
msgstr ""
@@ -1556,7 +1556,7 @@ msgstr ""
msgid "Select {name} file to upload"
msgstr ""
-#: common/models.py:322 common/models.py:815 common/models.py:948
+#: common/models.py:322 common/models.py:815 common/models.py:962
msgid "Settings key (must be unique - case insensitive"
msgstr ""
@@ -2059,27 +2059,43 @@ msgid "Show overdue SOs on the homepage"
msgstr ""
#: common/models.py:930
-msgid "Search Preview Results"
+msgid "Inline label display"
msgstr ""
#: common/models.py:931
+msgid "Display PDF labels in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:937
+msgid "Inline report display"
+msgstr ""
+
+#: common/models.py:938
+msgid "Display PDF reports in the browser, instead of downloading as a file"
+msgstr ""
+
+#: common/models.py:944
+msgid "Search Preview Results"
+msgstr ""
+
+#: common/models.py:945
msgid "Number of results to show in search preview window"
msgstr ""
-#: common/models.py:985 company/forms.py:43
+#: common/models.py:1002 company/forms.py:43
msgid "Price break quantity"
msgstr ""
-#: common/models.py:992 company/templates/company/supplier_part.html:231
+#: common/models.py:1009 company/templates/company/supplier_part.html:231
#: templates/js/translated/part.js:1143
msgid "Price"
msgstr ""
-#: common/models.py:993
+#: common/models.py:1010
msgid "Unit price at specified quantity"
msgstr ""
-#: common/models.py:1086
+#: common/models.py:1103
msgid "Default"
msgstr ""
@@ -2523,8 +2539,8 @@ msgstr ""
#: part/templates/part/detail.html:50 part/templates/part/navbar.html:71
#: part/templates/part/navbar.html:74 templates/InvenTree/index.html:260
#: templates/InvenTree/search.html:325
-#: templates/InvenTree/settings/navbar.html:95
-#: templates/InvenTree/settings/navbar.html:97 templates/navbar.html:37
+#: templates/InvenTree/settings/navbar.html:107
+#: templates/InvenTree/settings/navbar.html:109 templates/navbar.html:37
#: users/models.py:45
msgid "Purchase Orders"
msgstr ""
@@ -2547,8 +2563,8 @@ msgstr ""
#: part/templates/part/detail.html:71 part/templates/part/navbar.html:79
#: part/templates/part/navbar.html:82 templates/InvenTree/index.html:291
#: templates/InvenTree/search.html:345
-#: templates/InvenTree/settings/navbar.html:101
-#: templates/InvenTree/settings/navbar.html:103 templates/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:113
+#: templates/InvenTree/settings/navbar.html:115 templates/navbar.html:46
#: users/models.py:46
msgid "Sales Orders"
msgstr ""
@@ -2684,8 +2700,8 @@ msgstr ""
#: stock/templates/stock/stock_app_base.html:10
#: templates/InvenTree/index.html:150 templates/InvenTree/search.html:196
#: templates/InvenTree/search.html:232
-#: templates/InvenTree/settings/navbar.html:83
-#: templates/InvenTree/settings/navbar.html:85
+#: templates/InvenTree/settings/navbar.html:95
+#: templates/InvenTree/settings/navbar.html:97
#: templates/js/translated/part.js:391 templates/js/translated/part.js:616
#: templates/js/translated/part.js:776 templates/js/translated/stock.js:121
#: templates/js/translated/stock.js:923 templates/navbar.html:26
@@ -3479,8 +3495,8 @@ msgstr ""
#: part/templates/part/category_navbar.html:21
#: part/templates/part/category_navbar.html:24
#: templates/InvenTree/index.html:102 templates/InvenTree/search.html:114
-#: templates/InvenTree/settings/navbar.html:71
-#: templates/InvenTree/settings/navbar.html:73
+#: templates/InvenTree/settings/navbar.html:83
+#: templates/InvenTree/settings/navbar.html:85
#: templates/js/translated/part.js:977 templates/navbar.html:23
#: templates/stats.html:80 templates/stats.html:89 users/models.py:41
msgid "Parts"
@@ -3990,7 +4006,7 @@ msgstr ""
#: part/models.py:693 part/models.py:2279
#: part/templates/part/set_category.html:15
-#: templates/InvenTree/settings/settings.html:165
+#: templates/InvenTree/settings/settings.html:167
#: templates/js/translated/part.js:763
msgid "Category"
msgstr ""
@@ -4180,7 +4196,7 @@ msgid "Parameter Units"
msgstr ""
#: part/models.py:2236 part/models.py:2285 part/models.py:2286
-#: templates/InvenTree/settings/settings.html:160
+#: templates/InvenTree/settings/settings.html:162
msgid "Parameter Template"
msgstr ""
@@ -4192,7 +4208,7 @@ msgstr ""
msgid "Parameter Value"
msgstr ""
-#: part/models.py:2290 templates/InvenTree/settings/settings.html:169
+#: part/models.py:2290 templates/InvenTree/settings/settings.html:171
msgid "Default Value"
msgstr ""
@@ -6229,38 +6245,48 @@ msgstr ""
msgid "Search"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:34
-#: templates/InvenTree/settings/navbar.html:36
+#: templates/InvenTree/settings/navbar.html:33
+#: templates/InvenTree/settings/navbar.html:35
+msgid "Labels"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:39
+#: templates/InvenTree/settings/navbar.html:41
+msgid "Reports"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:46
+#: templates/InvenTree/settings/navbar.html:48
#: templates/InvenTree/settings/settings.html:8 templates/navbar.html:84
msgid "Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:44
+#: templates/InvenTree/settings/navbar.html:56
msgid "InvenTree Settings"
msgstr ""
-#: templates/InvenTree/settings/navbar.html:47
-#: templates/InvenTree/settings/navbar.html:49 templates/stats.html:9
-msgid "Server"
-msgstr ""
-
-#: templates/InvenTree/settings/navbar.html:53
-#: templates/InvenTree/settings/navbar.html:55
-msgid "Barcodes"
-msgstr ""
-
#: templates/InvenTree/settings/navbar.html:59
-#: templates/InvenTree/settings/navbar.html:61
-msgid "Currencies"
+#: templates/InvenTree/settings/navbar.html:61 templates/stats.html:9
+msgid "Server"
msgstr ""
#: templates/InvenTree/settings/navbar.html:65
#: templates/InvenTree/settings/navbar.html:67
-msgid "Reporting"
+msgid "Barcodes"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:71
+#: templates/InvenTree/settings/navbar.html:73
+msgid "Currencies"
msgstr ""
#: templates/InvenTree/settings/navbar.html:77
#: templates/InvenTree/settings/navbar.html:79
+msgid "Reporting"
+msgstr ""
+
+#: templates/InvenTree/settings/navbar.html:89
+#: templates/InvenTree/settings/navbar.html:91
msgid "Categories"
msgstr ""
@@ -6289,6 +6315,7 @@ msgid "Purchase Order Settings"
msgstr ""
#: templates/InvenTree/settings/report.html:10
+#: templates/InvenTree/settings/user_reports.html:9
msgid "Report Settings"
msgstr ""
@@ -6300,21 +6327,21 @@ msgstr ""
msgid "Edit setting"
msgstr ""
-#: templates/InvenTree/settings/settings.html:150
+#: templates/InvenTree/settings/settings.html:152
msgid "No category parameter templates found"
msgstr ""
-#: templates/InvenTree/settings/settings.html:172
-#: templates/InvenTree/settings/settings.html:269
+#: templates/InvenTree/settings/settings.html:174
+#: templates/InvenTree/settings/settings.html:271
msgid "Edit Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:173
-#: templates/InvenTree/settings/settings.html:270
+#: templates/InvenTree/settings/settings.html:175
+#: templates/InvenTree/settings/settings.html:272
msgid "Delete Template"
msgstr ""
-#: templates/InvenTree/settings/settings.html:249
+#: templates/InvenTree/settings/settings.html:251
msgid "No part parameter templates found"
msgstr ""
@@ -6393,6 +6420,10 @@ msgstr ""
msgid "Home Page Settings"
msgstr ""
+#: templates/InvenTree/settings/user_labels.html:9
+msgid "Label Settings"
+msgstr ""
+
#: templates/InvenTree/settings/user_search.html:9
msgid "Search Settings"
msgstr ""