diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index 9eeedee291..6e766f620c 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:41\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
@@ -134,7 +134,7 @@ msgstr "Hochladedatum"
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr "Name"
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr "Zieldatum für Bauauftrag-Fertigstellung."
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr "Bauauftragsreferenz"
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr "Bauauftrag, zu dem dieser Bauauftrag zugwiesen ist"
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr "Link zu einer externen URL"
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr "Seriennummer"
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr "Bauauftrag-details"
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr "Anzahl der neusten Teile auf der Startseite"
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr "Vorlage"
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr "Angegebener Wert muss ein Wahrheitswert sein"
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr "Datei hochgeladen"
 
@@ -2149,9 +2151,11 @@ msgstr "Sind Sie sicher, dass Sie die Firma '%(name)s' löschen wollen?"
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
-msgstr "Es gibt %(count)s Teile, die von diesem Unternehmen bezogen werden.<br>\n"
+msgstr ""
+"Es gibt %(count)s Teile, die von diesem Unternehmen bezogen werden.<br>\n"
 "Wenn dieser Lieferant gelöscht wird, werden auch diese Zulieferer-Teile gelöscht."
 
 #: company/templates/company/detail.html:21
@@ -2639,7 +2643,7 @@ msgstr "Label"
 msgid "Label template file"
 msgstr "Label-Vorlage-Datei"
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr "Aktiviert"
 
@@ -2663,7 +2667,7 @@ msgstr "Höhe [mm]"
 msgid "Label height, specified in mm"
 msgstr "Label-Höhe in mm"
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr "Dateinamen-Muster"
 
@@ -2675,8 +2679,8 @@ msgstr "Muster für die Erstellung von Label-Dateinamen"
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr "Abfragefilter (kommagetrennte Liste mit Schlüssel=Wert-Paaren)"
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr "Filter"
 
@@ -2956,7 +2960,7 @@ msgid "Export order to file"
 msgstr "Exportiere Bestellung in Datei"
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr "Bestellungs-Details"
 
@@ -3136,15 +3140,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr "Bestellung für %(name)s auswählen"
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr "Bestellungs-Anhänge"
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr "Sind Sie sicher, dass Sie diese Position löschen möchten?"
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr "BestandsObjekte empfangen"
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr "Empfangene Teile"
@@ -3163,17 +3172,25 @@ msgstr "Position hinzufügen"
 msgid "No line items found"
 msgstr "Keine Positionen gefunden"
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+#, fuzzy
+#| msgid "Total Cost"
+msgid "Total"
+msgstr "Gesamtkosten"
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr "Stück-Preis"
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr "Position bearbeiten"
 
@@ -3284,50 +3301,50 @@ msgstr "Bestands-Zuordnung löschen"
 msgid "No matching line items"
 msgstr "Keine passenden Positionen gefunden"
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr "ID"
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr "Zugeordnet"
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr "Erledigt"
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr "PO"
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr "Seriennummern zuweisen"
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr "Lagerbestand zuweisen"
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr "Lagerbestand kaufen"
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr "Lagerbestand bauen"
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr "Preis berechnen"
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr "Position löschen "
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr "Stückpreis aktualisieren"
 
@@ -3368,10 +3385,6 @@ msgstr "Diese Aktion wird die folgenden BestandsObjekt vom Auftrag entfernen"
 msgid "Sales Order Attachments"
 msgstr "Auftrags-Anhänge"
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr "Sind Sie sicher, dass Sie diese Position löschen möchten?"
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr "Bestellungs-Anhang hinzufügen"
@@ -3821,7 +3834,7 @@ msgstr "Interne Teilenummer"
 msgid "Part revision or version number"
 msgstr "Revisions- oder Versionsnummer"
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr "Revision"
@@ -5067,83 +5080,89 @@ msgstr "Stücklisten-Position bearbeiten"
 msgid "Confim BOM item deletion"
 msgstr "löschen von Stücklisten-Position bestätigen"
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr "Vorlagen Name"
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr "Bericht-Vorlage Datei"
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr "Bericht-Vorlage Beschreibung"
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr "Bericht Revisionsnummer (autom. erhöht)"
 
-#: report/models.py:275
+#: report/models.py:291
+#, fuzzy
+#| msgid "Pattern for generating label filenames"
+msgid "Pattern for generating report filenames"
+msgstr "Muster für die Erstellung von Label-Dateinamen"
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr "Bericht-Vorlage ist ein"
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr "BestandsObjekte-Abfragefilter (kommagetrennte Liste mit Schlüssel=Wert-Paaren)"
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr "einfügen Installiert in Tests"
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr "Test-Ergebnisse für BestandsObjekte in Baugruppen einschließen"
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr "Bauauftrag Filter"
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr "Bau-Abfragefilter (kommagetrennte Liste mit Schlüssel=Wert-Paaren)"
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr "Teil Filter"
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr "Teile-Abfragefilter (kommagetrennte Liste mit Schlüssel=Wert-Paaren)"
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr "Bestellungs-Abfragefilter"
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr "Auftrags-Abfragefilter"
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr "Snippet"
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr "Berichts-Snippet"
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr "Snippet-Beschreibung"
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr "Ressource"
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr "Berichts-Ressource"
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr "Ressource-Beschreibung"
 
@@ -6138,11 +6157,13 @@ msgstr "Farbschemata"
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
-msgstr "\n"
+msgstr ""
+"\n"
 "\t\tDie CSS Datei \"%(invalid_color_theme)s.css\" für das aktuell ausgewählte Farbschema wurde nicht gefunden.<br>\n"
 "\t\tBitte ein anderes Farbschema auswählen:)\n"
 "\t    "
@@ -7595,4 +7616,3 @@ msgstr "Berechtigungen Einträge zu ändern"
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr "Berechtigung Einträge zu löschen"
-
diff --git a/InvenTree/locale/en/LC_MESSAGES/django.po b/InvenTree/locale/en/LC_MESSAGES/django.po
index ab3c93408d..65b6dba7a7 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,7 +135,7 @@ msgstr ""
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -149,8 +149,8 @@ msgstr ""
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -473,7 +473,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -605,7 +605,7 @@ msgstr ""
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -632,7 +632,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -766,10 +766,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -924,7 +924,7 @@ msgstr ""
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1249,7 +1249,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1600,7 +1600,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1844,7 +1844,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2640,7 +2642,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2664,7 +2666,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2676,8 +2678,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2957,7 +2959,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3137,15 +3139,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3164,17 +3171,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3285,50 +3298,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3369,10 +3382,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3822,7 +3831,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5068,83 +5077,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index 6d0f3375c4..281e95392b 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:40\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
@@ -134,7 +134,7 @@ msgstr ""
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr "Nombre"
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr ""
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr "Número de serie"
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2662,7 +2665,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/fr/LC_MESSAGES/django.po b/InvenTree/locale/fr/LC_MESSAGES/django.po
index 97617764a4..58b7faeb04 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:40\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
@@ -134,7 +134,7 @@ msgstr "date de chargement"
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr "Nom"
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr ""
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr ""
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2662,7 +2665,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/it/LC_MESSAGES/django.po b/InvenTree/locale/it/LC_MESSAGES/django.po
index 6caf5cb88d..10a2741a2c 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:40\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
@@ -134,7 +134,7 @@ msgstr ""
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr ""
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr ""
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr ""
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2662,7 +2665,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/ja/LC_MESSAGES/django.po b/InvenTree/locale/ja/LC_MESSAGES/django.po
index f5afd1b0fe..646850d21a 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:41\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
@@ -134,7 +134,7 @@ msgstr ""
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr ""
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr ""
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr ""
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2662,7 +2665,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/pl/LC_MESSAGES/django.po b/InvenTree/locale/pl/LC_MESSAGES/django.po
index 9b4e347ff7..e9b0f02de3 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:40\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
@@ -134,7 +134,7 @@ msgstr "data przesłania"
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr "Nazwa"
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr "Odwołanie do zamówienia wykonania"
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr "Zamówienie budowy, do którego budowa jest przypisana"
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr "Link do zewnętrznego adresu URL"
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr "Numer Seryjny"
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr "Szczegóły zlecenia budowy"
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr "Szablon"
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr "Wyślik plik"
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr "Etykieta"
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr "Aktywne"
 
@@ -2662,7 +2665,7 @@ msgstr "Wysokość [mm]"
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr "Filtry"
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr "Otrzymane elementy"
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr "Cena jednostkowa"
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr "Numer ID"
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr "Przydzielono"
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr "Oblicz cenę"
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr "Wersja"
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/ru/LC_MESSAGES/django.po b/InvenTree/locale/ru/LC_MESSAGES/django.po
index d61e19d068..50f802c05e 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:41\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
@@ -134,7 +134,7 @@ msgstr "дата загрузки"
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr "Название"
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr "Целевая дата для сборки. Сборка будет п
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr "Ссылка на заказ"
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr ""
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2662,7 +2665,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/tr/LC_MESSAGES/django.po b/InvenTree/locale/tr/LC_MESSAGES/django.po
index e30c1ed591..94a091218e 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:41\n"
 "Last-Translator: \n"
 "Language-Team: Turkish\n"
@@ -134,7 +134,7 @@ msgstr "Yükleme tarihi"
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr "Adı"
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr ""
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr ""
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2662,7 +2665,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-
diff --git a/InvenTree/locale/zh/LC_MESSAGES/django.po b/InvenTree/locale/zh/LC_MESSAGES/django.po
index 9892439445..5c89f879fc 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-06-16 22:40+0000\n"
+"POT-Creation-Date: 2021-06-16 23:11+0000\n"
 "PO-Revision-Date: 2021-06-16 22:41\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
@@ -134,7 +134,7 @@ msgstr "上传日期"
 
 #: InvenTree/models.py:107 InvenTree/models.py:108 label/models.py:102
 #: part/models.py:686 part/models.py:2140 part/templates/part/params.html:27
-#: report/models.py:179 templates/InvenTree/search.html:137
+#: report/models.py:180 templates/InvenTree/search.html:137
 #: templates/InvenTree/search.html:289 templates/js/part.js:118
 #: templates/js/part.js:641 templates/js/stock.js:947
 msgid "Name"
@@ -148,8 +148,8 @@ msgstr "名称"
 #: company/templates/company/supplier_part_detail.html:31 label/models.py:109
 #: order/models.py:103 order/templates/order/purchase_order_detail.html:147
 #: part/models.py:710 part/templates/part/detail.html:54
-#: part/templates/part/set_category.html:14 report/models.py:192
-#: report/models.py:505 report/models.py:544
+#: part/templates/part/set_category.html:14 report/models.py:193
+#: report/models.py:530 report/models.py:569
 #: report/templates/report/inventree_build_order_base.html:118
 #: templates/InvenTree/search.html:144 templates/InvenTree/search.html:224
 #: templates/InvenTree/search.html:296
@@ -472,7 +472,7 @@ msgstr ""
 #: order/templates/order/sales_order_detail.html:70
 #: order/templates/order/sales_order_detail.html:77
 #: order/templates/order/sales_order_detail.html:162
-#: order/templates/order/sales_order_detail.html:230 part/forms.py:342
+#: order/templates/order/sales_order_detail.html:234 part/forms.py:342
 #: part/forms.py:372 part/forms.py:388 part/models.py:2270
 #: part/templates/part/allocation.html:19
 #: part/templates/part/allocation.html:53
@@ -604,7 +604,7 @@ msgstr ""
 
 #: build/models.py:128 order/models.py:101 order/models.py:618
 #: order/templates/order/purchase_order_detail.html:174
-#: order/templates/order/sales_order_detail.html:225 part/models.py:2279
+#: order/templates/order/sales_order_detail.html:229 part/models.py:2279
 #: report/templates/report/inventree_po_report.html:92
 #: report/templates/report/inventree_so_report.html:92 templates/js/bom.js:197
 #: templates/js/build.js:575 templates/js/build.js:1018
@@ -631,7 +631,7 @@ msgstr ""
 #: order/templates/order/order_wizard/select_parts.html:30
 #: order/templates/order/purchase_order_detail.html:132
 #: order/templates/order/receive_parts.html:19
-#: order/templates/order/sales_order_detail.html:213 part/models.py:321
+#: order/templates/order/sales_order_detail.html:214 part/models.py:321
 #: part/models.py:1967 part/models.py:1979 part/models.py:1997
 #: part/models.py:2072 part/models.py:2168 part/models.py:2254
 #: part/templates/part/part_app_base.html:8
@@ -765,10 +765,10 @@ msgstr ""
 #: company/models.py:132 company/models.py:498
 #: company/templates/company/navbar.html:70
 #: company/templates/company/navbar.html:73 order/models.py:125
-#: order/models.py:620 order/templates/order/po_navbar.html:29
-#: order/templates/order/po_navbar.html:32
+#: order/models.py:620 order/templates/order/po_navbar.html:38
+#: order/templates/order/po_navbar.html:41
 #: order/templates/order/purchase_order_detail.html:239
-#: order/templates/order/sales_order_detail.html:278
+#: order/templates/order/sales_order_detail.html:309
 #: order/templates/order/so_navbar.html:33
 #: order/templates/order/so_navbar.html:36 part/models.py:871
 #: part/templates/part/navbar.html:134
@@ -923,7 +923,7 @@ msgstr ""
 
 #: build/templates/build/attachments.html:12
 #: build/templates/build/navbar.html:43 build/templates/build/navbar.html:46
-#: order/templates/order/po_navbar.html:26
+#: order/templates/order/po_navbar.html:35
 #: order/templates/order/so_navbar.html:29 part/templates/part/navbar.html:125
 #: part/templates/part/navbar.html:128 stock/templates/stock/navbar.html:47
 #: stock/templates/stock/navbar.html:50
@@ -1248,7 +1248,7 @@ msgstr ""
 
 #: build/templates/build/navbar.html:15
 #: company/templates/company/navbar.html:15
-#: order/templates/order/po_navbar.html:14
+#: order/templates/order/po_navbar.html:15
 #: order/templates/order/so_navbar.html:15 part/templates/part/navbar.html:15
 #: templates/js/stock.js:1019
 msgid "Details"
@@ -1599,7 +1599,7 @@ msgid "Number of recent parts to display on index page"
 msgstr ""
 
 #: common/models.py:153 part/models.py:2170 part/templates/part/detail.html:160
-#: report/models.py:185 stock/forms.py:259 templates/js/table_filters.js:25
+#: report/models.py:186 stock/forms.py:259 templates/js/table_filters.js:25
 #: templates/js/table_filters.js:315
 msgid "Template"
 msgstr ""
@@ -1843,7 +1843,9 @@ msgid "Supplied value must be a boolean"
 msgstr ""
 
 #: common/views.py:184 order/templates/order/order_wizard/po_upload.html:42
-#: order/views.py:582 part/templates/part/bom_upload/upload_file.html:27
+#: order/templates/order/po_navbar.html:19
+#: order/templates/order/po_navbar.html:22 order/views.py:582
+#: part/templates/part/bom_upload/upload_file.html:27
 msgid "Upload File"
 msgstr ""
 
@@ -2149,7 +2151,8 @@ msgstr ""
 
 #: company/templates/company/delete.html:12
 #, python-format
-msgid "There are %(count)s parts sourced from this company.<br>\n"
+msgid ""
+"There are %(count)s parts sourced from this company.<br>\n"
 "If this supplier is deleted, these supplier part entries will also be deleted."
 msgstr ""
 
@@ -2638,7 +2641,7 @@ msgstr ""
 msgid "Label template file"
 msgstr ""
 
-#: label/models.py:124 report/models.py:274
+#: label/models.py:124 report/models.py:297
 msgid "Enabled"
 msgstr ""
 
@@ -2662,7 +2665,7 @@ msgstr ""
 msgid "Label height, specified in mm"
 msgstr ""
 
-#: label/models.py:144
+#: label/models.py:144 report/models.py:290
 msgid "Filename Pattern"
 msgstr ""
 
@@ -2674,8 +2677,8 @@ msgstr ""
 msgid "Query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: label/models.py:245 label/models.py:298 report/models.py:294
-#: report/models.py:415 report/models.py:449
+#: label/models.py:245 label/models.py:298 report/models.py:317
+#: report/models.py:440 report/models.py:474
 msgid "Filters"
 msgstr ""
 
@@ -2955,7 +2958,7 @@ msgid "Export order to file"
 msgstr ""
 
 #: order/templates/order/order_base.html:72
-#: order/templates/order/po_navbar.html:11
+#: order/templates/order/po_navbar.html:12
 msgid "Purchase Order Details"
 msgstr ""
 
@@ -3135,15 +3138,20 @@ msgid "Select a purchase order for %(name)s"
 msgstr ""
 
 #: order/templates/order/po_attachments.html:12
-#: order/templates/order/po_navbar.html:23
+#: order/templates/order/po_navbar.html:32
 msgid "Purchase Order Attachments"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:17
+#: order/templates/order/po_lineitem_delete.html:5
+#: order/templates/order/so_lineitem_delete.html:5
+msgid "Are you sure you wish to delete this line item?"
+msgstr ""
+
+#: order/templates/order/po_navbar.html:26
 msgid "Received Stock Items"
 msgstr ""
 
-#: order/templates/order/po_navbar.html:20
+#: order/templates/order/po_navbar.html:29
 #: order/templates/order/po_received_items.html:12
 msgid "Received Items"
 msgstr ""
@@ -3162,17 +3170,23 @@ msgstr ""
 msgid "No line items found"
 msgstr ""
 
+#: order/templates/order/purchase_order_detail.html:142
+#: order/templates/order/sales_order_detail.html:223
+msgid "Total"
+msgstr ""
+
 #: order/templates/order/purchase_order_detail.html:191
-#: order/templates/order/sales_order_detail.html:235
+#: order/templates/order/sales_order_detail.html:246
 msgid "Unit Price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:198
+#: order/templates/order/sales_order_detail.html:253
 msgid "Total price"
 msgstr ""
 
 #: order/templates/order/purchase_order_detail.html:251
-#: order/templates/order/sales_order_detail.html:328
+#: order/templates/order/sales_order_detail.html:359
 msgid "Edit line item"
 msgstr ""
 
@@ -3283,50 +3297,50 @@ msgstr ""
 msgid "No matching line items"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:205
+#: order/templates/order/sales_order_detail.html:206
 msgid "ID"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:243 templates/js/build.js:589
+#: order/templates/order/sales_order_detail.html:274 templates/js/build.js:589
 #: templates/js/build.js:855
 msgid "Allocated"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:245
+#: order/templates/order/sales_order_detail.html:276
 msgid "Fulfilled"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:282
+#: order/templates/order/sales_order_detail.html:313
 msgid "PO"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:312
+#: order/templates/order/sales_order_detail.html:343
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:315 templates/js/build.js:651
+#: order/templates/order/sales_order_detail.html:346 templates/js/build.js:651
 msgid "Allocate stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:318
+#: order/templates/order/sales_order_detail.html:349
 msgid "Purchase stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:322 templates/js/build.js:644
+#: order/templates/order/sales_order_detail.html:353 templates/js/build.js:644
 #: templates/js/build.js:1062
 msgid "Build stock"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:325
-#: order/templates/order/sales_order_detail.html:434
+#: order/templates/order/sales_order_detail.html:356
+#: order/templates/order/sales_order_detail.html:465
 msgid "Calculate price"
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:329
+#: order/templates/order/sales_order_detail.html:360
 msgid "Delete line item "
 msgstr ""
 
-#: order/templates/order/sales_order_detail.html:440
+#: order/templates/order/sales_order_detail.html:471
 msgid "Update Unit Price"
 msgstr ""
 
@@ -3367,10 +3381,6 @@ msgstr ""
 msgid "Sales Order Attachments"
 msgstr ""
 
-#: order/templates/order/so_lineitem_delete.html:5
-msgid "Are you sure you wish to delete this line item?"
-msgstr ""
-
 #: order/views.py:104
 msgid "Add Purchase Order Attachment"
 msgstr ""
@@ -3820,7 +3830,7 @@ msgstr ""
 msgid "Part revision or version number"
 msgstr ""
 
-#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:198
+#: part/models.py:738 part/templates/part/detail.html:35 report/models.py:199
 #: templates/js/part.js:173
 msgid "Revision"
 msgstr ""
@@ -5066,83 +5076,87 @@ msgstr ""
 msgid "Confim BOM item deletion"
 msgstr ""
 
-#: report/models.py:180
+#: report/models.py:181
 msgid "Template name"
 msgstr ""
 
-#: report/models.py:186
+#: report/models.py:187
 msgid "Report template file"
 msgstr ""
 
-#: report/models.py:193
+#: report/models.py:194
 msgid "Report template description"
 msgstr ""
 
-#: report/models.py:199
+#: report/models.py:200
 msgid "Report revision number (auto-increments)"
 msgstr ""
 
-#: report/models.py:275
+#: report/models.py:291
+msgid "Pattern for generating report filenames"
+msgstr ""
+
+#: report/models.py:298
 msgid "Report template is enabled"
 msgstr ""
 
-#: report/models.py:295
+#: report/models.py:318
 msgid "StockItem query filters (comma-separated list of key=value pairs)"
 msgstr ""
 
-#: report/models.py:303
+#: report/models.py:326
 msgid "Include Installed Tests"
 msgstr ""
 
-#: report/models.py:304
+#: report/models.py:327
 msgid "Include test results for stock items installed inside assembled item"
 msgstr ""
 
-#: report/models.py:347
+#: report/models.py:371
 msgid "Build Filters"
 msgstr ""
 
-#: report/models.py:348
+#: report/models.py:372
 msgid "Build query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:385
+#: report/models.py:410
 msgid "Part Filters"
 msgstr ""
 
-#: report/models.py:386
+#: report/models.py:411
 msgid "Part query filters (comma-separated list of key=value pairs"
 msgstr ""
 
-#: report/models.py:416
+#: report/models.py:441
 msgid "Purchase order query filters"
 msgstr ""
 
-#: report/models.py:450
+#: report/models.py:475
 msgid "Sales order query filters"
 msgstr ""
 
-#: report/models.py:500
+#: report/models.py:525
 msgid "Snippet"
 msgstr ""
 
-#: report/models.py:501
+#: report/models.py:526
 msgid "Report snippet file"
 msgstr ""
 
-#: report/models.py:505
+#: report/models.py:530
 msgid "Snippet file description"
 msgstr ""
 
-#: report/models.py:540
+#: report/models.py:565
 msgid "Asset"
 msgstr ""
 
-#: report/models.py:541
+#: report/models.py:566
 msgid "Report asset file"
 msgstr ""
 
-#: report/models.py:544
+#: report/models.py:569
 msgid "Asset file description"
 msgstr ""
 
@@ -6137,7 +6151,8 @@ msgstr ""
 
 #: templates/InvenTree/settings/appearance.html:29
 #, python-format
-msgid "\n"
+msgid ""
+"\n"
 "        The CSS sheet \"%(invalid_color_theme)s.css\" for the currently selected color theme was not found.<br>\n"
 "        Please select another color theme :)\n"
 "    "
@@ -7591,4 +7606,3 @@ msgstr ""
 #: users/models.py:187
 msgid "Permission to delete items"
 msgstr ""
-