diff --git a/InvenTree/locale/cs/LC_MESSAGES/django.po b/InvenTree/locale/cs/LC_MESSAGES/django.po
index fe1c63d886..3762f5586d 100644
--- a/InvenTree/locale/cs/LC_MESSAGES/django.po
+++ b/InvenTree/locale/cs/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Czech\n"
 "Language: cs_CZ\n"
@@ -31,7 +31,7 @@ msgstr "Zadejte datum"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Zadejte datum"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Poznámky"
@@ -130,7 +130,7 @@ msgstr "Vzdálený server vrátil prázdnou odpověď"
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Vyplněno neplatné množství"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Vyberte soubor k přiložení"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Odkaz"
 
@@ -305,7 +305,7 @@ msgstr "Název"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Název"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "Ztraceno"
 msgid "Returned"
 msgstr "Vráceno"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Odesláno"
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr ""
 
@@ -910,7 +911,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr ""
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr ""
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr ""
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr ""
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr ""
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Vyberte výrobce"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr "Stáhnout obrázek z URL"
 msgid "Delete image"
 msgstr "Smazat obrázek"
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "Vybrané díly"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/da/LC_MESSAGES/django.po b/InvenTree/locale/da/LC_MESSAGES/django.po
index 795525cfb1..b7d2db1195 100644
--- a/InvenTree/locale/da/LC_MESSAGES/django.po
+++ b/InvenTree/locale/da/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Danish\n"
 "Language: da_DK\n"
@@ -31,7 +31,7 @@ msgstr "Angiv dato"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Angiv dato"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Bemærkninger"
@@ -130,7 +130,7 @@ msgstr "Fjernserver returnerede tomt svar"
 msgid "Supplied URL is not a valid image file"
 msgstr "Angivet URL er ikke en gyldig billedfil"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Ugyldigt antal angivet"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Vælg fil, der skal vedhæftes"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Link"
 
@@ -305,7 +305,7 @@ msgstr "Navn"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Navn"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Stregkode Data"
 msgid "Third party barcode data"
 msgstr "Tredjeparts stregkode data"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Stregkode Hash"
 
@@ -592,8 +592,8 @@ msgstr "Mistet"
 msgid "Returned"
 msgstr "Returneret"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Afsendt"
 
@@ -790,16 +790,16 @@ msgstr "Ugyldigt valg for overordnet produktion"
 msgid "Build Order Reference"
 msgstr "Produktionsordre reference"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Reference"
 
@@ -818,7 +818,7 @@ msgstr "Produktionsordre som er tildelt denne produktion"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Produktionsordre som er tildelt denne produktion"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Produktionsordre som er tildelt denne produktion"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Salgsordre, som er tildelt denne produktion"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Kilde Lokation"
 
@@ -910,7 +911,7 @@ msgstr "Produktions Status"
 msgid "Build status code"
 msgstr "Produktions statuskode"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Batch Kode"
@@ -919,12 +920,12 @@ msgstr "Batch Kode"
 msgid "Batch code for this build output"
 msgstr "Batch kode til dette produktions output"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Oprettelsesdato"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Projekteret afslutningsdato"
 
@@ -932,7 +933,7 @@ msgstr "Projekteret afslutningsdato"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Dato for afslutning"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Bruger som udstedte denne byggeordre"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Ansvarlig"
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr ""
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/de/LC_MESSAGES/django.po b/InvenTree/locale/de/LC_MESSAGES/django.po
index 7ac5252d41..e0d07f792e 100644
--- a/InvenTree/locale/de/LC_MESSAGES/django.po
+++ b/InvenTree/locale/de/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
 "Language: de_DE\n"
@@ -31,7 +31,7 @@ msgstr "Datum eingeben"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Datum eingeben"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Notizen"
@@ -130,7 +130,7 @@ msgstr "Remote-Server gab leere Antwort zurück"
 msgid "Supplied URL is not a valid image file"
 msgstr "Angegebene URL ist kein gültiges Bild"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Keine gültige Menge"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Datei zum Anhängen auswählen"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Link"
 
@@ -305,7 +305,7 @@ msgstr "Name"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Name"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Barcode-Daten"
 msgid "Third party barcode data"
 msgstr "Drittanbieter-Barcode-Daten"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Barcode-Hash"
 
@@ -592,8 +592,8 @@ msgstr "Verloren"
 msgid "Returned"
 msgstr "Zurückgegeben"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Versendet"
 
@@ -790,16 +790,16 @@ msgstr "Ungültige Wahl für übergeordneten Bauauftrag"
 msgid "Build Order Reference"
 msgstr "Bauauftragsreferenz"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referenz"
 
@@ -818,7 +818,7 @@ msgstr "Bauauftrag, zu dem dieser Bauauftrag zugwiesen ist"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Bauauftrag, zu dem dieser Bauauftrag zugwiesen ist"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Bauauftrag, zu dem dieser Bauauftrag zugwiesen ist"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Bestellung, die diesem Bauauftrag zugewiesen ist"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Quell-Lagerort"
 
@@ -910,7 +911,7 @@ msgstr "Bauauftrags-Status"
 msgid "Build status code"
 msgstr "Bau-Statuscode"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Losnummer"
@@ -919,12 +920,12 @@ msgstr "Losnummer"
 msgid "Batch code for this build output"
 msgstr "Losnummer für dieses Endprodukt"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Erstelldatum"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "geplantes Fertigstellungsdatum"
 
@@ -932,7 +933,7 @@ msgstr "geplantes Fertigstellungsdatum"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Zieldatum für Bauauftrag-Fertigstellung."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Fertigstellungsdatum"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Nutzer der diesen Bauauftrag erstellt hat"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Verantwortlicher Benutzer"
@@ -1014,11 +1015,11 @@ msgstr "Bauauftragsposition muss ein Endprodukt festlegen, da der übergeordnete
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "Zugewiesene Menge ({q}) darf nicht verfügbare Menge ({a}) übersteigen"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "BestandObjekt ist zu oft zugewiesen"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Reserviermenge muss größer null sein"
 
@@ -1040,16 +1041,16 @@ msgstr "Bauauftrag"
 msgid "Build to allocate parts"
 msgstr "Bauauftrag starten um Teile zuzuweisen"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Quell-Lagerartikel"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Quell-Lagerartikel"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Dieses Endprodukt ist nicht vollständig zugewiesen"
 msgid "Enter quantity for build output"
 msgstr "Menge der Endprodukte angeben"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Ganzzahl für verfolgbare Teile erforderlich"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Ganzzahl erforderlich da die Stückliste nachverfolgbare Teile enthält"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "Die folgenden Seriennummern existieren bereits oder sind ungültig"
 msgid "A list of build outputs must be provided"
 msgstr "Eine Liste von Endprodukten muss angegeben werden"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "Lagerort für fertige Endprodukte"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Status"
@@ -1263,7 +1264,7 @@ msgstr "Akzeptieren, dass Lagerartikel diesem Bauauftrag nicht vollständig zuge
 msgid "Required stock has not been fully allocated"
 msgstr "Benötigter Bestand wurde nicht vollständig zugewiesen"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Unvollständig Zuweisung akzeptieren"
 
@@ -1300,7 +1301,7 @@ msgstr "bom_item.part muss auf dasselbe Teil verweisen wie der Bauauftrag"
 msgid "Item must be in stock"
 msgstr "Teil muss auf Lager sein"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Verfügbare Menge ({q}) überschritten"
@@ -1317,7 +1318,7 @@ msgstr "Endprodukt kann bei Zuweisung nicht-verfolgter Teile nicht angegeben wer
 msgid "This stock item has already been allocated to this build output"
 msgstr "Dieser Lagerbestand wurde bereits diesem Endprodukt zugewiesen"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "Zuweisungen müssen angegeben werden"
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Bestand wurde Bauauftrag noch nicht vollständig zugewiesen"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Zieldatum"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Fertig"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Auftrag"
 
@@ -1512,8 +1513,8 @@ msgstr "Ausgangs-Lager"
 msgid "Stock can be taken from any available location."
 msgstr "Bestand kann jedem verfügbaren Lagerort entnommen werden."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Ziel-Lager"
 
@@ -2919,7 +2920,7 @@ msgstr "Maximale Länge der Zeichenketten, die in Tabellenansichten angezeigt we
 msgid "Price break quantity"
 msgstr "Preisstaffelungs Anzahl"
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Hersteller auswählen"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr "MPN"
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr "Verlinktes Herstellerteil muss dasselbe Basisteil referenzieren"
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Zulieferer auswählen"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr "SKU (Lagerbestandseinheit)"
@@ -3328,8 +3329,9 @@ msgstr "Zuliefererbeschreibung des Teils"
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Notiz"
 
@@ -3357,7 +3359,7 @@ msgstr "Teile-Verpackungen"
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr "Packmenge"
@@ -3443,12 +3445,12 @@ msgstr "Bild von URL herunterladen"
 msgid "Delete image"
 msgstr "Bild löschen"
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr "Teile-Abfragefilter (kommagetrennte Liste mit Schlüssel=Wert-Paaren)"
 msgid "No matching purchase order found"
 msgstr "Keine passende Bestellung gefunden"
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr "Keine passende Bestellung gefunden"
 msgid "Purchase Order"
 msgstr "Bestellung"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Bestellungs-Beschreibung"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Link auf externe Seite"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "Erstellt von"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "Nutzer oder Gruppe der/die für diesen Auftrag zuständig ist/sind"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "Bestell-Notizen"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr "Gesamtpreis"
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Bestell-Referenz"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr "Bestellungs-Status"
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "Firma bei der die Teile bestellt werden"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr "Zulieferer-Referenz"
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr "Zulieferer Bestellreferenz"
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr "Empfangen von"
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr "Aufgabedatum"
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr "Datum an dem die Bestellung aufgegeben wurde"
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "Ziel-Versanddatum"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr "Geplantes Lieferdatum für Auftrag."
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr "Datum an dem der Auftrag fertigstellt wurde"
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr "Teile-Zulieferer muss dem Zulieferer der Bestellung entsprechen"
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr "Anzahl muss eine positive Zahl sein"
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "Firma an die die Teile verkauft werden"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr "Kundenreferenz"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr "Bestellreferenz"
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr "Zieldatum für Auftrags-Fertigstellung."
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "Versanddatum"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr "Versand von"
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr "Auftrag kann nicht abgeschlossen werden, da keine Teile zugewiesen wurden"
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr "Nur ein ausstehender Auftrag kann als abgeschlossen markiert werden"
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr "Auftrag kann nicht abgeschlossen werden, da unvollständige Sendungen vorhanden sind"
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr "Auftrag kann nicht abgeschlossen werden, da es unvollständige Positionen gibt"
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr "Anzahl"
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr "Position - Referenz"
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr "Position - Notizen"
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr "Zieldatum für diesen Einzelposten (leer lassen, um das Zieldatum des Auftrags zu verwenden)"
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr "Kontext"
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr "Zusätzlicher Kontext für diese Zeile"
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr "Stückpreis"
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr "Lieferantenteil muss mit Lieferant übereinstimmen"
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr "gelöscht"
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr "Bestellung"
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr "Zuliefererteil"
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr "Empfangen"
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr "Empfangene Objekt-Anzahl"
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Preis"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr "Preis pro Einheit"
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr "Wo möchte der Käufer diesen Artikel gelagert haben?"
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr "Ein virtuelles Teil kann nicht einem Auftrag zugeordnet werden"
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr "Nur verkaufbare Teile können einem Auftrag zugewiesen werden"
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "Verkaufspreis"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr "Stückverkaufspreis"
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr "Versendete Menge"
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr "Versanddatum"
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr "Kontrolliert von"
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr "Benutzer, der diese Sendung kontrolliert hat"
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr "Sendung"
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr "Sendungsnummer"
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr "Versandhinweise"
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr "Sendungsverfolgungsnummer"
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr "Informationen zur Sendungsverfolgung"
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr "Rechnungsnummer"
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr "Referenznummer für zugehörige Rechnung"
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr "Sendung wurde bereits versandt"
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr "Sendung hat keine zugewiesene Lagerartikel"
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr "Lagerartikel wurde nicht zugewiesen"
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr "Kann Lagerartikel keiner Zeile mit einem anderen Teil hinzufügen"
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr "Kann Lagerartikel keiner Zeile ohne Teil hinzufügen"
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "Die zugeordnete Anzahl darf nicht die verfügbare Anzahl überschreiten"
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr "Anzahl für serialisierte Lagerartikel muss 1 sein"
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr "Auftrag gehört nicht zu Sendung"
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr "Sendung gehört nicht zu Auftrag"
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr "Position"
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr "Sendungsnummer-Referenz"
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr "Position"
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr "Lagerartikel für Zuordnung auswählen"
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr "Anzahl für Bestandszuordnung eingeben"
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr "Bestellung kann nicht verworfen werden"
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr "Erlaube das Schließen des Auftrags mit unvollständigen Positionen"
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr "Auftrag hat unvollständige Positionen"
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr "Der Auftrag ist nicht offen"
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr "Kaufpreiswährung"
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr "Zuliefererteil muss ausgewählt werden"
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr "Bestellung muss angegeben sein"
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr "Lieferant muss mit der Bestellung übereinstimmen"
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr "Die Bestellung muss mit dem Lieferant übereinstimmen"
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr "Position"
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr "Position stimmt nicht mit Kaufauftrag überein"
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr "Zielort für empfangene Teile auswählen"
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr "Losnummer für eingehende Lagerartikel"
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr "Seriennummern für eingehende Lagerartikel"
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr "Einzigartiger Identifikator"
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr "Barcode ist bereits in Verwendung"
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr "Ganzzahl für verfolgbare Teile erforderlich"
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr "Positionen müssen angegeben werden"
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr "Ziel-Lagerort muss angegeben werden"
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr "Barcode muss eindeutig sein"
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr "Verkaufspreis-Währung"
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr "Keine Sendungsdetails angegeben"
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr "Position ist nicht diesem Auftrag zugeordnet"
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr "Anzahl muss positiv sein"
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr "Seriennummern zum Zuweisen eingeben"
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr "Sendung wurde bereits versandt"
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr "Sendung ist nicht diesem Auftrag zugeordnet"
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr "Folgende Serienummern konnten nicht gefunden werden"
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr "Folgende Seriennummern sind bereits zugewiesen"
 
@@ -4521,7 +4534,7 @@ msgstr "Auswahl duplizieren"
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr "Schritt %(step)s von %(count)s"
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr "Positionen"
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr "Dieser Auftrag ist nicht vollständig zugeordnet"
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr "Kundenreferenz"
 
@@ -4762,7 +4775,7 @@ msgstr "Benutzt in"
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr "Zugeordnet"
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr "Gesamtbestand"
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "Verfügbarer Bestand"
 
@@ -5758,7 +5771,7 @@ msgstr "Benachrichtigungen über geringen Bestand"
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr "Der verfügbare Bestand für {part.name} ist unter das konfigurierte Mindestniveau gefallen"
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr "Stückpreis"
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr "Gesamtkosten"
@@ -6828,10 +6842,31 @@ msgstr "Benötigte Materialien"
 msgid "Required For"
 msgstr "benötigt für"
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr "Lieferant gelöscht"
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "Stück-Preis"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr "Summe"
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr "Lagerartikel Test-Bericht"
@@ -6841,8 +6876,8 @@ msgstr "Lagerartikel Test-Bericht"
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Seriennummer"
 
@@ -6899,7 +6934,7 @@ msgstr "Lagerartikel ID"
 
 #: stock/admin.py:107
 msgid "Status Code"
-msgstr ""
+msgstr "Statuscode"
 
 #: stock/admin.py:110 templates/js/translated/model_renderers.js:442
 msgid "Supplier Part ID"
@@ -6936,11 +6971,11 @@ msgstr "Bestellungs-ID"
 
 #: stock/admin.py:125
 msgid "Review Needed"
-msgstr ""
+msgstr "Überprüfung erforderlich"
 
 #: stock/admin.py:126
 msgid "Delete on Deplete"
-msgstr ""
+msgstr "Löschen wenn leer"
 
 #: stock/admin.py:131 stock/models.py:774
 #: stock/templates/stock/item_base.html:430
@@ -7710,7 +7745,8 @@ msgstr "Authentifizierungsfehler"
 msgid "You have been logged out from InvenTree."
 msgstr "Sie wurden von InvenTree abgemeldet."
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr "Einloggen"
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr "Labeleinstellungen"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "Anmeldeeinstellungen"
 
@@ -7922,8 +7957,9 @@ msgid "Open in new tab"
 msgstr "In neuem Tab öffnen"
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
-msgstr "Globale Benachrichtigungseinstellungen"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
+msgstr "Benachrichtigungs-Einstellungen"
 
 #: templates/InvenTree/settings/notifications.html:18
 msgid "Slug"
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr "Inventurberichte"
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr "Plugin-Einstellungen"
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr "Wenn Sie die folgenden Einstellungen ändern, müssen Sie InvenTree sofort neu starten. Ändern Sie dies nicht während der aktiven Nutzung."
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr "Plugins"
 
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "Benutzer-Einstellungen"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Kontoeinstellungen"
+msgid "Account"
+msgstr "Benutzerkonto"
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Anzeigeeinstellungen"
+msgid "Display"
+msgstr "Darstellung"
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr "Startseite"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Sucheinstellungen"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "Suche"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,13 +8252,13 @@ msgstr "Berichte"
 msgid "Global Settings"
 msgstr "Allgemeine Einstellungen"
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
-msgstr "Serverkonfiguration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
+msgstr "Server"
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
-msgstr "Etikettendruck"
+msgid "Labels"
+msgstr "Etiketten"
 
 #: templates/InvenTree/settings/sidebar.html:41
 msgid "Categories"
@@ -8236,6 +8272,10 @@ msgstr "Auftrags-Einstellungen"
 msgid "Stock Settings"
 msgstr "Bestands-Einstellungen"
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Kontoeinstellungen"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr "%(time)s vor"
 msgid "Do you really want to remove the selected email address?"
 msgstr "Möchten Sie die ausgewählte E-Mail-Adresse wirklich entfernen?"
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Anzeigeeinstellungen"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Anzeige-Einstellungen"
@@ -8459,9 +8503,9 @@ msgstr "InvenTree Übersetzungsprojekt"
 msgid "Home Page Settings"
 msgstr "Startseite-Einstellungen"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr "Benachrichtigungs-Einstellungen"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Sucheinstellungen"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr "Keine Preisinformation verfügbar"
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr "Kein Lagerbestand verfügbar"
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr "Keine erforderlichen Tests für diesen Bauauftrag"
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr "Bestands-Zuordnung bearbeiten"
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr "Bestands-Zuordnung löschen"
 
@@ -9348,15 +9392,15 @@ msgstr "Ersatzteile verfügbar"
 msgid "Quantity Per"
 msgstr "Anzahl pro"
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr "Unzureichender Bestand verfügbar"
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr "Ausreichender Bestand verfügbar"
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr "Bestand bauen"
 
@@ -9364,21 +9408,21 @@ msgstr "Bestand bauen"
 msgid "Order stock"
 msgstr "Bestand bestellen"
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr "Bestand zuweisen"
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "Teile auswählen"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr "Sie müssen mindestens ein Teil auswählen"
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr "Anzahl für Bestandszuordnung eingeben"
 
@@ -9390,7 +9434,7 @@ msgstr "Alle Teile zugeordnet"
 msgid "All selected parts have been fully allocated"
 msgstr "Alle ausgewählten Teile wurden vollständig zugeordnet"
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr "Wählen Sie den Quellort aus (leer lassen um von allen Standorten zu nehmen)"
 
@@ -9398,11 +9442,11 @@ msgstr "Wählen Sie den Quellort aus (leer lassen um von allen Standorten zu neh
 msgid "Allocate Stock Items to Build Order"
 msgstr "Lagerartikel für Bauauftrag zuweisen"
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr "Keine passenden Lagerstandorte"
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr "Keine passenden Lagerbestände"
 
@@ -9454,7 +9498,7 @@ msgstr "Keine Benutzerinformation"
 
 #: templates/js/translated/build.js:2705
 msgid "group"
-msgstr ""
+msgstr "Gruppe"
 
 #: templates/js/translated/build.js:2804
 msgid "No parts allocated for"
@@ -10077,215 +10121,198 @@ msgstr "Bestellpositionen erhalten"
 msgid "No purchase orders found"
 msgstr "Keine Bestellungen gefunden"
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr "Bestellung überfällig"
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr "Positionen"
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr "Position duplizieren"
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr "Position bearbeiten"
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr "Position löschen"
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr "Keine Positionen gefunden"
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr "Summe"
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "Stück-Preis"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr "Gesamtpreis"
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr "Diese Position ist überfällig"
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr "Position empfangen"
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr "Position duplizieren"
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr "Position bearbeiten"
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr "Position löschen"
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr "Position duplizieren"
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr "Zeile bearbeiten"
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr "Zeile löschen"
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr "Position duplizieren"
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr "Zeile bearbeiten"
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr "Zeile löschen"
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr "Keine passenden Positionen gefunden"
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr "Keine Aufträge gefunden"
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr "Ungültiger Kunde"
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr "Sendung bearbeiten"
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr "Sendung fertigstellen"
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr "Sendung löschen"
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr "Sendung bearbeiten"
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr "Sendung löschen"
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr "Keine passenden Sendungen gefunden"
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr "Sendungsreferenz"
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr "Nicht versandt"
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr "Nachverfolgen"
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr "Rechnung"
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr "Sendung hinzufügen"
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "Bestandszuordnung bestätigen"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr "Artikel zu Kundenauftrag zuweisen"
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr "Keine Allokationen für Verkaufsaufträge gefunden"
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr "Bestandszuordnung bearbeiten"
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr "Löschvorgang bestätigen"
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr "Bestands-Zuordnung löschen"
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr "an Kunde versand"
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr "Lagerstandort nicht angegeben"
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr "Seriennummern zuweisen"
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr "Bestand kaufen"
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr "Preis berechnen"
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr "Kann nicht gelöscht werden, da Artikel versandt wurden"
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr "Kann nicht gelöscht werden, da Artikel zugewiesen sind"
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr "Seriennummern zuweisen"
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr "Stückpreis aktualisieren"
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr "Keine passenden Positionen gefunden"
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr "Keine passenden Positionen gefunden"
 
@@ -11426,12 +11453,6 @@ msgstr "von"
 msgid "rows"
 msgstr "Zeilen"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "Suche"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr "Keine passenden Ergebnisse gefunden"
@@ -11567,10 +11588,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 msgstr "Sie sind dabei, Ihr %(provider_name)s Konto zu verwenden, um sich bei\n"
 "%(site_name)s anzumelden.<br>Als letzten Schritt füllen Sie bitte folgendes Formular aus:"
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr "Server"
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr "Instanzname"
diff --git a/InvenTree/locale/el/LC_MESSAGES/django.po b/InvenTree/locale/el/LC_MESSAGES/django.po
index c16324f04d..31dc1eea6c 100644
--- a/InvenTree/locale/el/LC_MESSAGES/django.po
+++ b/InvenTree/locale/el/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
 "Language: el_GR\n"
@@ -31,7 +31,7 @@ msgstr "Εισάγετε ημερομηνία"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Εισάγετε ημερομηνία"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Σημειώσεις"
@@ -130,7 +130,7 @@ msgstr "Ο διακομιστής επέστρεψε σφάλμα %1$d %2$s"
 msgid "Supplied URL is not a valid image file"
 msgstr "Το URL δεν είναι έγκυρο αρχείο εικόνας"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Μη έγκυρη ποσότητα"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Επιλέξτε αρχείο για επισύναψη"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Σύνδεσμος"
 
@@ -305,7 +305,7 @@ msgstr "Όνομα"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Όνομα"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "Χάθηκε"
 msgid "Returned"
 msgstr "Επιστράφηκε"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Αποστάλθηκε"
 
@@ -790,16 +790,16 @@ msgstr "Μη έγκυρη επιλογή για γονική κατασκευή"
 msgid "Build Order Reference"
 msgstr "Αναφορά Παραγγελίας Κατασκευής"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Αναφορά"
 
@@ -818,7 +818,7 @@ msgstr "BuildOrder στην οποία έχει δοθεί αυτή η κατα
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "BuildOrder στην οποία έχει δοθεί αυτή η κατα
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "BuildOrder στην οποία έχει δοθεί αυτή η κατα
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "SalesOrder στην οποία έχει διατεθεί αυτό το build"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Τοποθεσία Προέλευσης"
 
@@ -910,7 +911,7 @@ msgstr "Κατάσταση Κατασκευής"
 msgid "Build status code"
 msgstr "Κωδικός κατάστασης κατασκευής"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Κωδικός Παρτίδας"
@@ -919,12 +920,12 @@ msgstr "Κωδικός Παρτίδας"
 msgid "Batch code for this build output"
 msgstr "Κωδικός παρτίδας για αυτήν την κατασκευή"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Ημερομηνία Δημιουργίας"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Ημερομηνία ολοκλήρωσης στόχου"
 
@@ -932,7 +933,7 @@ msgstr "Ημερομηνία ολοκλήρωσης στόχου"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Ημερομηνία ολοκλήρωσης της κατασκευής. Η κατασκευή θα καθυστερήσει μετά από αυτή την ημερομηνία."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Ημερομηνία ολοκλήρωσης"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Χρήστης που εξέδωσε αυτήν την παραγγελία κατασκευής"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Υπεύθυνος"
@@ -1014,11 +1015,11 @@ msgstr "Το στοιχείο κατασκευής πρέπει να ορίζε
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "Η καταχωρημένη ποσότητα ({q}) δεν πρέπει να υπερβαίνει τη διαθέσιμη ποσότητα αποθέματος ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Στοιχείο αποθέματος είναι υπερ-κατανεμημένο"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Η ποσότητα πρέπει να είναι μεγαλύτερη από 0"
 
@@ -1040,16 +1041,16 @@ msgstr "Κατασκευή"
 msgid "Build to allocate parts"
 msgstr "Κατασκευή για εκχώρηση τμημάτων"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Στοιχείο πηγαίου αποθέματος"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Στοιχείο πηγαίου αποθέματος"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Αυτή η έξοδος κατασκευής δεν έχει εκχωρ
 msgid "Enter quantity for build output"
 msgstr "Εισάγετε ποσότητα για την έξοδο κατασκευής"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Ακέραιη ποσότητα που απαιτείται για αν
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Ακέραιη ποσότητα που απαιτείται, καθώς ο λογαριασμός των υλικών περιέχει ανιχνεύσιμα μέρη"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr ""
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/es/LC_MESSAGES/django.po b/InvenTree/locale/es/LC_MESSAGES/django.po
index b8ac589812..0a4769cf9d 100644
--- a/InvenTree/locale/es/LC_MESSAGES/django.po
+++ b/InvenTree/locale/es/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
 "Language: es_ES\n"
@@ -31,7 +31,7 @@ msgstr "Seleccionar una fecha"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Seleccionar una fecha"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Notas"
@@ -130,7 +130,7 @@ msgstr "El servidor remoto devolvió una respuesta vacía"
 msgid "Supplied URL is not a valid image file"
 msgstr "La URL proporcionada no es un archivo de imagen válido"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Cantidad proporcionada no válida"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Seleccionar archivo para adjuntar"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Enlace"
 
@@ -305,7 +305,7 @@ msgstr "Nombre"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Nombre"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Hash del Código de barras"
 msgid "Third party barcode data"
 msgstr "Datos del código de barras de terceros"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Hash del Código de barras"
 
@@ -528,7 +528,7 @@ msgstr "Ruso (Русский)"
 
 #: InvenTree/settings.py:725
 msgid "Slovenian"
-msgstr ""
+msgstr "Esloveno"
 
 #: InvenTree/settings.py:726
 msgid "Swedish"
@@ -592,8 +592,8 @@ msgstr "Perdido"
 msgid "Returned"
 msgstr "Devuelto"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Enviado"
 
@@ -790,16 +790,16 @@ msgstr "Opción no válida para la construcción padre"
 msgid "Build Order Reference"
 msgstr "Referencia de Orden de Ensamblado"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referencia"
 
@@ -818,7 +818,7 @@ msgstr "Construcción de orden a la que se asigna esta versión"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Construcción de orden a la que se asigna esta versión"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Construcción de orden a la que se asigna esta versión"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Pedido de Entrega a la que este ensamblaje se asigna"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Ubicación de la fuente"
 
@@ -910,7 +911,7 @@ msgstr "Estado de la construcción"
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Fecha de Creación"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Fecha límite de finalización"
 
@@ -932,7 +933,7 @@ msgstr "Fecha límite de finalización"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Fecha límite para la finalización del ensamblado. El ensamblado estará vencido después de esta fecha."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Fecha de Finalización"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Responsable"
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Estado"
@@ -1263,7 +1264,7 @@ msgstr "Aceptar que los artículos de stock no se han asignado completamente a e
 msgid "Required stock has not been fully allocated"
 msgstr "El stock requerido no ha sido completamente asignado"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Acepta incompleto"
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr "El artículo debe estar en stock"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Fecha Límite"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Completado"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Pedido de Entrega"
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2221,27 +2222,27 @@ msgstr ""
 
 #: common/models.py:1300
 msgid "Enable Reports"
-msgstr ""
+msgstr "Habilitar informes"
 
 #: common/models.py:1301
 msgid "Enable generation of reports"
-msgstr ""
+msgstr "Habilitar la generación de informes"
 
 #: common/models.py:1307 templates/stats.html:25
 msgid "Debug Mode"
-msgstr ""
+msgstr "Modo de depuración"
 
 #: common/models.py:1308
 msgid "Generate reports in debug mode (HTML output)"
-msgstr ""
+msgstr "Generar informes en modo de depuración (salida HTML)"
 
 #: common/models.py:1314
 msgid "Page Size"
-msgstr ""
+msgstr "Formato de papel"
 
 #: common/models.py:1315
 msgid "Default page size for PDF reports"
-msgstr ""
+msgstr "Formato de papel predeterminado para informes en PDF"
 
 #: common/models.py:1325
 msgid "Enable Test Reports"
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Seleccionar fabricante"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr "'Part Number' del Fabricante"
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr "La parte vinculada del fabricante debe hacer referencia a la misma pieza base"
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Seleccionar proveedor"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr "Descripción de la pieza del proveedor"
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Nota"
 
@@ -3357,7 +3359,7 @@ msgstr "Empaquetado de pieza"
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3596,7 +3598,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:15 company/views.py:38
 #: templates/InvenTree/search.html:181 templates/navbar.html:49
 msgid "Manufacturers"
-msgstr ""
+msgstr "Fabricantes"
 
 #: company/templates/company/manufacturer_part.html:35
 #: company/templates/company/supplier_part.html:221
@@ -3774,13 +3776,13 @@ msgstr "Stock de Piezas del Proveedor"
 #: company/templates/company/supplier_part.html:203
 #: part/templates/part/detail.html:24 stock/templates/stock/location.html:203
 msgid "Create new stock item"
-msgstr ""
+msgstr "Añadir un nuevo artículo en inventario"
 
 #: company/templates/company/supplier_part.html:204
 #: part/templates/part/detail.html:25 stock/templates/stock/location.html:204
 #: templates/js/translated/stock.js:473
 msgid "New Stock Item"
-msgstr ""
+msgstr "Nuevo artículo en stock"
 
 #: company/templates/company/supplier_part.html:217
 msgid "Supplier Part Orders"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr "No se encontró ninguna orden de compra coincidente"
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr "No se encontró ninguna orden de compra coincidente"
 msgid "Purchase Order"
 msgstr "Orden de Compra"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Descripción del pedido"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Enlace a página web externa"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "Usuario o grupo responsable de este pedido"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr "Precio Total"
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Referencia del pedido"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "Empresa a la que se están encargando los artículos"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr "Referencia del Proveedor"
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "Fecha Límite de Envío"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "Empresa a la que se venden los artículos"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr "Referencia de Cliente "
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr "Código de referencia del pedido del cliente"
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr "Fecha límite para la finalización del envío. El pedido estará vencido después de esta fecha."
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "Fecha de Envío"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr "Referencia de artículo de línea"
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr "Precio por unidad"
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Precio de Compra"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr "Precio de compra por unidad"
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr "Una pieza virtual no puede ser asignada a un pedido de entrega"
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr "Sólo las piezas entregables pueden ser asignadas a un pedido de entrega"
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr "Precio de venta por unidad"
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr "El artículo de stock no ha sido asignado"
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr "La petición de entrega no coincide con el envío"
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr "El envío no coincide con el pedido de entrega"
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr "Referencia del envío del pedido de entrega"
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr "Moneda del precio de compra"
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr "Moneda del precio de venta"
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr "Paso %(step)s de %(count)s"
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr "Artículos de Línea"
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr "Este pedido de entrega no ha sido completamente asignado"
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr "Referencia del Cliente"
 
@@ -4762,7 +4775,7 @@ msgstr "Usado En"
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "Stock Disponible"
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6315,7 +6329,7 @@ msgstr ""
 #: templates/js/translated/part.js:1909 templates/js/translated/stock.js:1004
 #: templates/js/translated/stock.js:1835 templates/navbar.html:31
 msgid "Stock"
-msgstr ""
+msgstr "Inventario"
 
 #: part/templates/part/part_sidebar.html:30
 #: templates/InvenTree/settings/sidebar.html:35
@@ -6631,7 +6645,7 @@ msgstr ""
 
 #: plugin/models.py:198 templates/InvenTree/settings/plugin_settings.html:10
 msgid "Plugin"
-msgstr ""
+msgstr "Plugin"
 
 #: plugin/models.py:263
 msgid "Method"
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "Precio Unitario"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr "Total"
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7045,15 +7080,15 @@ msgstr ""
 
 #: stock/models.py:678
 msgid "Select a matching supplier part for this stock item"
-msgstr ""
+msgstr "Seleccione el proveedor de este artículo"
 
 #: stock/models.py:688
 msgid "Where is this stock item located?"
-msgstr ""
+msgstr "¿Dónde se encuentra este artículo?"
 
 #: stock/models.py:695
 msgid "Packaging this stock item is stored in"
-msgstr "El empaquetado de este elemento de stock está almacenado en"
+msgstr "Empaque utilizado para almacenar este artículo"
 
 #: stock/models.py:704
 msgid "Is this item installed in another item?"
@@ -7097,11 +7132,11 @@ msgstr ""
 
 #: stock/models.py:790
 msgid "Delete on deplete"
-msgstr ""
+msgstr "Eliminar al agotarse"
 
 #: stock/models.py:790
 msgid "Delete this Stock Item when stock is depleted"
-msgstr ""
+msgstr "Eliminar este artículo cuando no queden más existencias"
 
 #: stock/models.py:803 stock/templates/stock/item.html:132
 msgid "Stock Item Notes"
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr "Ajustes de etiquetas"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "Inicio de sesión"
 
@@ -7922,8 +7957,9 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
-msgstr ""
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
+msgstr "Ajustes de notificaciones"
 
 #: templates/InvenTree/settings/notifications.html:18
 msgid "Slug"
@@ -7954,23 +7990,23 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
-msgstr ""
+msgstr "Ajustes de plugins"
 
 #: templates/InvenTree/settings/plugin.html:16
 msgid "Changing the settings below require you to immediately restart the server. Do not change this while under active usage."
-msgstr ""
+msgstr "Cambiar la siguiente configuración requerirá reiniciar inmediatamente el servidor. Tenga precaución al hacer cambios con usuarios activos."
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
-msgstr ""
+msgstr "Plugins"
 
 #: templates/InvenTree/settings/plugin.html:44
 #: templates/js/translated/plugin.js:16
 msgid "Install Plugin"
-msgstr ""
+msgstr "Instalar plugin"
 
 #: templates/InvenTree/settings/plugin.html:52
 msgid "External plugins are not enabled for this InvenTree installation"
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "Ajustes del usuario"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Ajustes de la cuenta"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Ajustes de Visualización"
+msgid "Display"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Ajustes de búsqueda"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,13 +8252,13 @@ msgstr "Informes"
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
-msgstr "Ajustes del servidor"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
-msgstr "Impresión de etiquetas"
+msgid "Labels"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
 msgid "Categories"
@@ -8236,6 +8272,10 @@ msgstr "Configuración de Pedidos de Entrega"
 msgid "Stock Settings"
 msgstr "Configuración de Stock"
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Ajustes de la cuenta"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8354,11 +8394,11 @@ msgstr "Sesiones activas"
 
 #: templates/InvenTree/settings/user.html:228
 msgid "Log out active sessions (except this one)"
-msgstr ""
+msgstr "Expulsa a los usuarios activos (excepto a ti)"
 
 #: templates/InvenTree/settings/user.html:229
 msgid "Log Out Active Sessions"
-msgstr ""
+msgstr "Cerrar sesiones activas"
 
 #: templates/InvenTree/settings/user.html:238
 msgid "<em>unknown on unknown</em>"
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Ajustes de Visualización"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Configuración del Tema"
@@ -8459,9 +8503,9 @@ msgstr "Participar en el Proyecto de Traducción de InvenTree"
 msgid "Home Page Settings"
 msgstr "Ajustes de la página de inicio"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr "Ajustes de notificaciones"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Ajustes de búsqueda"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr "Artículos"
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr "Total"
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "Precio Unitario"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr "Precio Total"
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr "No se encontraron pedidos de entrega"
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr "Cliente Inválido"
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr "Referencia de Envío"
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr "Asignar Artículos de Stock a Pedido de Entrega"
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr "No se encontraron asignaciones de pedidos de entrega"
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr "Enviado al cliente"
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr "Actualizar Precio por Unidad"
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -10782,7 +10809,7 @@ msgstr ""
 
 #: templates/js/translated/stock.js:298
 msgid "Enter initial quantity for this stock item"
-msgstr ""
+msgstr "Cantidad inicial de existencias que tendrá este artículo"
 
 #: templates/js/translated/stock.js:304
 msgid "Enter serial numbers for new stock (or leave blank)"
@@ -11426,12 +11453,6 @@ msgstr "de"
 msgid "rows"
 msgstr "filas"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,17 +11587,13 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
-msgstr ""
+msgstr "Nombre de instancia"
 
 #: templates/stats.html:18
 msgid "Database"
-msgstr ""
+msgstr "Base de datos"
 
 #: templates/stats.html:26
 msgid "Server is running in debug mode"
@@ -11592,7 +11609,7 @@ msgstr ""
 
 #: templates/stats.html:39
 msgid "Plugin Support"
-msgstr ""
+msgstr "Soporte de plugins"
 
 #: templates/stats.html:43
 msgid "Plugin support enabled"
@@ -11604,7 +11621,7 @@ msgstr ""
 
 #: templates/stats.html:52
 msgid "Server status"
-msgstr ""
+msgstr "Estado del servidor"
 
 #: templates/stats.html:55
 msgid "Healthy"
@@ -11624,11 +11641,11 @@ msgstr ""
 
 #: templates/stats.html:75
 msgid "Email Settings"
-msgstr ""
+msgstr "Configuración de email"
 
 #: templates/stats.html:78
 msgid "Email settings not configured"
-msgstr ""
+msgstr "No se ha configurado el servidor de correo electrónico"
 
 #: templates/stock_table.html:17
 msgid "Barcode Actions"
diff --git a/InvenTree/locale/fa/LC_MESSAGES/django.po b/InvenTree/locale/fa/LC_MESSAGES/django.po
index 94a1089211..960131feae 100644
--- a/InvenTree/locale/fa/LC_MESSAGES/django.po
+++ b/InvenTree/locale/fa/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Persian\n"
 "Language: fa_IR\n"
@@ -31,7 +31,7 @@ msgstr "تاریخ را وارد کنید"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "تاریخ را وارد کنید"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "یادداشت"
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr ""
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr ""
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr ""
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr ""
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr ""
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "منبع محل"
 
@@ -910,7 +911,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr ""
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr ""
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr ""
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr ""
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr ""
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/fr/LC_MESSAGES/django.po b/InvenTree/locale/fr/LC_MESSAGES/django.po
index 94dee78859..1abad2ca10 100644
--- a/InvenTree/locale/fr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/fr/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Language: fr_FR\n"
@@ -31,7 +31,7 @@ msgstr "Entrer la date"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Entrer la date"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Notes"
@@ -130,7 +130,7 @@ msgstr "Le serveur distant a renvoyé une réponse vide"
 msgid "Supplied URL is not a valid image file"
 msgstr "L'URL fournie n'est pas un fichier image valide"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Quantité fournie invalide"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Sélectionnez un fichier à joindre"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Lien"
 
@@ -305,7 +305,7 @@ msgstr "Nom"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Nom"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Données du code-barres"
 msgid "Third party barcode data"
 msgstr "Données de code-barres tierces"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Hash du code-barre"
 
@@ -592,8 +592,8 @@ msgstr "Perdu"
 msgid "Returned"
 msgstr "Retourné"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Expédié"
 
@@ -790,16 +790,16 @@ msgstr "Choix invalide pour la fabrication parente"
 msgid "Build Order Reference"
 msgstr "Référence de l' Ordre de Fabrication"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Référence"
 
@@ -818,7 +818,7 @@ msgstr "BuildOrder associé a cette fabrication"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "BuildOrder associé a cette fabrication"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "BuildOrder associé a cette fabrication"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Commande de vente à laquelle cette construction est allouée"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Emplacement d'origine"
 
@@ -910,7 +911,7 @@ msgstr "État de la construction"
 msgid "Build status code"
 msgstr "Code de statut de construction"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Code de lot"
@@ -919,12 +920,12 @@ msgstr "Code de lot"
 msgid "Batch code for this build output"
 msgstr "Code de lot pour ce build output"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Date de création"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Date d'achèvement cible"
 
@@ -932,7 +933,7 @@ msgstr "Date d'achèvement cible"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Date cible pour l'achèvement de la construction. La construction sera en retard après cette date."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Date d'achèvement"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Utilisateur ayant émis cette commande de construction"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Responsable"
@@ -1014,11 +1015,11 @@ msgstr "L'élément de construction doit spécifier une sortie de construction,
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "La quantité allouée ({q}) ne doit pas excéder la quantité disponible ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "L'article de stock est suralloué"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "La quantité allouée doit être supérieure à zéro"
 
@@ -1040,16 +1041,16 @@ msgstr "Assemblage"
 msgid "Build to allocate parts"
 msgstr "Construction à laquelle allouer des pièces"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Stock d'origine de l'article"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Stock d'origine de l'article"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Cet ordre de production n'est pas complètement attribué"
 msgid "Enter quantity for build output"
 msgstr "Entrer la quantité désiré pour la fabrication"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Quantité entière requise pour les pièces à suivre"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Quantité entière requise, car la facture de matériaux contient des pièces à puce"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "Les numéros de série suivants existent déjà, ou sont invalides"
 msgid "A list of build outputs must be provided"
 msgstr "Une liste d'ordre de production doit être fourni"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "Emplacement des ordres de production achevés"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "État"
@@ -1263,7 +1264,7 @@ msgstr "Accepter les articles de stock qui n'ont pas été complètement alloué
 msgid "Required stock has not been fully allocated"
 msgstr "Le stock requis n'a pas encore été totalement alloué"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Accepter les incomplèts"
 
@@ -1300,7 +1301,7 @@ msgstr "bom_item.part doit pointer sur la même pièce que l'ordre de constructi
 msgid "Item must be in stock"
 msgstr "L'article doit être en stock"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Quantité disponible ({q}) dépassée"
@@ -1317,7 +1318,7 @@ msgstr "La sortie de la construction ne peut pas être spécifiée pour l'alloca
 msgid "This stock item has already been allocated to this build output"
 msgstr "Cet article de stock a déjà été alloué à cette sortie de construction"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "Les articles d'allocation doivent être fournis"
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Le stock n'a pas été entièrement alloué à cet ordre de construction"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Date Cible"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Terminé"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Commandes"
 
@@ -1512,8 +1513,8 @@ msgstr "Stock d'origine"
 msgid "Stock can be taken from any available location."
 msgstr "Le stock peut être pris à partir de n'importe quel endroit disponible."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Destination"
 
@@ -2919,7 +2920,7 @@ msgstr "Limite de longueur maximale pour les chaînes affichées dans les vues d
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Sélectionner un fabricant"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr "La pièce du fabricant liée doit faire référence à la même pièce de base"
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Sélectionner un fournisseur"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr "SKU"
@@ -3328,8 +3329,9 @@ msgstr "Description de la pièce du fournisseur"
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Note"
 
@@ -3357,7 +3359,7 @@ msgstr "Conditionnement de l'article"
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr "Nombre de paquet"
@@ -3443,12 +3445,12 @@ msgstr "Télécharger l'image depuis l'URL"
 msgid "Delete image"
 msgstr "Supprimer image"
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr "Filtres de requêtes de pièces (valeurs de paires clé=valeur séparée
 msgid "No matching purchase order found"
 msgstr "Aucun bon de commande correspondant n'a été trouvé"
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr "Aucun bon de commande correspondant n'a été trouvé"
 msgid "Purchase Order"
 msgstr "Commande d’achat"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Description de la commande"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Lien vers une page externe"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "Créé par"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "Utilisateur ou groupe responsable de cette commande"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "Notes de commande"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Référence de la commande"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr "Statut de la commande d'achat"
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "Société de laquelle les articles sont commandés"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr "Référence du fournisseur"
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr "Code de référence de la commande fournisseur"
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr "reçu par"
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr "Date d'émission"
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr "Date d'émission de la commande"
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "Date de livraison cible"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr "Date prévue pour la livraison de la commande. La commande sera en retard après cette date."
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr "Date à laquelle la commande a été complété"
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr "La quantité doit être un nombre positif"
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "Société à laquelle les articles sont vendus"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "Nom de l’expédition"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr "expédié par"
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr "La commande ne peut pas être terminée car aucune pièce n'a été assignée"
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr "Seule une commande en attente peut être marquée comme terminée"
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr "La commande ne peut pas être terminée car il y a des envois incomplets"
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr "Nombre d'élement"
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr "Contexte"
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr "Prix unitaire"
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr "supprimé"
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr "Commande"
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr "Pièce fournisseur"
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr "Reçu"
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr "Nombre d'éléments reçus"
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Prix d'achat"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr "Prix d'achat unitaire"
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr "Où l'Acheteur veut-il stocker cet article ?"
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr "La pièce virtuelle ne peut pas être affectée à une commande"
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr "Seules les pièces vendues peuvent être attribuées à une commande"
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "Prix de vente"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr "Prix de vente unitaire"
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr "Quantité expédiée"
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr "Date d'expédition"
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr "Vérifié par"
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr "Utilisateur qui a vérifié cet envoi"
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr "Envoi"
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr "Numéro d'expédition"
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr "Notes d'expédition"
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr "N° de suivi"
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr "Information de suivi des colis"
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr "N° de facture"
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr "Numéro de référence de la facture associée"
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr "Le colis a déjà été envoyé"
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr "L'expédition n'a pas d'articles en stock alloués"
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr "L'article de stock n'a pas été assigné"
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr "Impossible d'allouer le stock à une ligne sans pièce"
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "La quantité d'allocation ne peut pas excéder la quantité en stock"
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr "Ligne"
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr "Article"
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr "La commande ne peut pas être annulée"
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr "La commande n'est pas ouverte"
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr "Devise du prix d'achat"
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr "Entrez les numéros de série pour les articles de stock entrants"
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr "Champ d'identifiant unique"
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr "Le code-barres est déjà utilisé"
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr "Une quantité entière doit être fournie pour les pièces tracables"
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr "Entrez les numéros de série à allouer"
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr "Aucune correspondance trouvée pour les numéros de série suivants"
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr "Les numéros de série suivants sont déjà alloués"
 
@@ -4521,7 +4534,7 @@ msgstr "Dupliquer la sélection"
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr "Requis pour"
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Numéro de série"
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr "Vous avez été déconnecté•e d'InvenTree."
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr "Se connecter"
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr "Paramètres des Étiquettes"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "Paramètres de Connexion"
 
@@ -7922,8 +7957,9 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
-msgstr "Paramètres de Notification"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
+msgstr "Paramètres de notification"
 
 #: templates/InvenTree/settings/notifications.html:18
 msgid "Slug"
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr "Paramètres des Extensions"
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr "Extensions"
 
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "Paramètres Utilisateur"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Paramètres du Compte"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Paramètres d'Affichage"
+msgid "Display"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Paramètres de Recherche"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "Rechercher"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,12 +8252,12 @@ msgstr "Rapports"
 msgid "Global Settings"
 msgstr "Paramètres Globaux"
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
-msgstr ""
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
+msgstr "Serveur"
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Paramètres du Compte"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Paramètres d'Affichage"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Paramètres de Thème"
@@ -8459,9 +8503,9 @@ msgstr "Projet collaboratif de Traduction d'InvenTree"
 msgid "Home Page Settings"
 msgstr "Paramètres de la Page d'Accueil"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr "Paramètres de notification"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Paramètres de Recherche"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr "Commander des stocks"
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr "Commande en retard"
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr "Livré au client"
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr "Allouer des numéros de série"
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr "Acheter du stock"
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr "Calculer le prix"
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr "Allouer des numéros de série"
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr "de"
 msgid "rows"
 msgstr "lignes"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "Rechercher"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr "Aucun résultat correspondant n'a été trouvé"
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr "Serveur"
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/he/LC_MESSAGES/django.po b/InvenTree/locale/he/LC_MESSAGES/django.po
index cd9630c688..919d159aa1 100644
--- a/InvenTree/locale/he/LC_MESSAGES/django.po
+++ b/InvenTree/locale/he/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Hebrew\n"
 "Language: he_IL\n"
@@ -31,7 +31,7 @@ msgstr "הזן תאריך סיום"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "הזן תאריך סיום"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr ""
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "בחר קובץ לצירוף"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "קישור"
 
@@ -305,7 +305,7 @@ msgstr "שם"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "שם"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "אבד"
 msgid "Returned"
 msgstr "הוחזר"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "נשלח"
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "מקט"
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr ""
 
@@ -910,7 +911,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr ""
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr ""
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr ""
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr ""
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr ""
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/hu/LC_MESSAGES/django.po b/InvenTree/locale/hu/LC_MESSAGES/django.po
index bf87a566ee..59a04b108c 100644
--- a/InvenTree/locale/hu/LC_MESSAGES/django.po
+++ b/InvenTree/locale/hu/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Hungarian\n"
 "Language: hu_HU\n"
@@ -31,7 +31,7 @@ msgstr "Dátum megadása"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Dátum megadása"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Megjegyzések"
@@ -130,7 +130,7 @@ msgstr "A kiszolgáló üres választ adott"
 msgid "Supplied URL is not a valid image file"
 msgstr "A megadott URL nem egy érvényes kép fájl"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Nem megfelelő mennyiség"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Válaszd ki a mellekelni kívánt fájlt"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Link"
 
@@ -305,7 +305,7 @@ msgstr "Név"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Név"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Vonalkód adat"
 msgid "Third party barcode data"
 msgstr "Harmadik féltől származó vonalkód adat"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Vonalkód hash"
 
@@ -592,8 +592,8 @@ msgstr "Elveszett"
 msgid "Returned"
 msgstr "Visszaküldve"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Kiszállítva"
 
@@ -687,7 +687,7 @@ msgstr "Alkatrészváltozattá alakítva"
 
 #: InvenTree/status_codes.py:285 templates/js/translated/table_filters.js:245
 msgid "Sent to customer"
-msgstr "Vevőnek elküldve"
+msgstr "Vevőnek kiszállítva"
 
 #: InvenTree/status_codes.py:286
 msgid "Returned from customer"
@@ -790,16 +790,16 @@ msgstr "Hibás választás a szülő gyártásra"
 msgid "Build Order Reference"
 msgstr "Gyártási utasítás azonosító"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Azonosító"
 
@@ -818,7 +818,7 @@ msgstr "Gyártás, amihez ez a gyártás hozzá van rendelve"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Gyártás, amihez ez a gyártás hozzá van rendelve"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Gyártás, amihez ez a gyártás hozzá van rendelve"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Vevői rendelés amihez ez a gyártás hozzá van rendelve"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Forrás hely"
 
@@ -910,7 +911,7 @@ msgstr "Gyártási állapot"
 msgid "Build status code"
 msgstr "Gyártás státusz kód"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Batch kód"
@@ -919,12 +920,12 @@ msgstr "Batch kód"
 msgid "Batch code for this build output"
 msgstr "Batch kód a gyártás kimenetéhez"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Létrehozás dátuma"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Befejezés cél dátuma"
 
@@ -932,7 +933,7 @@ msgstr "Befejezés cél dátuma"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Cél dátum a gyártás befejezéséhez. Ez után késettnek számít majd."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Elkészítés dátuma"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Felhasználó aki ezt a gyártási utasítást kiállította"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Felelős"
@@ -974,7 +975,7 @@ msgstr "Külső link"
 
 #: build/models.py:295
 msgid "Extra build notes"
-msgstr "Extra gyártási megjegyzések"
+msgstr "Egyéb gyártási megjegyzések"
 
 #: build/models.py:299
 msgid "Build Priority"
@@ -1014,11 +1015,11 @@ msgstr "Gyártási tételnek meg kell adnia a gyártási kimenetet, mivel a fő
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "A lefoglalt mennyiség ({q}) nem lépheti túl a szabad készletet ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Készlet túlfoglalva"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Lefoglalt mennyiségnek nullánál többnek kell lennie"
 
@@ -1040,16 +1041,16 @@ msgstr "Gyártás"
 msgid "Build to allocate parts"
 msgstr "Gyártás amihez készletet foglaljunk"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Forrás készlet tétel"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Forrás készlet tétel"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Ez a gyártási kimenet nincs teljesen lefoglalva"
 msgid "Enter quantity for build output"
 msgstr "Add meg a mennyiséget a gyártás kimenetéhez"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Egész számú mennyiség szükséges az egyedi követésre kötelezett
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Egész számú mennyiség szükséges, mivel az alkatrészjegyzék egyedi követésre kötelezett alkatrészeket tartalmaz"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "A következő sorozatszámok már léteznek vagy nem megfelelőek"
 msgid "A list of build outputs must be provided"
 msgstr "A gyártási kimenetek listáját meg kell adni"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "A kész gyártási kimenetek helye"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Állapot"
@@ -1246,7 +1247,7 @@ msgstr "Túlfoglalt készlet"
 
 #: build/serializers.py:516
 msgid "How do you want to handle extra stock items assigned to the build order"
-msgstr "Hogyan kezeljük az gyártáshoz rendelt extra készletet"
+msgstr "Hogyan kezeljük az gyártáshoz rendelt egyéb készletet"
 
 #: build/serializers.py:526
 msgid "Some stock items have been overallocated"
@@ -1264,7 +1265,7 @@ msgstr "Fogadd el hogy a készlet tételek nincsenek teljesen lefoglalva ehhez a
 msgid "Required stock has not been fully allocated"
 msgstr "A szükséges készlet nem lett teljesen lefoglalva"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Befejezetlenek elfogadása"
 
@@ -1301,7 +1302,7 @@ msgstr "bom_item.part ugyanarra az alkatrészre kell mutasson mint a gyártási
 msgid "Item must be in stock"
 msgstr "A tételnek kell legyen készlete"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Rendelkezésre álló mennyiség ({q}) túllépve"
@@ -1318,7 +1319,7 @@ msgstr "Gyártási kimenetet nem lehet megadni a követésre kötelezett alkatr
 msgid "This stock item has already been allocated to this build output"
 msgstr "Ez a készlet tétel már le lett foglalva ehhez a gyártási kimenethez"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "A lefoglalandó tételeket meg kell adni"
 
@@ -1441,13 +1442,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Még nincs lefoglalva a szükséges készlet"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Cél dátum"
 
@@ -1474,15 +1475,15 @@ msgid "Completed"
 msgstr "Kész"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Vevői rendelés"
 
@@ -1513,8 +1514,8 @@ msgstr "Készlet forrás"
 msgid "Stock can be taken from any available location."
 msgstr "Készlet bármely rendelkezésre álló helyről felhasználható."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Cél"
 
@@ -1961,7 +1962,7 @@ msgstr "Többször is előforduló IPN engedélyezése"
 
 #: common/models.py:1069
 msgid "Allow multiple parts to share the same IPN"
-msgstr "Azonos IPN használható legyen több alkatrész esetén is"
+msgstr "Azonos IPN használható legyen több alkatrészre is"
 
 #: common/models.py:1075
 msgid "Allow Editing IPN"
@@ -2920,7 +2921,7 @@ msgstr "Maximális szöveg hossz ami megjelenhet a táblázatokban"
 msgid "Price break quantity"
 msgstr "Ársáv mennyiség"
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3232,7 +3233,7 @@ msgstr "Gyártó kiválasztása"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr "MPN"
 
@@ -3287,7 +3288,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr "Kapcsolódó gyártói alkatrésznek ugyanarra a kiindulási alkatrészre kell hivatkoznia"
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3305,7 +3306,7 @@ msgstr "Beszállító kiválasztása"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr "SKU"
@@ -3329,8 +3330,9 @@ msgstr "Beszállítói alkatrész leírása"
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Megjegyzés"
 
@@ -3358,7 +3360,7 @@ msgstr "Alkatrész csomagolás"
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr "Csomagolási mennyiség"
@@ -3444,12 +3446,12 @@ msgstr "Kép letöltése URL-ről"
 msgid "Delete image"
 msgstr "Kép törlése"
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3920,10 +3922,10 @@ msgstr "Alkatrész lekérdezés szűrők (vesszővel elválasztott kulcs=érték
 msgid "No matching purchase order found"
 msgstr "Nincs egyező beszerzési rendelés"
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3933,426 +3935,437 @@ msgstr "Nincs egyező beszerzési rendelés"
 msgid "Purchase Order"
 msgstr "Beszerzési rendelés"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Rendelés leírása"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Link külső weboldalra"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "Készítette"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "Felhasználó vagy csoport aki felelőse ennek a rendelésnek"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "Rendelés jegyzetek"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr "Teljes ár"
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr "A rendelés teljes ára"
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Rendelés azonosító"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr "Beszerzési rendelés állapota"
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "Cég akitől a tételek beszerzésre kerülnek"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr "Beszállítói azonosító"
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr "Beszállítói rendelés azonosító kód"
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr "érkeztette"
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr "Kiállítás dátuma"
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr "Kiállítás dátuma"
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "Várható beérkezés"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr "Várt teljesítési dátuma a megrendelésnek. Ezután már késésben lévőnek számít majd."
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr "Rendelés teljesítési dátuma"
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr "Az alkatrész beszállítója meg kell egyezzen a beszerzési rendelés beszállítójával"
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr "Mennyiség pozitív kell legyen"
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "Cég akinek a tételek értékesítésre kerülnek"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr "Vevői azonosító "
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr "Megrendelés azonosító kódja a vevőnél"
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr "Cél dátum a rendelés teljesítéséhez. Ez után számít majd késettnek."
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "Kiszállítás dátuma"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr "szállította"
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr "A rendelés nem teljesíthető mivel nincs hozzárendelve alkatrész"
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr "Csak függő rendelés jelölhető késznek"
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr "A rendelés nem jelölhető késznek mivel függő szállítmányok vannak"
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr "A rendelés nem jelölhető késznek mivel nem teljesített sortételek vannak"
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr "Tétel mennyiség"
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr "Sortétel azonosító"
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr "Sortétel megjegyzései"
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr "Cél dátuma ennek a sortételnek (hagyd üresen a rendelés céldátum használatához)"
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr "Kontextus"
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr "További kontextus ehhez a sorhoz"
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr "Egységár"
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr "Beszállítói alkatrésznek egyeznie kell a beszállítóval"
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr "törölve"
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr "Rendelés"
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr "Beszállítói alkatrész"
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr "Beérkezett"
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr "Érkezett tételek száma"
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Beszerzési ár"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr "Beszerzési egységár"
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr "Mit szeretne a vevő hol tároljuk ezt az alkatrészt?"
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr "Virtuális alkatrészt nem lehet vevői rendeléshez adni"
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr "Csak értékesíthető alkatrészeket lehet vevői rendeléshez adni"
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "Eladási ár"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr "Eladási egységár"
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr "Szállított mennyiség"
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr "Szállítás dátuma"
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr "Ellenőrizte"
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr "Felhasználó aki ellenőrizte ezt a szállítmányt"
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr "Szállítmány"
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr "Szállítmány száma"
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr "Szállítmány megjegyzései"
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr "Nyomkövetési szám"
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr "Szállítmány nyomkövetési információ"
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr "Számlaszám"
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr "Hozzátartozó számla referencia száma"
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr "Szállítmány már elküldve"
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr "Szállítmány nem tartalmaz foglalt készlet tételeket"
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr "Készlet tétel nincs hozzárendelve"
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr "Nem foglalható készlet egy másik fajta alkatrész sortételéhez"
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr "Nem foglalható készlet egy olyan sorhoz amiben nincs alkatrész"
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "A lefoglalandó mennyiség nem haladhatja meg a készlet mennyiségét"
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr "Egyedi követésre kötelezett tételeknél a menyiség 1 kell legyen"
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr "Vevői rendelés nem egyezik a szállítmánnyal"
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr "Szállítmány nem egyezik a vevői rendeléssel"
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr "Sor"
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr "Vevői rendelés szállítmány azonosító"
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr "Tétel"
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr "Válaszd ki a foglalásra szánt készlet tételt"
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr "Készlet foglalási mennyiség megadása"
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr "A rendelést nem lehet törölni"
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr "Rendelés lezárása teljesítetlen sortételek esetén is"
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr "A rendelésben teljesítetlen sortételek vannak"
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr "A rendelés nem nyitott"
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr "Beszérzési ár pénzneme"
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr "Beszállítói alkatrészt meg kell adni"
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr "Beszerzési rendelést meg kell adni"
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr "A beszállítónak egyeznie kell a beszerzési rendelésben lévővel"
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr "A beszerzési rendelésnek egyeznie kell a beszállítóval"
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr "Sortétel"
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr "Sortétel nem egyezik a beszerzési megrendeléssel"
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr "Válassz cél helyet a beérkezett tételeknek"
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr "Írd be a batch kódját a beérkezett tételeknek"
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr "Írd be a sorozatszámokat a beérkezett tételekhez"
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr "Egyedi azonosító mező"
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr "Ez a vonalkód már használva van"
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr "Egész számú mennyiség szükséges az egyedi követésre kötelezett alkatrészeknél"
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr "Sortételt meg kell adni"
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr "A cél helyet kötelező megadni"
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr "Megadott vonalkódoknak egyedieknek kel lenniük"
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr "Eladási ár pénzneme"
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr "Nincsenek szállítmány részletek megadva"
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr "Sortétel nincs hozzárendelve ehhez a rendeléshez"
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr "Mennyiség pozitív kell legyen"
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr "Írd be a sorozatszámokat a kiosztáshoz"
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr "Szállítmány kiszállítva"
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr "Szállítmány nincs hozzárendelve ehhez a rendeléshez"
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr "Nincs találat a következő sorozatszámokra"
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr "A következő sorozatszámok már ki lettek osztva"
 
@@ -4522,7 +4535,7 @@ msgstr "Kijelöltek másolása"
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4566,8 +4579,8 @@ msgstr "%(step)s/%(count)s. lépés"
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr "Sortételek"
 
@@ -4641,7 +4654,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr "Ehhez a vevői rendeléshez nincs minden alkatrész lefoglalva"
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr "Vevői azonosító"
 
@@ -4763,7 +4776,7 @@ msgstr "Felhasználva ebben"
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr "Lefoglalva"
 
@@ -4869,7 +4882,7 @@ msgid "Total Stock"
 msgstr "Teljes készlet"
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "Elérhető készlet"
 
@@ -4937,7 +4950,7 @@ msgstr "Létezik már készlet tétel ilyen a sorozatszámmal"
 
 #: part/models.py:741
 msgid "Duplicate IPN not allowed in part settings"
-msgstr "Azonos IPN nem engedélyezett az alkatrész beállításokban"
+msgstr "Azonos IPN nem engedélyezett az alkatrészekre, már létezik ilyen"
 
 #: part/models.py:746
 msgid "Part with this Name, IPN and Revision already exists."
@@ -5759,7 +5772,7 @@ msgstr "Alacsony készlet értesítés"
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr "A {part.name} alkatrész rendelkezésre álló készlete a megadott minimum alá csökkent"
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6266,6 +6279,7 @@ msgstr "Egység költség"
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr "Teljes költség"
@@ -6829,10 +6843,31 @@ msgstr "Szükséges alapanyagok"
 msgid "Required For"
 msgstr "Szükséges ehhez"
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr "Beszállító törölve lett"
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "Egységár"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr "Egyéb tételek"
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr "Összesen"
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr "Készlet tétel teszt riport"
@@ -6842,8 +6877,8 @@ msgstr "Készlet tétel teszt riport"
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Sorozatszám"
 
@@ -7711,7 +7746,8 @@ msgstr "Hitelesítési hiba"
 msgid "You have been logged out from InvenTree."
 msgstr "Kijelentkeztél az InvenTreeből."
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr "Bejelentkezés"
 
@@ -7887,7 +7923,6 @@ msgid "Label Settings"
 msgstr "Címke beállítások"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "Belépési beállítások"
 
@@ -7923,8 +7958,9 @@ msgid "Open in new tab"
 msgstr "Megnyitás új fülön"
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
-msgstr "Globális értesítési beállítások"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
+msgstr "Értesítési beállítások"
 
 #: templates/InvenTree/settings/notifications.html:18
 msgid "Slug"
@@ -7955,7 +7991,7 @@ msgid "Stocktake Reports"
 msgstr "Leltár riportok"
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr "Plugin beállítások"
 
@@ -7964,7 +8000,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr "Az alábbi beállítások módosításához a kiszolgáló azonnali újraindítása szükséges. Aktív használat közben ne változtass ezeken."
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr "Pluginok"
 
@@ -8190,23 +8226,23 @@ msgid "User Settings"
 msgstr "Felhasználói beállítások"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Fiókbeállítások"
+msgid "Account"
+msgstr "Felhasználó"
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Megjelenítési beállítások"
+msgid "Display"
+msgstr "Megjelenítés"
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr "Főoldal"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Keresési beállítások"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "Keresés"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8217,13 +8253,13 @@ msgstr "Riportolás"
 msgid "Global Settings"
 msgstr "Általános beállítások"
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
-msgstr "Kiszolgáló konfiguráció"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
+msgstr "Kiszolgáló"
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
-msgstr "Címke nyomtatás"
+msgid "Labels"
+msgstr "Címkék"
 
 #: templates/InvenTree/settings/sidebar.html:41
 msgid "Categories"
@@ -8237,6 +8273,10 @@ msgstr "Vevő rendelés beállításai"
 msgid "Stock Settings"
 msgstr "Készlet beállítások"
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Fiókbeállítások"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8395,6 +8435,10 @@ msgstr "%(time)s óta"
 msgid "Do you really want to remove the selected email address?"
 msgstr "Biztosan törölni szeretnéd a kiválasztott email címet?"
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Megjelenítési beállítások"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Téma beállítások"
@@ -8460,9 +8504,9 @@ msgstr "InvenTree fordítási projekt"
 msgid "Home Page Settings"
 msgstr "Főoldal beállításai"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr "Értesítési beállítások"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Keresési beállítások"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9123,7 +9167,7 @@ msgid "No pricing available"
 msgstr "Nincsenek árak"
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr "Nincs szabad"
 
@@ -9324,12 +9368,12 @@ msgid "No required tests for this build"
 msgstr "Nincsenek szükséges tesztek ehhez a gyártáshoz"
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr "Készlet foglalások szerkesztése"
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr "Készlet foglalások törlése"
 
@@ -9349,15 +9393,15 @@ msgstr "Vannak helyettesítő alkatrészek"
 msgid "Quantity Per"
 msgstr "Szükséges/db"
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr "Nincs elegendő"
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr "Van elegendő"
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr "Gyártási készlet"
 
@@ -9365,21 +9409,21 @@ msgstr "Gyártási készlet"
 msgid "Order stock"
 msgstr "Készlet rendelés"
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr "Lefoglalt készlet"
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "Kiválasztott alkatrészek"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr "Legalább egy alkatrész választása szükséges a foglaláshoz"
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr "Készlet foglalási mennyiség megadása"
 
@@ -9391,7 +9435,7 @@ msgstr "Minden alkatrész lefoglalva"
 msgid "All selected parts have been fully allocated"
 msgstr "Minden kiválasztott alkatrész teljesen lefoglalva"
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr "Válassz forrás helyet (vagy hagyd üresen ha bárhonnan)"
 
@@ -9399,11 +9443,11 @@ msgstr "Válassz forrás helyet (vagy hagyd üresen ha bárhonnan)"
 msgid "Allocate Stock Items to Build Order"
 msgstr "Készlet foglalása a gyártási utasításhoz"
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr "Nincs egyező készlethely"
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr "Nincs egyező készlet"
 
@@ -10078,215 +10122,198 @@ msgstr "Beszerzési rendelés tételeinek bevételezése"
 msgid "No purchase orders found"
 msgstr "Nem található beszerzési rendelés"
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr "Rendelés késésben"
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr "Tételek"
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr "Sortétel másolása"
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr "Sortétel szerkesztése"
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr "Sortétel törlése"
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr "Nem találhatók sortételek"
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr "Összesen"
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "Egységár"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr "Teljes ár"
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr "Ez a sortétel késésben van"
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr "Sortétel bevételezése"
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr "Sortétel másolása"
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr "Sortétel szerkesztése"
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr "Sortétel törlése"
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr "Sor másolása"
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr "Sor szerkesztése"
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr "Sor törlése"
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr "Sor másolása"
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr "Sor szerkesztése"
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr "Sor törlése"
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr "Nincs egyező sor"
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr "Nem található vevői rendelés"
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr "Érvénytelen vevő"
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr "Szállítmány szerkesztése"
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr "Szállítmány kiszállítása"
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr "Szállítmány törlése"
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr "Szállítmány szerkesztése"
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr "Szállítmány törlése"
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr "Nincs egyező szállímány"
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr "Szállítmány azonosító"
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr "Nincs kiszállítva"
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr "Nyomkövetés"
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr "Számla"
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr "Szállítmány hozzáadása"
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "Készlet foglalás megerősítése"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr "Készlet foglalása a vevői rendeléshez"
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr "Nincs vevői rendeléshez történő foglalás"
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr "Készlet foglalások szerkesztése"
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr "Törlési művelet megerősítése"
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr "Készlet foglalások törlése"
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr "Vevőnek kiszállítva"
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr "Készlethely nincs megadva"
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr "Sorozatszámok kiosztása"
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr "Készletrendelés"
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr "Árszámítás"
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr "Nem törölhető mivel a tételek ki lettek szállítva"
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr "Nem törölhető mivel tételek vannak lefoglalva"
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr "Sorozatszámok kiosztása"
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr "Egységár módosítása"
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr "Nincs egyező sortétel"
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr "Nincsenek egyező sorok"
 
@@ -11427,12 +11454,6 @@ msgstr "a"
 msgid "rows"
 msgstr "sorból,"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "Keresés"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr "Nincs egyező eredmény"
@@ -11567,10 +11588,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr "A %(provider_name)s felhasználói fiókodat fogod használni a %(site_name)s belépéshez.<br>Kérlek töltsd ki az alábbi adatokat:"
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr "Kiszolgáló"
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr "Példány neve"
diff --git a/InvenTree/locale/id/LC_MESSAGES/django.po b/InvenTree/locale/id/LC_MESSAGES/django.po
index 711fbf97e2..b004674378 100644
--- a/InvenTree/locale/id/LC_MESSAGES/django.po
+++ b/InvenTree/locale/id/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Indonesian\n"
 "Language: id_ID\n"
@@ -31,7 +31,7 @@ msgstr "Masukkan tanggal"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Masukkan tanggal"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Catatan"
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr "URL yang diberikan bukan file gambar yang valid"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Jumlah yang diberikan tidak valid"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Pilih file untuk dilampirkan"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Tautan"
 
@@ -305,7 +305,7 @@ msgstr "Nama"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Nama"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Data Barcode"
 msgid "Third party barcode data"
 msgstr "Data barcode pihak ketiga"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Barcode Hash"
 
@@ -592,8 +592,8 @@ msgstr "Hilang"
 msgid "Returned"
 msgstr "Dikembalikan"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Dikirim"
 
@@ -790,16 +790,16 @@ msgstr "Pilihan produksi induk tidak valid"
 msgid "Build Order Reference"
 msgstr "Referensi Order Produksi"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referensi"
 
@@ -818,7 +818,7 @@ msgstr "Produksi induk dari produksi ini"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Produksi induk dari produksi ini"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Produksi induk dari produksi ini"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Order penjualan yang teralokasikan ke pesanan ini"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Lokasi Sumber"
 
@@ -910,7 +911,7 @@ msgstr "Status pembuatan"
 msgid "Build status code"
 msgstr "Kode status pembuatan"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Kode Kelompok"
@@ -919,12 +920,12 @@ msgstr "Kode Kelompok"
 msgid "Batch code for this build output"
 msgstr "Kode kelompok untuk hasil produksi ini"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Tanggal Pembuatan"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Target tanggal selesai"
 
@@ -932,7 +933,7 @@ msgstr "Target tanggal selesai"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Target tanggal selesai produksi. Produksi akan menjadi terlambat setelah tanggal ini."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Tanggal selesai"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Pengguna yang menyerahkan order ini"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Penanggung Jawab"
@@ -1014,11 +1015,11 @@ msgstr "Item produksi harus menentukan hasil produksi karena bagian utama telah
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Item stok teralokasikan terlalu banyak"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Jumlah yang dialokasikan harus lebih dari nol"
 
@@ -1040,16 +1041,16 @@ msgstr "Produksi"
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Sumber stok item"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Sumber stok item"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Hasil produksi tidak dialokasikan sepenuhnya"
 msgid "Enter quantity for build output"
 msgstr "Masukkan jumlah hasil pesanan"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Jumlah bagian yang dapat dilacak harus berupa angka bulat"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Jumlah harus angka bulat karena terdapat bagian yang dapat dilacak dalam daftar barang"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr "Daftar hasil pesanan harus disediakan"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "Lokasi hasil pesanan yang selesai"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Status"
@@ -1263,7 +1264,7 @@ msgstr "Terima bahwa stok item tidak teralokasikan sepenuhnya ke pesanan ini"
 msgid "Required stock has not been fully allocated"
 msgstr "Stok yang diperlukan belum teralokasikan sepenuhnya"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Terima Tidak Selesai"
 
@@ -1300,7 +1301,7 @@ msgstr "bom_item.part harus mengarah ke bagian yang sesuai dengan order produksi
 msgid "Item must be in stock"
 msgstr "Item harus tersedia dalam stok"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Jumlah tersedia ({q}) terlampaui"
@@ -1317,7 +1318,7 @@ msgstr "Hasil produksi tidak dapat ditentukan untuk alokasi barang yang tidak te
 msgid "This stock item has already been allocated to this build output"
 msgstr "Stok item ini telah dialokasikan ke hasil produksi ini"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "Item yang dialokasikan harus disediakan"
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/it/LC_MESSAGES/django.po b/InvenTree/locale/it/LC_MESSAGES/django.po
index 6618bdd7ba..19858aa2d6 100644
--- a/InvenTree/locale/it/LC_MESSAGES/django.po
+++ b/InvenTree/locale/it/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
@@ -31,7 +31,7 @@ msgstr "Inserisci la data"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Inserisci la data"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Note"
@@ -130,7 +130,7 @@ msgstr "Il server remoto ha restituito una risposta vuota"
 msgid "Supplied URL is not a valid image file"
 msgstr "L'URL fornito non è un file immagine valido"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Quantità inserita non valida"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Seleziona file da allegare"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Collegamento"
 
@@ -305,7 +305,7 @@ msgstr "Nome"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Nome"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Dati del Codice a Barre"
 msgid "Third party barcode data"
 msgstr "Dati Codice a Barre applicazioni di terze parti"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Codice a Barre"
 
@@ -592,8 +592,8 @@ msgstr "Perso"
 msgid "Returned"
 msgstr "Reso"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Spedito"
 
@@ -790,16 +790,16 @@ msgstr "Scelta non valida per la produzione genitore"
 msgid "Build Order Reference"
 msgstr "Riferimento Ordine Di Produzione"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Riferimento"
 
@@ -818,7 +818,7 @@ msgstr "Ordine di produzione a cui questa produzione viene assegnata"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Ordine di produzione a cui questa produzione viene assegnata"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Ordine di produzione a cui questa produzione viene assegnata"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Ordine di vendita a cui questa produzione viene assegnata"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Posizione Di Origine"
 
@@ -910,7 +911,7 @@ msgstr "Stato Produzione"
 msgid "Build status code"
 msgstr "Codice stato di produzione"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Codice Lotto"
@@ -919,12 +920,12 @@ msgstr "Codice Lotto"
 msgid "Batch code for this build output"
 msgstr "Codice del lotto per questa produzione"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Data di creazione"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Data completamento obiettivo"
 
@@ -932,7 +933,7 @@ msgstr "Data completamento obiettivo"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Data di completamento della produzione. Dopo tale data la produzione sarà in ritardo."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Data di completamento"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Utente che ha emesso questo ordine di costruzione"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Responsabile"
@@ -1014,11 +1015,11 @@ msgstr "L'elemento di compilazione deve specificare un output poiché la parte p
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "La quantità assegnata ({q}) non deve essere maggiore della quantità disponibile ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "L'articolo in giacenza è sovrallocato"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "La quantità di assegnazione deve essere maggiore di zero"
 
@@ -1040,16 +1041,16 @@ msgstr "Produzione"
 msgid "Build to allocate parts"
 msgstr "Costruisci per allocare gli articoli"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Origine giacenza articolo"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Origine giacenza articolo"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Questo output non è stato completamente assegnato"
 msgid "Enter quantity for build output"
 msgstr "Inserisci la quantità per l'output di compilazione"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Quantità totale richiesta per articoli rintracciabili"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Quantità totale richiesta, poiché la fattura dei materiali contiene articoli rintracciabili"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "I seguenti numeri di serie sono già esistenti o non sono validi"
 msgid "A list of build outputs must be provided"
 msgstr "Deve essere fornito un elenco dei risultati di produzione"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "Posizione per gli output di build completati"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Stato"
@@ -1263,7 +1264,7 @@ msgstr "Accetta che gli elementi in giacenza non sono stati completamente assegn
 msgid "Required stock has not been fully allocated"
 msgstr "La giacenza richiesta non è stata completamente assegnata"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Accetta Incompleta"
 
@@ -1300,7 +1301,7 @@ msgstr "gli elementi degli articoli della distinta base devono puntare alla stes
 msgid "Item must be in stock"
 msgstr "L'articolo deve essere disponibile"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Quantità disponibile ({q}) superata"
@@ -1317,7 +1318,7 @@ msgstr "L'output di produzione non deve essere specificato per l'ubicazione dell
 msgid "This stock item has already been allocated to this build output"
 msgstr "Questa giacenza di magazzino è già stato assegnato a questa produzione"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "Deve essere indicata l'allocazione dell'articolo"
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Lo stock non è stato completamente assegnato a questo ordine di produzione"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Data scadenza"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Completato"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Ordini di Vendita"
 
@@ -1512,8 +1513,8 @@ msgstr "Risorse di magazzino"
 msgid "Stock can be taken from any available location."
 msgstr "Lo stock può essere prelevato da qualsiasi posizione disponibile."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Destinazione"
 
@@ -2919,7 +2920,7 @@ msgstr "Limite massimo di lunghezza per le stringhe visualizzate nelle viste del
 msgid "Price break quantity"
 msgstr "Quantità prezzo limite"
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Seleziona Produttore"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr "Codice articolo produttore (MPN)"
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr "L'articolo del costruttore collegato deve riferirsi alla stesso articolo"
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Seleziona fornitore"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr "SKU"
@@ -3328,8 +3329,9 @@ msgstr "Descrizione articolo fornitore"
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Nota"
 
@@ -3357,7 +3359,7 @@ msgstr "Imballaggio del pezzo"
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr "Quantità Confezione"
@@ -3443,12 +3445,12 @@ msgstr "Scarica immagine dall'URL"
 msgid "Delete image"
 msgstr "Elimina immagine"
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr "Articolo Filtri di ricerca (elenco separato da virgole key=coppia di val
 msgid "No matching purchase order found"
 msgstr "Nessun ordine di acquisto corrispondente trovato"
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr "Nessun ordine di acquisto corrispondente trovato"
 msgid "Purchase Order"
 msgstr "Ordine D'Acquisto"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Descrizione ordine"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Collegamento a un sito web esterno"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "Creato Da"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "Utente o gruppo responsabile di questo ordine"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "Note ordine"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr "Prezzo Totale"
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Riferimento ordine"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr "Stato ordine d'acquisto"
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "Azienda da cui sono stati ordinati gli articoli"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr "Riferimento fornitore"
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr "Codice di riferimento ordine fornitore"
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr "ricevuto da"
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr "Data di emissione"
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr "Data di emissione ordine"
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "Data di consegna programmata"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr "Data prevista per la consegna dell'ordine. L'ordine scadrà dopo questa data."
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr "Data ordine completato"
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr "Il fornitore dell'articolo deve corrispondere al fornitore dell'ordine di produzione"
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr "La quantità deve essere un numero positivo"
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "Azienda da cui sono stati ordinati gli elementi"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr "Riferimento Cliente "
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr "Codice di riferimento Ordine del Cliente"
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr "Data di completamento dell'ordine. Dopo tale data l'ordine sarà in ritardo."
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "Data di spedizione"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr "spedito da"
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr "L'ordine non può essere completato perché nessun articolo è stato assegnato"
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr "Solo un ordine in sospeso può essere contrassegnato come completato"
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr "L'ordine non può essere completato in quanto ci sono spedizioni incomplete"
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr "L'ordine non può essere completato perché ci sono elementi di riga incompleti"
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr "Quantità Elementi"
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr "Riferimento Linea Elemento"
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr "Note linea elemento"
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr "Data di destinazione per questa voce di riga (lasciare vuoto per utilizzare la data di destinazione dall'ordine)"
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr "Contesto"
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr "Contesto aggiuntivo per questa voce"
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr "Prezzo unitario"
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr "L'articolo del fornitore deve corrispondere al fornitore"
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr "eliminato"
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr "Ordine"
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr "Articolo Fornitore"
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr "Ricevuto"
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr "Numero di elementi ricevuti"
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Prezzo di Acquisto"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr "Prezzo di acquisto unitario"
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr "Dove l'Acquirente desidera che questo elemento venga immagazzinato?"
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr "Un articolo virtuale non può essere assegnato ad un ordine di vendita"
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr "Solo gli articoli vendibili possono essere assegnati a un ordine di vendita"
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "Prezzo di Vendita"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr "Prezzo unitario di vendita"
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr "Quantità spedita"
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr "Data di spedizione"
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr "Verificato Da"
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr "Utente che ha controllato questa spedizione"
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr "Spedizione"
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr "Numero di spedizione"
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr "Note di spedizione"
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr "Numero di monitoraggio"
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr "Informazioni di monitoraggio della spedizione"
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr "Numero Fattura"
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr "Numero di riferimento per la fattura associata"
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr "La spedizione è già stata spedita"
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr "La spedizione non ha articoli di stock assegnati"
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr "L'elemento di magazzino non è stato assegnato"
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr "Impossibile allocare l'elemento stock a una linea con un articolo diverso"
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr "Impossibile allocare stock a una riga senza un articolo"
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "La quantità di ripartizione non puo' superare la disponibilità della giacenza"
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr "La quantità deve essere 1 per l'elemento serializzato"
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr "L'ordine di vendita non corrisponde alla spedizione"
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr "La spedizione non corrisponde all'ordine di vendita"
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr "Linea"
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr "Riferimento della spedizione ordine di vendita"
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr "Elemento"
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr "Seleziona elemento stock da allocare"
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr "Inserisci la quantità assegnata alla giacenza"
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr "L'ordine non può essere cancellato"
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr "Consenti di chiudere l'ordine con elementi di riga incompleti"
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr "L'ordine ha elementi di riga incompleti"
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr "L'ordine non è aperto"
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr "Valuta prezzo d'acquisto"
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr "L'articolo del fornitore deve essere specificato"
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr "L'ordine di acquisto deve essere specificato"
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr "Il fornitore deve essere abbinato all'ordine d'acquisto"
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr "L'ordine di acquisto deve essere abbinato al fornitore"
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr "Elemento Riga"
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr "L'elemento di riga non corrisponde all'ordine di acquisto"
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr "Seleziona la posizione di destinazione per gli elementi ricevuti"
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr "Inserisci il codice univoco per gli articoli in arrivo"
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr "Inserisci i numeri di serie per gli articoli stock in arrivo"
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr "Campo identificativo univoco"
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr "Il codice a barre è già in uso"
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr "Deve essere fornita una quantità intera per gli articoli rintracciabili"
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr "Gli elementi di linea devono essere forniti"
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr "La destinazione deve essere specificata"
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr "I valori dei codici a barre forniti devono essere univoci"
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr "Valuta prezzo di vendita"
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr "Nessun dettaglio di spedizione fornito"
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr "L'elemento di riga non è associato a questo ordine"
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr "La quantità deve essere positiva"
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr "Inserisci i numeri di serie da assegnare"
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr "La spedizione è già stata spedita"
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr "La spedizione non è associata con questo ordine"
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr "Nessuna corrispondenza trovata per i seguenti numeri di serie"
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr "I seguenti numeri di serie sono già assegnati"
 
@@ -4521,7 +4534,7 @@ msgstr "Duplica selezionati"
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr "Passo %(step)s di %(count)s"
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr "Elementi Riga"
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr "Questo Ordine di Vendita non è stato assegnato completamente"
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr "Riferimento Cliente"
 
@@ -4762,7 +4775,7 @@ msgstr "Utilizzato In"
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr "Allocato"
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr "Giacenze Totali"
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "Disponibilità in magazzino"
 
@@ -5758,7 +5771,7 @@ msgstr "Notifica di magazzino bassa"
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr "Lo stock disponibile per {part.name} è sceso sotto il livello minimo configurato"
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr "Costo Unitario"
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr "Costo Totale"
@@ -6828,10 +6842,31 @@ msgstr "Materiali necessari"
 msgid "Required For"
 msgstr "Richiesto Per"
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr "Il fornitore è stato eliminato"
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "Prezzo Unitario"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr "Totale"
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr "Test Report Elemento Stock"
@@ -6841,8 +6876,8 @@ msgstr "Test Report Elemento Stock"
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Numero Seriale"
 
@@ -7710,7 +7745,8 @@ msgstr "Autenticazione Fallita"
 msgid "You have been logged out from InvenTree."
 msgstr "Sei stato disconnesso da InvenTree."
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr "Accedi"
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr "Impostazioni Etichetta"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "Impostazioni di accesso"
 
@@ -7922,8 +7957,9 @@ msgid "Open in new tab"
 msgstr "Apri in una nuova scheda"
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
-msgstr "Impostazioni globali di notifica"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
+msgstr "Impostazioni Notifiche"
 
 #: templates/InvenTree/settings/notifications.html:18
 msgid "Slug"
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr "Report Inventario"
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr "Impostazioni Plugin"
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr "Cambiando le impostazioni qui sotto, si richiede di riavviare immediatamente il server. Non cambiare le impostazioni durante l'utilizzo."
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr "Plugin"
 
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "Impostazioni Utente"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Impostazioni Account"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Impostazioni Schermo"
+msgid "Display"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr "Home Page"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Impostazioni di ricerca"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "Cerca"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,13 +8252,13 @@ msgstr "Rapporti"
 msgid "Global Settings"
 msgstr "Impostazioni Globali"
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
-msgstr "Configurazione Server"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
+msgstr "Server"
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
-msgstr "Stampa Etichette"
+msgid "Labels"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
 msgid "Categories"
@@ -8236,6 +8272,10 @@ msgstr "Impostazioni Ordine di Vendita"
 msgid "Stock Settings"
 msgstr "Impostazioni Magazzino"
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Impostazioni Account"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr "%(time)s fa"
 msgid "Do you really want to remove the selected email address?"
 msgstr "Vuoi davvero rimuovere gli indirizzi email selezionati?"
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Impostazioni Schermo"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Impostazioni tema"
@@ -8459,9 +8503,9 @@ msgstr "InvenTree Progetto di Traduzione"
 msgid "Home Page Settings"
 msgstr "Impostazioni Home Page"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr "Impostazioni Notifiche"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Impostazioni di ricerca"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr "Nessun prezzo disponibile"
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr "Nessuna Scorta Disponibile"
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr "Nessun test richiesto per questa produzione"
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr "Modifica allocazione magazzino"
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr "Elimina posizione giacenza"
 
@@ -9348,15 +9392,15 @@ msgstr "Articoli sostitutivi disponibili"
 msgid "Quantity Per"
 msgstr "Quantità Per"
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr "Scorte insufficienti disponibili"
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr "Scorte sufficienti disponibili"
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr "Produci scorta"
 
@@ -9364,21 +9408,21 @@ msgstr "Produci scorta"
 msgid "Order stock"
 msgstr "Ordina scorta"
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr "Assegna scorta"
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "Seleziona Articoli"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr "È necessario selezionare almeno un articolo da assegnare"
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr "Specificare il quantitativo assegnato allo stock"
 
@@ -9390,7 +9434,7 @@ msgstr "Tutti gli articoli assegnati"
 msgid "All selected parts have been fully allocated"
 msgstr "Tutti gli articoli selezionati sono stati completamente assegnati"
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr "Seleziona la posizione di origine (lascia vuoto per prendere da tutte le posizioni)"
 
@@ -9398,11 +9442,11 @@ msgstr "Seleziona la posizione di origine (lascia vuoto per prendere da tutte le
 msgid "Allocate Stock Items to Build Order"
 msgstr "Assegna gli Elementi Stock all'Ordine di Produzione"
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr "Nessuna posizione di magazzino corrispondente"
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr "Nessun elemento corrispondente trovato"
 
@@ -10077,215 +10121,198 @@ msgstr "Ricevi Elementi Ordine D'Acquisto"
 msgid "No purchase orders found"
 msgstr "Nessun ordine d'acquisto trovato"
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr "L'Ordine è in ritardo"
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr "Elementi"
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr "Duplica Linee Elementi"
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr "Modifica Linee Elementi"
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr "Cancella Linea Elemento"
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr "Nessuna linea elementi trovata"
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr "Totale"
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "Prezzo Unitario"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr "Prezzo Totale"
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr "Questo elemento è in ritardo"
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr "Ricevi linea elemento"
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr "Duplica linea elemento"
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr "Modifica linea elemento"
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr "Cancella linea elemento"
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr "Duplica linea"
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr "Modifica linea"
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr "Cancella linea"
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr "Duplica Linea"
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr "Modifica Linea"
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr "Cancella Linea"
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr "Nessuna linea corrispondente"
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr "Non sono state trovati ordini di vendita"
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr "Cliente non valido"
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr "Modifica spedizione"
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr "Completa spedizione"
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr "Elimina spedizione"
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr "Modifica spedizione"
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr "Elimina Spedizione"
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr "Nessuna spedizione corrispondente trovata"
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr "Riferimento della spedizione"
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr "Non spedito"
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr "Tracciamento"
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr "Fattura"
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr "Aggiungi Spedizione"
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "Conferma l'assegnazione della giacenza"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr "Assegna Elementi di Magazzino all'Ordine di Vendita"
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr "Nessun ordine di vendita trovato"
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr "Modifica posizione giacenza"
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr "Conferma Operazione Eliminazione"
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr "Elimina posizione giacenza"
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr "Spedito al cliente"
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr "Nessun posizione specificata"
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr "Assegna Numeri di Serie"
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr "Prezzo d'acquisto"
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr "Calcola il prezzo"
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr "Non può essere eliminato perché gli elementi sono stati spediti"
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr "Non può essere eliminato perché gli elementi sono stati assegnati"
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr "Assegna Numeri di Serie"
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr "Aggiorna Prezzo Unitario"
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr "Nessun elemento di riga corrispondente"
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr "Nessuna linea corrispondente"
 
@@ -11426,12 +11453,6 @@ msgstr "di"
 msgid "rows"
 msgstr "righe"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "Cerca"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr "Nessun risultato corrispondente"
@@ -11567,10 +11588,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 msgstr "Stai per utilizzare il tuo account %(provider_name)s per accedere a\n"
 "%(site_name)s.<br>Per concludere, compila il seguente modulo:"
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr "Server"
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr "Nome istanza"
diff --git a/InvenTree/locale/ja/LC_MESSAGES/django.po b/InvenTree/locale/ja/LC_MESSAGES/django.po
index 1944611343..dd4dd9f60a 100644
--- a/InvenTree/locale/ja/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ja/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Japanese\n"
 "Language: ja_JP\n"
@@ -31,7 +31,7 @@ msgstr "日付を入力する"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "日付を入力する"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "メモ"
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "数量コードが無効です"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "添付ファイルを選択"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "リンク"
 
@@ -305,7 +305,7 @@ msgstr "お名前"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "お名前"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "紛失"
 msgid "Returned"
 msgstr "返品済"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "発送済み"
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr ""
 
@@ -910,7 +911,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "作成日時"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr ""
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr ""
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr ""
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr "パーツを割り当てるためにビルドする"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "ステータス"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "購入金額"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/ko/LC_MESSAGES/django.po b/InvenTree/locale/ko/LC_MESSAGES/django.po
index 9dff3888a7..c12f8330d8 100644
--- a/InvenTree/locale/ko/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ko/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Korean\n"
 "Language: ko_KR\n"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr ""
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr ""
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "첨부할 파일을 선택하세요"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "링크"
 
@@ -305,7 +305,7 @@ msgstr "이름"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "이름"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "바코드 해시"
 
@@ -592,8 +592,8 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr ""
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr ""
 
@@ -910,7 +911,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr ""
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr ""
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr ""
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr ""
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "상태"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr "URL에서 이미지 다운로드"
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr "이미 사용 중인 바코드입니다"
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "단가"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "일련번호"
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "로그인 설정"
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr "새 탭에서 열기"
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr "사용자 설정"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "계정 설정"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr "홈페이지"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "계정 설정"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr "선택한 이메일 주소를 정말로 제거하시겠습니까?"
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "테마 설정"
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr "홈 페이지 설정"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "단가"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/nl/LC_MESSAGES/django.po b/InvenTree/locale/nl/LC_MESSAGES/django.po
index e38f6e4ce2..c71e18b235 100644
--- a/InvenTree/locale/nl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/nl/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
 "Language: nl_NL\n"
@@ -31,7 +31,7 @@ msgstr "Voer datum in"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Voer datum in"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Opmerkingen"
@@ -130,7 +130,7 @@ msgstr "Externe server heeft lege reactie teruggegeven"
 msgid "Supplied URL is not a valid image file"
 msgstr "Opgegeven URL is geen geldig afbeeldingsbestand"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Ongeldige hoeveelheid ingevoerd"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Bestand als bijlage selecteren"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Link"
 
@@ -305,7 +305,7 @@ msgstr "Naam"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Naam"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Streepjescode gegevens"
 msgid "Third party barcode data"
 msgstr "Streepjescode van derden"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Hash van Streepjescode"
 
@@ -592,8 +592,8 @@ msgstr "Kwijt"
 msgid "Returned"
 msgstr "Retour"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Verzonden"
 
@@ -790,16 +790,16 @@ msgstr "Ongeldige keuze voor bovenliggende productie"
 msgid "Build Order Reference"
 msgstr "Productieorderreferentie"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referentie"
 
@@ -818,7 +818,7 @@ msgstr "Productieorder waar deze productie aan is toegewezen"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Productieorder waar deze productie aan is toegewezen"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Productieorder waar deze productie aan is toegewezen"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Verkooporder waar deze productie aan is toegewezen"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Bronlocatie"
 
@@ -910,7 +911,7 @@ msgstr "Productiestatus"
 msgid "Build status code"
 msgstr "Productiestatuscode"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Batchcode"
@@ -919,12 +920,12 @@ msgstr "Batchcode"
 msgid "Batch code for this build output"
 msgstr "Batchcode voor deze productieuitvoer"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Aanmaakdatum"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Verwachte opleveringsdatum"
 
@@ -932,7 +933,7 @@ msgstr "Verwachte opleveringsdatum"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Doeldatum voor productie voltooiing. Productie zal achterstallig zijn na deze datum."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Opleveringsdatum"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Gebruiker die de productieorder heeft gegeven"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Verantwoordelijke"
@@ -1014,11 +1015,11 @@ msgstr "Productieartikel moet een productieuitvoer specificeren, omdat het hoofd
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "Toegewezen hoeveelheid ({q}) mag de beschikbare voorraad ({a}) niet overschrijden"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Voorraad item is te veel toegewezen"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Toewijzing hoeveelheid moet groter zijn dan nul"
 
@@ -1040,16 +1041,16 @@ msgstr "Product"
 msgid "Build to allocate parts"
 msgstr "Product om onderdelen toe te wijzen"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Bron voorraadartikel"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Bron voorraadartikel"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Deze productieuitvoer is niet volledig toegewezen"
 msgid "Enter quantity for build output"
 msgstr "Voer hoeveelheid in voor productie uitvoer"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Hoeveelheid als geheel getal vereist voor traceerbare onderdelen"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Geheel getal vereist omdat de stuklijst traceerbare onderdelen bevat"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "De volgende serienummers bestaan al of zijn ongeldig"
 msgid "A list of build outputs must be provided"
 msgstr "Een lijst van productieuitvoeren moet worden verstrekt"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "Locatie van voltooide productieuitvoeren"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Status"
@@ -1263,7 +1264,7 @@ msgstr "Accepteer dat voorraadartikelen niet volledig zijn toegewezen aan deze p
 msgid "Required stock has not been fully allocated"
 msgstr "Vereiste voorraad is niet volledig toegewezen"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Accepteer Onvolledig"
 
@@ -1300,7 +1301,7 @@ msgstr "bom_item.part moet naar hetzelfde onderdeel wijzen als de productieorder
 msgid "Item must be in stock"
 msgstr "Artikel moet op voorraad zijn"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Beschikbare hoeveelheid ({q}) overschreden"
@@ -1317,7 +1318,7 @@ msgstr "Productieuitvoer kan niet worden gespecificeerd voor de toewijzing van n
 msgid "This stock item has already been allocated to this build output"
 msgstr "Dit voorraadartikel is al toegewezen aan deze productieoutput"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "Allocaties voor artikelen moeten worden opgegeven"
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Voorraad is niet volledig toegewezen aan deze productieorder"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Streefdatum"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Voltooid"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Verkooporder"
 
@@ -1512,8 +1513,8 @@ msgstr "Voorraadbron"
 msgid "Stock can be taken from any available location."
 msgstr "Voorraad kan worden genomen van elke beschikbare locatie."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Bestemming"
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Fabrikant selecteren"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr "MPN"
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr "Gekoppeld fabrikant onderdeel moet verwijzen naar hetzelfde basis onderdeel"
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Leverancier selecteren"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr "SKU"
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Opmerking"
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr "Afbeelding downloaden van URL"
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Inkooporder"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Order beschrijving"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Link naar externe pagina"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "Aangemaakt Door"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "Gebruiker of groep verantwoordelijk voor deze order"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "Ordernotities"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr "Totaalprijs"
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Orderreferentie"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr "Inkooporder status"
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "Bedrijf waar de artikelen van worden besteld"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr "Leveranciersreferentie"
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr "Order referentiecode van leverancier"
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr "ontvangen door"
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr "Datum van uitgifte"
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr "Order uitgegeven op datum"
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "Streefdatum Levering"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr "Verwachte datum voor levering van de bestelling. De bestelling wordt achterstallig na deze datum."
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr "Order voltooid op datum"
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr "Onderdeelleverancier moet overeenkomen met de Inkooporderleverancier"
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr "Hoeveelheid moet een positief getal zijn"
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "Bedrijf waaraan de artikelen worden verkocht"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr "Klantreferentie "
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr "Klant order referentiecode"
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr "Streefdatum voor voltooien order. De order is na deze datum achterstallig."
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "Verzenddatum"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr "verzonden door"
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr "Order kan niet worden voltooid omdat er geen onderdelen aangewezen zijn"
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr "Alleen orders in afwachting kunnen als voltooid worden gemarkeerd"
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr "Bestelling kan niet worden voltooid omdat er onvolledige verzendingen aanwezig zijn"
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr "Order kan niet worden voltooid omdat er onvolledige artikelen aanwezig zijn"
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr "Hoeveelheid artikelen"
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr "Artikelregel referentie"
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr "Artikel notities"
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr "Context"
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr "Additionele context voor deze regel"
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr "Stukprijs"
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr "Leveranciersonderdeel moet overeenkomen met leverancier"
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr "verwijderd"
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr "Order"
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr "Leveranciersonderdeel"
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr "Ontvangen"
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr "Aantal ontvangen artikelen"
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Inkoopprijs"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr "Aankoopprijs per stuk"
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr "Waar wil de inkoper dat dit artikel opgeslagen wordt?"
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr "Virtueel onderdeel kan niet worden toegewezen aan een verkooporder"
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr "Alleen verkoopbare onderdelen kunnen aan een verkooporder worden toegewezen"
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "Verkoopprijs"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr "Prijs per stuk"
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr "Verzonden hoeveelheid"
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr "Datum van verzending"
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr "Gecontroleerd door"
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr "Gebruiker die deze zending gecontroleerd heeft"
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr "Zending"
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr "Zendingsnummer"
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr "Zendingnotities"
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr "Volgnummer"
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr "Zending volginformatie"
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr "Factuurnummer"
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr "Referentienummer voor bijbehorende factuur"
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr "Verzending is al verzonden"
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr "Zending heeft geen toegewezen voorraadartikelen"
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr "Voorraadartikel is niet toegewezen"
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr "Kan het voorraadartikel niet toewijzen aan een regel met een ander onderdeel"
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr "Kan voorraad niet toewijzen aan een regel zonder onderdeel"
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "Toewijzingshoeveelheid kan niet hoger zijn dan de voorraadhoeveelheid"
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr "Hoeveelheid moet 1 zijn voor geserialiseerd voorraadartikel"
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr "Verkooporder komt niet overeen met zending"
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr "Verzending komt niet overeen met verkooporder"
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr "Regel"
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr "Verzendreferentie verkooporder"
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr "Artikel"
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr "Selecteer voorraadartikel om toe te wijzen"
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr "Voer voorraadtoewijzingshoeveelheid in"
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr "Order kan niet worden geannuleerd"
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr "Order is niet open"
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr "Valuta Inkoopprijs"
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr "Leveranciersonderdeel moet worden gespecificeerd"
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr "Inkooporder moet worden gespecificeerd"
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr "De leverancier moet overeenkomen met de inkooporder"
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr "Inkooporder moet overeenkomen met de leverancier"
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr "Artikel"
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr "Artikelregel komt niet overeen met inkooporder"
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr "Selecteer bestemmingslocatie voor ontvangen artikelen"
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr "Voer serienummers in voor inkomende voorraadartikelen"
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr "Uniek identificatieveld"
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr "Streepjescode is al in gebruik"
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr "Hoeveelheid als geheel getal vereist voor traceerbare onderdelen"
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr "Artikelen moeten worden opgegeven"
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr "Bestemmingslocatie moet worden opgegeven"
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr "Geleverde streepjescodewaarden moeten uniek zijn"
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr "Valuta verkoopprijs"
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr "Geen verzenddetails opgegeven"
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr "Artikelregel is niet gekoppeld aan deze bestelling"
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr "Hoeveelheid moet positief zijn"
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr "Voer serienummers in om toe te wijzen"
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr "Verzending is al verzonden"
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr "Zending is niet gekoppeld aan deze bestelling"
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr "Geen overeenkomst gevonden voor de volgende serienummers"
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr "De volgende serienummers zijn al toegewezen"
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr "Artikelen"
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr "Deze Verkooporder is niet volledig toegewezen"
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr "Klantreferentie"
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr "Toegewezen"
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr "Totale Voorraad"
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "Beschikbare Voorraad"
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr "Vereist Voor"
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "Stukprijs"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr "Totaal"
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Serienummer"
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr "Startpagina"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr "Verkooporder Instellingen"
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr "Startpagina Instellingen"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr "Geen Voorraad Aanwezig"
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr "Voorraadtoewijzing bewerken"
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr "Voorraadtoewijzing verwijderen"
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr "Onvoldoende voorraad beschikbaar"
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr "Genoeg voorraad beschikbaar"
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr "Productie voorraad"
 
@@ -9364,21 +9408,21 @@ msgstr "Productie voorraad"
 msgid "Order stock"
 msgstr "Voorraad order"
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr "Voorraad toewijzen"
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "Onderdelen selecteren"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr "Er moet op zijn minst één onderdeel toegewezen worden"
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr "Specificeer voorraadtoewijzingshoeveelheid"
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr "Selecteer bron locatie (laat het veld leeg om iedere locatie te gebruiken)"
 
@@ -9398,11 +9442,11 @@ msgstr "Selecteer bron locatie (laat het veld leeg om iedere locatie te gebruike
 msgid "Allocate Stock Items to Build Order"
 msgstr "Voorraadartikelen toewijzen aan Productieorder"
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr "Geen overeenkomende voorraadlocaties"
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr "Geen overeenkomende voorraadartikelen"
 
@@ -10077,215 +10121,198 @@ msgstr "Ontvang Artikelen Inkooporder"
 msgid "No purchase orders found"
 msgstr "Geen inkooporder gevonden"
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr "Order is achterstallig"
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr "Artikelen"
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr "Artikel dupliceren"
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr "Artikel wijzigen"
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr "Artikel verwijderen"
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr "Geen artikelen gevonden"
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr "Totaal"
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "Stukprijs"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr "Totaalprijs"
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr "Dit artikel is achterstallig"
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr "Artikel ontvangen"
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr "Artikel dupliceren"
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr "Artikel bewerken"
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr "Artikel verwijderen"
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr "Kopieer regel"
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr "Bewerk regel"
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr "Verwijder regel"
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr "Kopieer Regel"
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr "Bewerk Regel"
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr "Verwijder Regel"
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr "Geen overeenkomende regel"
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr "Geen verkooporder gevonden"
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr "Ongeldige Klant"
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr "Verzending bewerken"
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr "Verzending Voltooien"
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr "Verzending verwijderen"
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr "Verzending bewerken"
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr "Verzending verwijderen"
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr "Geen overeenkomende verzending gevonden"
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr "Verzendingsreferentie"
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr "Niet verzonden"
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr "Volgen"
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr "Factuur"
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr "Voeg Verzending toe"
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "Bevestig de voorraadtoewijzing"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr "Voorraadartikel toewijzen aan Verkooporder"
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr "Geen verkooporder toewijzingen gevonden"
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr "Bewerk Voorraadtoewijzing"
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr "Bevestig Verwijderen"
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr "Verwijder Voorraadtoewijzing"
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr "Verzonden aan klant"
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr "Voorraadlocatie niet gespecificeerd"
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr "Wijs serienummers toe"
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr "Koop voorraad"
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr "Bereken prijs"
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr "Kan niet worden verwijderd omdat artikelen verzonden zijn"
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr "Kan niet worden verwijderd omdat artikelen toegewezen zijn"
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr "Wijs Serienummers Toe"
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr "Werk Stukprijs Bij"
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr "Geen overeenkomende artikelen"
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr "Geen overeenkomende regels"
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/no/LC_MESSAGES/django.po b/InvenTree/locale/no/LC_MESSAGES/django.po
index aadddb963b..5bc42d02f6 100644
--- a/InvenTree/locale/no/LC_MESSAGES/django.po
+++ b/InvenTree/locale/no/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian\n"
 "Language: no_NO\n"
@@ -31,7 +31,7 @@ msgstr "Oppgi dato"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Oppgi dato"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Notater"
@@ -130,7 +130,7 @@ msgstr "Ekstern server returnerte tomt svar"
 msgid "Supplied URL is not a valid image file"
 msgstr "Angitt URL er ikke en gyldig bildefil"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Ugyldig mengde oppgitt"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Velg fil å legge ved"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Lenke"
 
@@ -305,7 +305,7 @@ msgstr "Navn"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Navn"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Strekkode data"
 msgid "Third party barcode data"
 msgstr "Tredjeparts strekkode-data"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Strekkode hash"
 
@@ -592,8 +592,8 @@ msgstr "Tapt"
 msgid "Returned"
 msgstr "Returnert"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Sendt"
 
@@ -790,16 +790,16 @@ msgstr "Ugylding valg for overordnet build"
 msgid "Build Order Reference"
 msgstr "Bygg ordrereferanse"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referanse"
 
@@ -818,7 +818,7 @@ msgstr "Build order som denne build er tildelt til"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Build order som denne build er tildelt til"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Build order som denne build er tildelt til"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Salgorder som denne build er tildelt til"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Kilde plassering"
 
@@ -910,7 +911,7 @@ msgstr "Byggstatus"
 msgid "Build status code"
 msgstr "Byggstatuskode"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Batch kode"
@@ -919,12 +920,12 @@ msgstr "Batch kode"
 msgid "Batch code for this build output"
 msgstr "Batch kode for denne build output"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Opprettelsesdato"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Forventet sluttdato"
 
@@ -932,7 +933,7 @@ msgstr "Forventet sluttdato"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Forventet dato for ferdigstillelse. Build er forvalt etter denne datoen."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Fullført dato"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Brukeren som utstede denne prosjekt order"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Ansvarlig"
@@ -1014,11 +1015,11 @@ msgstr "Prosjektvare må spesifisere en prosjekt utdata, siden hovedvaren er mar
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "Tildelt antall ({q}) kan ikke overstige tilgjengelige lager mengde ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Lagervare er overtildelt"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Tildeling antallet må være større enn null"
 
@@ -1040,16 +1041,16 @@ msgstr "Prosjekt"
 msgid "Build to allocate parts"
 msgstr "Bygge for å tildele deler"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Kilde lagervare"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Kilde lagervare"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "Denne produksjonen er ikke fullt tildelt"
 msgid "Enter quantity for build output"
 msgstr "Angi antall for build utgang"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Heltallsverdi kreves for sporbare deler"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Heltallsverdi kreves, materialene inneholder sporbare deler"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "Følgende serienumre finnes allerede eller er ugyldige"
 msgid "A list of build outputs must be provided"
 msgstr "En liste over byggeresultater må oppgis"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "Sted for ferdige byggeresultater"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Status"
@@ -1263,7 +1264,7 @@ msgstr "Godta at lagervarer ikke er fullt tildelt til denne byggeordren"
 msgid "Required stock has not been fully allocated"
 msgstr "Påkrevd varer er ikke fullt tildelt"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Godta ufullstendig"
 
@@ -1300,7 +1301,7 @@ msgstr "bom_item.part må peke på den samme delen som byggeordren"
 msgid "Item must be in stock"
 msgstr "Varen må være på lager"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Tilgjengelig mengde ({q}) overskredet"
@@ -1317,7 +1318,7 @@ msgstr "Bygge utdage kan ikke spesifiseres for allokering av usporede deler"
 msgid "This stock item has already been allocated to this build output"
 msgstr "Denne lagervaren er allerede tildelt til denne byggeproduksjonen"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "Allokeringselementer må oppgis"
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Lager er ikke fullt tildelt til denne byggordren"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Måldato"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Fullført"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Salgsorder"
 
@@ -1512,8 +1513,8 @@ msgstr "Lager kilde"
 msgid "Stock can be taken from any available location."
 msgstr "Lagervare kan hentes fra alle tilgengelige steder."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Destinasjon"
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr "Last ned bilde fra URL"
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/pl/LC_MESSAGES/django.po b/InvenTree/locale/pl/LC_MESSAGES/django.po
index 69d78b7ba9..fae0c9acb5 100644
--- a/InvenTree/locale/pl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/pl/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
 "Language: pl_PL\n"
@@ -31,7 +31,7 @@ msgstr "Wprowadź dane"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Wprowadź dane"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Uwagi"
@@ -130,7 +130,7 @@ msgstr "Zdalny serwer zwrócił pustą odpowiedź"
 msgid "Supplied URL is not a valid image file"
 msgstr "Podany adres URL nie jest poprawnym plikiem obrazu"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Podano nieprawidłową ilość"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Wybierz plik do załączenia"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Łącze"
 
@@ -305,7 +305,7 @@ msgstr "Nazwa"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Nazwa"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Dane kodu kreskowego"
 msgid "Third party barcode data"
 msgstr "Dane kodu kreskowego stron trzecich"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Hasz kodu kreskowego"
 
@@ -592,8 +592,8 @@ msgstr "Zagubiono"
 msgid "Returned"
 msgstr "Zwrócone"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Wysłane"
 
@@ -790,16 +790,16 @@ msgstr "Nieprawidłowy wybór kompilacji nadrzędnej"
 msgid "Build Order Reference"
 msgstr "Odwołanie do zamówienia wykonania"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referencja"
 
@@ -818,7 +818,7 @@ msgstr "Zamówienie budowy, do którego budowa jest przypisana"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Zamówienie budowy, do którego budowa jest przypisana"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Zamówienie budowy, do którego budowa jest przypisana"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Zamówienie sprzedaży, do którego budowa jest przypisana"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Lokalizacja źródła"
 
@@ -910,7 +911,7 @@ msgstr "Status budowania"
 msgid "Build status code"
 msgstr "Kod statusu budowania"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Kod partii"
@@ -919,12 +920,12 @@ msgstr "Kod partii"
 msgid "Batch code for this build output"
 msgstr "Kod partii dla wyjścia budowy"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Data utworzenia"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Docelowy termin zakończenia"
 
@@ -932,7 +933,7 @@ msgstr "Docelowy termin zakończenia"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Docelowa data zakończenia kompilacji. Po tej dacie kompilacja będzie zaległa."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Data zakończenia"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Użytkownik, który wydał to zamówienie"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Odpowiedzialny"
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Alokowana ilość musi być większa niż zero"
 
@@ -1040,16 +1041,16 @@ msgstr "Budowa"
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Lokalizacja magazynowania przedmiotu"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Lokalizacja magazynowania przedmiotu"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Status"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Akceptuj niekompletne"
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr "Towar musi znajdować się w magazynie"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Data docelowa"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Zakończone"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Zamówienie zakupu"
 
@@ -1512,8 +1513,8 @@ msgstr "Źródło magazynu"
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Przeznaczenie"
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Wybierz producenta"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Wybierz dostawcę"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Uwaga"
 
@@ -3357,7 +3359,7 @@ msgstr "Opakowanie części"
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr "Pobierz obraz z adresu URL"
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Zlecenie zakupu"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Opis Zamówienia"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Link do zewnętrznej witryny"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "Utworzony przez"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "Użytkownik lub grupa odpowiedzialna za to zamówienie"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "Notatki do zamówienia"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr "Cena całkowita"
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Odniesienie zamówienia"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr "Status zamówienia zakupu"
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr "odebrane przez"
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr "Data wydania"
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr "Data wystawienia zamówienia"
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "Data Dostawy Towaru"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr "Wartość musi być liczbą dodatnią"
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "Data wysyłki"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr "wysłane przez"
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr "Ilość elementów"
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr "Zamówienie"
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr "Odebrane"
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Cena zakupu"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr "Cena zakupu jednostkowego"
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr "Gdzie kupujący chce przechowywać ten przedmiot?"
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "Cena sprzedaży"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr "Jednostkowa cena sprzedaży"
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr "Wysłana ilość"
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr "Data wysyłki"
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr "Sprawdzone przez"
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr "Użytkownik, który sprawdził tę wysyłkę"
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr "Przesyłka"
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr "Numer przesyłki"
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr "Notatki do przesyłki"
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr "Numer śledzenia"
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr "Informacje o śledzeniu przesyłki"
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr "Przesyłka została już wysłana"
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "Zarezerwowana ilość nie może przekraczać ilości na stanie"
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr "Linia"
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr "Komponent"
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr "Zamówienie nie może zostać anulowane"
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr "Duplikuj wybrane"
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr "Użyte w"
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr "Przydzielono"
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "Dostępna ilość"
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr "Cena jednostkowa"
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr "Całkowity Koszt"
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "Cena jednostkowa"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr "Razem"
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Numer Seryjny"
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr "Zaloguj się"
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr "Ustawienia etykiet"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "Ustawienia logowania"
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr "Otwórz w nowej karcie"
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr "Wtyczki"
 
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "Ustawienia użytkownika"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Ustawienia konta"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Ustawienia wyświetlania"
+msgid "Display"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr "Strona główna"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Ustawienia wyszukiwania"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "Szukaj"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,13 +8252,13 @@ msgstr "Raportowanie"
 msgid "Global Settings"
 msgstr "Ustawienia globalne"
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
-msgstr "Konfiguracja serwera"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
+msgstr "Serwer"
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
-msgstr "Drukowanie etykiet"
+msgid "Labels"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
 msgid "Categories"
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Ustawienia konta"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr "%(time)s temu"
 msgid "Do you really want to remove the selected email address?"
 msgstr "Czy na pewno chcesz usunąć wybrany adres e-mail?"
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Ustawienia wyświetlania"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Ustawienia motywu"
@@ -8459,9 +8503,9 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr "Ustawienia strony głównej"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr ""
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Ustawienia wyszukiwania"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr "Ilość za"
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "Wybierz części"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr "Przedmioty"
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr "Razem"
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "Cena jednostkowa"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr "Cena całkowita"
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr "Nie znaleziono zamówień sprzedaży"
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr "Nieprawidłowy klient"
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr "Edytuj wysyłkę"
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr "Kompletna wysyłka"
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr "Usuń wysyłkę"
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr "Edytuj wysyłkę"
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr "Usuń wysyłkę"
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr "Nie odnaleziono pasujących przesyłek"
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr "Numer referencyjny przesyłki"
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr "Nie wysłano"
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr "Śledzenie"
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "Potwierdź przydział zapasów"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr "Cena zakupu"
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr "Oblicz cenę"
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr "Zaktualizuj cenę jednostkową"
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr "z"
 msgid "rows"
 msgstr "wierszy"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "Szukaj"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr "Brak pasujących wyników"
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr "Serwer"
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr "Nazwa instancji"
diff --git a/InvenTree/locale/pt/LC_MESSAGES/django.po b/InvenTree/locale/pt/LC_MESSAGES/django.po
index b75e51d2f6..929cb73e5a 100644
--- a/InvenTree/locale/pt/LC_MESSAGES/django.po
+++ b/InvenTree/locale/pt/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Portuguese, Brazilian\n"
 "Language: pt_BR\n"
@@ -31,7 +31,7 @@ msgstr "Insira uma Data"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Insira uma Data"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Anotações"
@@ -130,7 +130,7 @@ msgstr "O servidor remoto retornou resposta vazia"
 msgid "Supplied URL is not a valid image file"
 msgstr "A URL fornecida não é um arquivo de imagem válido"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Quantidade invalida"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Selecione arquivo para anexar"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Link"
 
@@ -305,7 +305,7 @@ msgstr "Nome"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Nome"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Dados de código de barras"
 msgid "Third party barcode data"
 msgstr "Dados de código de barras de terceiros"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Hash de código de barras"
 
@@ -592,8 +592,8 @@ msgstr "Perdido"
 msgid "Returned"
 msgstr "Retornado"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Enviado"
 
@@ -790,16 +790,16 @@ msgstr "Escolha de Produção parental inválida"
 msgid "Build Order Reference"
 msgstr "Referência do pedido de produção"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referência"
 
@@ -818,7 +818,7 @@ msgstr "Ordem de produção para qual este serviço está alocado"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Ordem de produção para qual este serviço está alocado"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Ordem de produção para qual este serviço está alocado"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Ordem de Venda para qual esta produção está alocada"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Local de Origem"
 
@@ -910,7 +911,7 @@ msgstr "Progresso da produção"
 msgid "Build status code"
 msgstr "Código de situação da produção"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Código de Lote"
@@ -919,12 +920,12 @@ msgstr "Código de Lote"
 msgid "Batch code for this build output"
 msgstr "Código do lote para esta saída de produção"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Criado em"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Data alvo final"
 
@@ -932,7 +933,7 @@ msgstr "Data alvo final"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Data alvo para finalização de produção. Estará atrasado a partir deste dia."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Data de conclusão"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Usuário que emitiu esta ordem de produção"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Responsável"
@@ -1014,11 +1015,11 @@ msgstr "Item de produção deve especificar a saída, pois peças mestres estão
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "Quantidade alocada ({q}) não deve exceder a quantidade disponível em estoque ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "O item do estoque está sobre-alocado"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Quantidade alocada deve ser maior que zero"
 
@@ -1040,16 +1041,16 @@ msgstr "Produção"
 msgid "Build to allocate parts"
 msgstr "Faça uma Produção para atribuir peças"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Origem do item em estoque"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Origem do item em estoque"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "A saída de produção não está completamente alocada"
 msgid "Enter quantity for build output"
 msgstr "Entre a quantidade da saída de produção"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "Quantidade inteira necessária para peças rastreáveis"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "Quantidade inteira necessária, pois a lista de materiais contém peças rastreáveis"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "Os seguintes números de série já existem ou são inválidos"
 msgid "A list of build outputs must be provided"
 msgstr "Uma lista de saídas de produção deve ser fornecida"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1194,220 +1195,220 @@ msgstr "Local"
 
 #: build/serializers.py:372
 msgid "Location for completed build outputs"
-msgstr ""
+msgstr "Local para saídas de produção concluídas"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Situação"
 
 #: build/serializers.py:384
 msgid "Accept Incomplete Allocation"
-msgstr ""
+msgstr "Aceitar Alocação Incompleta"
 
 #: build/serializers.py:385
 msgid "Complete outputs if stock has not been fully allocated"
-msgstr ""
+msgstr "Concluir saídas se o estoque não tiver sido totalmente alocado"
 
 #: build/serializers.py:454
 msgid "Remove Allocated Stock"
-msgstr ""
+msgstr "Remover Estoque Alocado"
 
 #: build/serializers.py:455
 msgid "Subtract any stock which has already been allocated to this build"
-msgstr ""
+msgstr "Subtrair qualquer estoque que já tenha sido alocado para esta produção"
 
 #: build/serializers.py:461
 msgid "Remove Incomplete Outputs"
-msgstr ""
+msgstr "Remover Saídas Incompletas"
 
 #: build/serializers.py:462
 msgid "Delete any build outputs which have not been completed"
-msgstr ""
+msgstr "Excluir quaisquer saídas de produção que não tenham sido completadas"
 
 #: build/serializers.py:490
 msgid "Accept as consumed by this build order"
-msgstr ""
+msgstr "Aceitar conforme consumido por esta ordem de produção"
 
 #: build/serializers.py:491
 msgid "Deallocate before completing this build order"
-msgstr ""
+msgstr "Desatribua antes de completar esta ordem de produção"
 
 #: build/serializers.py:514
 msgid "Overallocated Stock"
-msgstr ""
+msgstr "Estoque sobrealocado"
 
 #: build/serializers.py:516
 msgid "How do you want to handle extra stock items assigned to the build order"
-msgstr ""
+msgstr "Como deseja manejar itens de estoque extras atribuídos a ordem de produção"
 
 #: build/serializers.py:526
 msgid "Some stock items have been overallocated"
-msgstr ""
+msgstr "Alguns itens de estoque foram sobrealocados"
 
 #: build/serializers.py:531
 msgid "Accept Unallocated"
-msgstr ""
+msgstr "Aceitar não alocados"
 
 #: build/serializers.py:532
 msgid "Accept that stock items have not been fully allocated to this build order"
-msgstr ""
+msgstr "Aceitar que os itens de estoque não foram totalmente alocados para esta produção"
 
 #: build/serializers.py:542 templates/js/translated/build.js:265
 msgid "Required stock has not been fully allocated"
-msgstr ""
+msgstr "Estoque obrigatório não foi totalmente alocado"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
-msgstr ""
+msgstr "Aceitar Incompleto"
 
 #: build/serializers.py:548
 msgid "Accept that the required number of build outputs have not been completed"
-msgstr ""
+msgstr "Aceitar que o número requerido de saídas de produção não foi concluído"
 
 #: build/serializers.py:558 templates/js/translated/build.js:269
 msgid "Required build quantity has not been completed"
-msgstr ""
+msgstr "Quantidade de produção requerida não foi concluída"
 
 #: build/serializers.py:567 templates/js/translated/build.js:253
 msgid "Build order has incomplete outputs"
-msgstr ""
+msgstr "Pedido de produção tem saídas incompletas"
 
 #: build/serializers.py:597 build/serializers.py:651 part/models.py:3420
 #: part/models.py:3790
 msgid "BOM Item"
-msgstr ""
+msgstr "Item LDM"
 
 #: build/serializers.py:607
 msgid "Build output"
-msgstr ""
+msgstr "Saída da Produção"
 
 #: build/serializers.py:615
 msgid "Build output must point to the same build"
-msgstr ""
+msgstr "Saída de produção deve indicar a mesma produção"
 
 #: build/serializers.py:665
 msgid "bom_item.part must point to the same part as the build order"
-msgstr ""
+msgstr "bin_item.part deve indicar a mesma peça da ordem de produção"
 
 #: build/serializers.py:680 stock/serializers.py:752
 msgid "Item must be in stock"
-msgstr ""
+msgstr "Item deve estar em estoque"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
-msgstr ""
+msgstr "Quantidade disponível ({q}) excedida"
 
 #: build/serializers.py:735
 msgid "Build output must be specified for allocation of tracked parts"
-msgstr ""
+msgstr "Saída de produção deve ser definida para alocação de peças rastreadas"
 
 #: build/serializers.py:742
 msgid "Build output cannot be specified for allocation of untracked parts"
-msgstr ""
+msgstr "Saída de produção deve ser definida para alocação de peças não rastreadas"
 
 #: build/serializers.py:747
 msgid "This stock item has already been allocated to this build output"
-msgstr ""
+msgstr "O item em estoque já foi alocado para essa saída de produção"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
-msgstr ""
+msgstr "Alocação do Item precisa ser fornecida"
 
 #: build/serializers.py:826
 msgid "Stock location where parts are to be sourced (leave blank to take from any location)"
-msgstr ""
+msgstr "Local de estoque onde peças serão extraídas (deixar em branco para qualquer local)"
 
 #: build/serializers.py:834
 msgid "Exclude Location"
-msgstr ""
+msgstr "Local não incluso"
 
 #: build/serializers.py:835
 msgid "Exclude stock items from this selected location"
-msgstr ""
+msgstr "Não incluir itens de estoque deste local"
 
 #: build/serializers.py:840
 msgid "Interchangeable Stock"
-msgstr ""
+msgstr "Estoque permutável"
 
 #: build/serializers.py:841
 msgid "Stock items in multiple locations can be used interchangeably"
-msgstr ""
+msgstr "Itens de estoque em múltiplos locais pode ser permutável"
 
 #: build/serializers.py:846
 msgid "Substitute Stock"
-msgstr ""
+msgstr "Substituir Estoque"
 
 #: build/serializers.py:847
 msgid "Allow allocation of substitute parts"
-msgstr ""
+msgstr "Permitir alocação de peças substitutas"
 
 #: build/serializers.py:852
 msgid "Optional Items"
-msgstr ""
+msgstr "Itens opcionais"
 
 #: build/serializers.py:853
 msgid "Allocate optional BOM items to build order"
-msgstr ""
+msgstr "Alocar itens LDM opcionais para a ordem de produção"
 
 #: build/tasks.py:100
 msgid "Stock required for build order"
-msgstr ""
+msgstr "Estoque obrigatório para o pedido de produção"
 
 #: build/tasks.py:118
 msgid "Overdue Build Order"
-msgstr ""
+msgstr "Pedido de produção vencido"
 
 #: build/tasks.py:123
 #, python-brace-format
 msgid "Build order {bo} is now overdue"
-msgstr ""
+msgstr "Pedido de produção {bo} está atrasada"
 
 #: build/templates/build/build_base.html:39
 #: order/templates/order/order_base.html:28
 #: order/templates/order/sales_order_base.html:38
 msgid "Print actions"
-msgstr ""
+msgstr "Ações de impressão"
 
 #: build/templates/build/build_base.html:43
 msgid "Print build order report"
-msgstr ""
+msgstr "Imprimir relatório do pedido de produção"
 
 #: build/templates/build/build_base.html:50
 msgid "Build actions"
-msgstr ""
+msgstr "Ações de produção"
 
 #: build/templates/build/build_base.html:54
 msgid "Edit Build"
-msgstr ""
+msgstr "Editar produção"
 
 #: build/templates/build/build_base.html:56
 msgid "Cancel Build"
-msgstr ""
+msgstr "Cancelar produção"
 
 #: build/templates/build/build_base.html:59
 msgid "Duplicate Build"
-msgstr ""
+msgstr "Duplicar produção"
 
 #: build/templates/build/build_base.html:62
 msgid "Delete Build"
-msgstr ""
+msgstr "Excluir produção"
 
 #: build/templates/build/build_base.html:67
 #: build/templates/build/build_base.html:68
 msgid "Complete Build"
-msgstr ""
+msgstr "Concluir produção"
 
 #: build/templates/build/build_base.html:90
 msgid "Build Description"
-msgstr ""
+msgstr "Descrição da produção"
 
 #: build/templates/build/build_base.html:98
 msgid "No build outputs have been created for this build order"
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Estoque não foi totalmente alocado para este Pedido de Produção"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Data alvo"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Concluído"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Pedido de Venda"
 
@@ -1502,28 +1503,28 @@ msgstr "Excluir Ordem de Produção"
 
 #: build/templates/build/detail.html:15
 msgid "Build Details"
-msgstr ""
+msgstr "Detalhes da produção"
 
 #: build/templates/build/detail.html:38
 msgid "Stock Source"
-msgstr ""
+msgstr "Origem do estoque"
 
 #: build/templates/build/detail.html:43
 msgid "Stock can be taken from any available location."
-msgstr ""
+msgstr "O estoque pode ser tirado de qualquer local disponível."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
-msgstr ""
+msgstr "Destino"
 
 #: build/templates/build/detail.html:56
 msgid "Destination location not specified"
-msgstr ""
+msgstr "Loca de destino não especificado"
 
 #: build/templates/build/detail.html:73
 msgid "Allocated Parts"
-msgstr ""
+msgstr "Peças alocadas"
 
 #: build/templates/build/detail.html:80 stock/admin.py:105
 #: stock/templates/stock/item_base.html:168
@@ -1534,127 +1535,127 @@ msgstr ""
 #: templates/js/translated/table_filters.js:183
 #: templates/js/translated/table_filters.js:274
 msgid "Batch"
-msgstr ""
+msgstr "Lote"
 
 #: build/templates/build/detail.html:133
 #: order/templates/order/order_base.html:158
 #: order/templates/order/sales_order_base.html:158
 #: templates/js/translated/build.js:2676
 msgid "Created"
-msgstr ""
+msgstr "Criado"
 
 #: build/templates/build/detail.html:144
 msgid "No target date set"
-msgstr ""
+msgstr "Sem data alvo definida"
 
 #: build/templates/build/detail.html:153
 msgid "Build not complete"
-msgstr ""
+msgstr "Produção não concluída"
 
 #: build/templates/build/detail.html:164 build/templates/build/sidebar.html:17
 msgid "Child Build Orders"
-msgstr ""
+msgstr "Pedido de Produção Filho"
 
 #: build/templates/build/detail.html:179
 msgid "Allocate Stock to Build"
-msgstr ""
+msgstr "Alocar Estoque para Produção"
 
 #: build/templates/build/detail.html:183 templates/js/translated/build.js:2046
 msgid "Unallocate stock"
-msgstr ""
+msgstr "Estoque não alocado"
 
 #: build/templates/build/detail.html:184
 msgid "Unallocate Stock"
-msgstr ""
+msgstr "Estoque não Alocado"
 
 #: build/templates/build/detail.html:186
 msgid "Automatically allocate stock to build"
-msgstr ""
+msgstr "Alocar o estoque para produção automaticamente"
 
 #: build/templates/build/detail.html:187
 msgid "Auto Allocate"
-msgstr ""
+msgstr "Alocar automaticamente"
 
 #: build/templates/build/detail.html:189
 msgid "Manually allocate stock to build"
-msgstr ""
+msgstr "Alocar estoque para a produção manualmente"
 
 #: build/templates/build/detail.html:190 build/templates/build/sidebar.html:8
 msgid "Allocate Stock"
-msgstr ""
+msgstr "Alocar estoque"
 
 #: build/templates/build/detail.html:193
 msgid "Order required parts"
-msgstr ""
+msgstr "Pedir peças necessárias"
 
 #: build/templates/build/detail.html:194
 #: company/templates/company/detail.html:37
 #: company/templates/company/detail.html:85
 #: part/templates/part/category.html:184 templates/js/translated/order.js:1307
 msgid "Order Parts"
-msgstr ""
+msgstr "Pedir Peças"
 
 #: build/templates/build/detail.html:206
 msgid "Untracked stock has been fully allocated for this Build Order"
-msgstr ""
+msgstr "Estoque não rastreável foi totalmente alocado para este Pedido de Produção"
 
 #: build/templates/build/detail.html:210
 msgid "Untracked stock has not been fully allocated for this Build Order"
-msgstr ""
+msgstr "Estoque não rastreável não foi totalmente alocado para este Pedido de Produção"
 
 #: build/templates/build/detail.html:217
 msgid "Allocate selected items"
-msgstr ""
+msgstr "Alocar itens selecionados"
 
 #: build/templates/build/detail.html:227
 msgid "This Build Order does not have any associated untracked BOM items"
-msgstr ""
+msgstr "Esse Pedido de Produção não possuí nenhum item não rastreável associado à LDM"
 
 #: build/templates/build/detail.html:236
 msgid "Incomplete Build Outputs"
-msgstr ""
+msgstr "Saída de Produção Incompletas"
 
 #: build/templates/build/detail.html:240
 msgid "Create new build output"
-msgstr ""
+msgstr "Criar nova saída de produção"
 
 #: build/templates/build/detail.html:241
 msgid "New Build Output"
-msgstr ""
+msgstr "Nova saída de produção"
 
 #: build/templates/build/detail.html:255
 msgid "Output Actions"
-msgstr ""
+msgstr "Ações de saídas"
 
 #: build/templates/build/detail.html:260
 msgid "Complete selected build outputs"
-msgstr ""
+msgstr "Concluir saídas de produções selecionados"
 
 #: build/templates/build/detail.html:261
 msgid "Complete outputs"
-msgstr ""
+msgstr "Saídas concluídas"
 
 #: build/templates/build/detail.html:265
 msgid "Delete selected build outputs"
-msgstr ""
+msgstr "Excluir saídas de produções selecionados"
 
 #: build/templates/build/detail.html:266
 msgid "Delete outputs"
-msgstr ""
+msgstr "Exlcuir saídas"
 
 #: build/templates/build/detail.html:274
 #: stock/templates/stock/location.html:234 templates/stock_table.html:27
 msgid "Printing Actions"
-msgstr ""
+msgstr "Ações de impressão"
 
 #: build/templates/build/detail.html:278 build/templates/build/detail.html:279
 #: stock/templates/stock/location.html:238 templates/stock_table.html:31
 msgid "Print labels"
-msgstr ""
+msgstr "Imprimir etiquetas"
 
 #: build/templates/build/detail.html:296
 msgid "Completed Build Outputs"
-msgstr ""
+msgstr "Saídas de Produção concluídas"
 
 #: build/templates/build/detail.html:308 build/templates/build/sidebar.html:19
 #: company/templates/company/detail.html:200
@@ -1668,145 +1669,145 @@ msgstr ""
 #: part/templates/part/part_sidebar.html:61 stock/templates/stock/item.html:117
 #: stock/templates/stock/stock_sidebar.html:23
 msgid "Attachments"
-msgstr ""
+msgstr "Anexos"
 
 #: build/templates/build/detail.html:323
 msgid "Build Notes"
-msgstr ""
+msgstr "Notas de produção"
 
 #: build/templates/build/detail.html:506
 msgid "Allocation Complete"
-msgstr ""
+msgstr "Alocação Concluída"
 
 #: build/templates/build/detail.html:507
 msgid "All untracked stock items have been allocated"
-msgstr ""
+msgstr "Todos os itens não rastreáveis foram alocados"
 
 #: build/templates/build/index.html:18 part/templates/part/detail.html:340
 msgid "New Build Order"
-msgstr ""
+msgstr "Novo Pedido de Produção"
 
 #: build/templates/build/index.html:37 build/templates/build/index.html:38
 msgid "Print Build Orders"
-msgstr ""
+msgstr "Imprimir Pedidos de Produção"
 
 #: build/templates/build/sidebar.html:5
 msgid "Build Order Details"
-msgstr ""
+msgstr "Detalhes do Pedido de Produção"
 
 #: build/templates/build/sidebar.html:12
 msgid "Incomplete Outputs"
-msgstr ""
+msgstr "Saídas Incompletas"
 
 #: build/templates/build/sidebar.html:15
 msgid "Completed Outputs"
-msgstr ""
+msgstr "Saídas Concluídas"
 
 #: common/files.py:62
 msgid "Unsupported file format: {ext.upper()}"
-msgstr ""
+msgstr "Formato de arquivo não suportado: {ext.upper()}"
 
 #: common/files.py:64
 msgid "Error reading file (invalid encoding)"
-msgstr ""
+msgstr "Erro ao ler arquivo (codificação inválida)"
 
 #: common/files.py:69
 msgid "Error reading file (invalid format)"
-msgstr ""
+msgstr "Erro ao ler arquivo (formato inválido)"
 
 #: common/files.py:71
 msgid "Error reading file (incorrect dimension)"
-msgstr ""
+msgstr "Erro ao ler o arquivo (dimensão incorreta)"
 
 #: common/files.py:73
 msgid "Error reading file (data could be corrupted)"
-msgstr ""
+msgstr "Erro ao ler o arquivo (dados podem estar corrompidos)"
 
 #: common/forms.py:13
 msgid "File"
-msgstr ""
+msgstr "Arquivo"
 
 #: common/forms.py:14
 msgid "Select file to upload"
-msgstr ""
+msgstr "Selecione um arquivo para carregar"
 
 #: common/forms.py:28
 msgid "{name.title()} File"
-msgstr ""
+msgstr "Arquivo {name.title()}"
 
 #: common/forms.py:29
 #, python-brace-format
 msgid "Select {name} file to upload"
-msgstr ""
+msgstr "Selecione {name} arquivo para carregar"
 
 #: common/models.py:66
 msgid "Updated"
-msgstr ""
+msgstr "Atualizado"
 
 #: common/models.py:67
 msgid "Timestamp of last update"
-msgstr ""
+msgstr "Tempo da última atualização"
 
 #: common/models.py:500
 msgid "Settings key (must be unique - case insensitive)"
-msgstr ""
+msgstr "Senha de configurações (deve ser única — diferencia maiúsculas de minúsculas)"
 
 #: common/models.py:502
 msgid "Settings value"
-msgstr ""
+msgstr "Valor da Configuração"
 
 #: common/models.py:543
 msgid "Chosen value is not a valid option"
-msgstr ""
+msgstr "Valor escolhido não é uma opção válida"
 
 #: common/models.py:560
 msgid "Value must be a boolean value"
-msgstr ""
+msgstr "Valor deve ser um valor booleano"
 
 #: common/models.py:571
 msgid "Value must be an integer value"
-msgstr ""
+msgstr "Valor deve ser um número inteiro"
 
 #: common/models.py:616
 msgid "Key string must be unique"
-msgstr ""
+msgstr "A senha deve ser diferenciada"
 
 #: common/models.py:811
 msgid "No group"
-msgstr ""
+msgstr "Nenhum grupo"
 
 #: common/models.py:836
 msgid "An empty domain is not allowed."
-msgstr ""
+msgstr "Um domínio vazio não é permitido."
 
 #: common/models.py:838
 #, python-brace-format
 msgid "Invalid domain name: {domain}"
-msgstr ""
+msgstr "Nome de domínio inválido: {domain}"
 
 #: common/models.py:895
 msgid "Restart required"
-msgstr ""
+msgstr "Reinicialização necessária"
 
 #: common/models.py:896
 msgid "A setting has been changed which requires a server restart"
-msgstr ""
+msgstr "Uma configuração que requer uma reinicialização do servidor foi alterada"
 
 #: common/models.py:903
 msgid "Server Instance Name"
-msgstr ""
+msgstr "Nome da Instância do Servidor"
 
 #: common/models.py:905
 msgid "String descriptor for the server instance"
-msgstr ""
+msgstr "Descritor de ‘strings’ para a instância do servidor"
 
 #: common/models.py:910
 msgid "Use instance name"
-msgstr ""
+msgstr "Usar nome da instância"
 
 #: common/models.py:911
 msgid "Use the instance name in the title-bar"
-msgstr ""
+msgstr "Usar o nome da instância na barra de título"
 
 #: common/models.py:917
 msgid "Restrict showing `about`"
@@ -2017,127 +2018,127 @@ msgstr ""
 #: templates/js/translated/table_filters.js:200
 #: templates/js/translated/table_filters.js:502
 msgid "Assembly"
-msgstr ""
+msgstr "Montagem"
 
 #: common/models.py:1118
 msgid "Parts can be assembled from other components by default"
-msgstr ""
+msgstr "Peças podem ser montadas a partir de outros componentes por padrão"
 
 #: common/models.py:1124 part/admin.py:52 part/models.py:933
 #: templates/js/translated/table_filters.js:510
 msgid "Component"
-msgstr ""
+msgstr "Componente"
 
 #: common/models.py:1125
 msgid "Parts can be used as sub-components by default"
-msgstr ""
+msgstr "Peças podem ser usadas como sub-componentes por padrão"
 
 #: common/models.py:1131 part/admin.py:53 part/models.py:944
 msgid "Purchaseable"
-msgstr ""
+msgstr "Comprável"
 
 #: common/models.py:1132
 msgid "Parts are purchaseable by default"
-msgstr ""
+msgstr "Peças são compráveis por padrão"
 
 #: common/models.py:1138 part/admin.py:54 part/models.py:949
 #: templates/js/translated/table_filters.js:531
 msgid "Salable"
-msgstr ""
+msgstr "Vendível"
 
 #: common/models.py:1139
 msgid "Parts are salable by default"
-msgstr ""
+msgstr "Peças vão vendíveis por padrão"
 
 #: common/models.py:1145 part/admin.py:56 part/models.py:939
 #: templates/js/translated/table_filters.js:46
 #: templates/js/translated/table_filters.js:120
 #: templates/js/translated/table_filters.js:547
 msgid "Trackable"
-msgstr ""
+msgstr "Rastreável"
 
 #: common/models.py:1146
 msgid "Parts are trackable by default"
-msgstr ""
+msgstr "Peças vão rastreáveis por padrão"
 
 #: common/models.py:1152 part/admin.py:57 part/models.py:959
 #: part/templates/part/part_base.html:156
 #: templates/js/translated/table_filters.js:42
 #: templates/js/translated/table_filters.js:551
 msgid "Virtual"
-msgstr ""
+msgstr "Virtual"
 
 #: common/models.py:1153
 msgid "Parts are virtual by default"
-msgstr ""
+msgstr "Peças são virtuais por padrão"
 
 #: common/models.py:1159
 msgid "Show Import in Views"
-msgstr ""
+msgstr "Mostrar Importações em Visualizações"
 
 #: common/models.py:1160
 msgid "Display the import wizard in some part views"
-msgstr ""
+msgstr "Exibir o assistente de importação em algumas visualizações de partes"
 
 #: common/models.py:1166
 msgid "Show related parts"
-msgstr ""
+msgstr "Mostra peças relacionadas"
 
 #: common/models.py:1167
 msgid "Display related parts for a part"
-msgstr ""
+msgstr "Mostrar peças relacionadas para uma peça"
 
 #: common/models.py:1173
 msgid "Initial Stock Data"
-msgstr ""
+msgstr "Dados Iniciais de Estoque"
 
 #: common/models.py:1174
 msgid "Allow creation of initial stock when adding a new part"
-msgstr ""
+msgstr "Permitir Criação de estoque inicial quando adicional uma nova peça"
 
 #: common/models.py:1180 templates/js/translated/part.js:74
 msgid "Initial Supplier Data"
-msgstr ""
+msgstr "Dados Iniciais de Fornecedor"
 
 #: common/models.py:1181
 msgid "Allow creation of initial supplier data when adding a new part"
-msgstr ""
+msgstr "Permitir criação de dados iniciais de fornecedor quando adicionar uma nova peça"
 
 #: common/models.py:1187
 msgid "Part Name Display Format"
-msgstr ""
+msgstr "Formato de Exibição do Nome da Peça"
 
 #: common/models.py:1188
 msgid "Format to display the part name"
-msgstr ""
+msgstr "Formato para exibir o nome da peça"
 
 #: common/models.py:1195
 msgid "Part Category Default Icon"
-msgstr ""
+msgstr "Ícone de Categoria de Peça Padrão"
 
 #: common/models.py:1196
 msgid "Part category default icon (empty means no icon)"
-msgstr ""
+msgstr "Ícone padrão de categoria de peça (vazio significa sem ícone)"
 
 #: common/models.py:1201
 msgid "Pricing Decimal Places"
-msgstr ""
+msgstr "Casas decimais de preço"
 
 #: common/models.py:1202
 msgid "Number of decimal places to display when rendering pricing data"
-msgstr ""
+msgstr "Número de casas decimais a exibir quando renderizar dados de preços"
 
 #: common/models.py:1212
 msgid "Use Supplier Pricing"
-msgstr ""
+msgstr "Usar Preços do Fornecedor"
 
 #: common/models.py:1213
 msgid "Include supplier price breaks in overall pricing calculations"
-msgstr ""
+msgstr "Incluir quebras de preço do fornecedor nos cálculos de preços globais"
 
 #: common/models.py:1219
 msgid "Purchase History Override"
-msgstr ""
+msgstr "Sobrescrever histórico de compra"
 
 #: common/models.py:1220
 msgid "Historical purchase order pricing overrides supplier price breaks"
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr "Situação do pedido de compra"
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
@@ -11724,7 +11741,7 @@ msgstr ""
 
 #: users/models.py:222
 msgid "Group"
-msgstr ""
+msgstr "Grupo"
 
 #: users/models.py:225
 msgid "View"
diff --git a/InvenTree/locale/ru/LC_MESSAGES/django.po b/InvenTree/locale/ru/LC_MESSAGES/django.po
index 5a567935e5..c2034a056a 100644
--- a/InvenTree/locale/ru/LC_MESSAGES/django.po
+++ b/InvenTree/locale/ru/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Russian\n"
 "Language: ru_RU\n"
@@ -31,7 +31,7 @@ msgstr "Введите дату"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Введите дату"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Заметки"
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "недопустимое количество"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Выберите файл для вложения"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Ссылка"
 
@@ -305,7 +305,7 @@ msgstr "Название"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Название"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "Потерян"
 msgid "Returned"
 msgstr "Возвращено"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Доставлено"
 
@@ -790,16 +790,16 @@ msgstr "Неверный выбор для родительской сборки
 msgid "Build Order Reference"
 msgstr "Ссылка на заказ"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Отсылка"
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Расположение источника"
 
@@ -910,7 +911,7 @@ msgstr "Статус сборки"
 msgid "Build status code"
 msgstr "Код статуса сборки"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Код партии"
@@ -919,12 +920,12 @@ msgstr "Код партии"
 msgid "Batch code for this build output"
 msgstr "Код партии для этого вывода сборки"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Дата создания"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Целевая дата завершения"
 
@@ -932,7 +933,7 @@ msgstr "Целевая дата завершения"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Целевая дата для сборки. Сборка будет просрочена после этой даты."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Дата завершения"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Пользователь, выпустивший этот заказ на сборку"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Ответственный"
@@ -1014,11 +1015,11 @@ msgstr "Элемент сборки должен указать вывод сб
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Предмет на складе перераспределен"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Выделенное количество должно быть больше нуля"
 
@@ -1040,16 +1041,16 @@ msgstr "Сборка"
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Исходный складской предмет"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Исходный складской предмет"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr "Введите количество для вывода сборки"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Статус"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr "Компонент должен быть в наличии"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "Превышено доступное количество ({q})"
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Целевая дата"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Завершённые"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Заказ покупателя"
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Назначение"
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Выберите производителя"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Выберите поставщика"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Заметка"
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr "Скачать изображение по ссылке"
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Заказ на закупку"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr "Общая стоимость"
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "Компания, в которой детали заказываются"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "Компания, которой детали продаются"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Закупочная цена"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "Цена продажи"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr "Курс покупки валюты"
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr "Введите код партии для поступающих единиц хранения"
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr "Для отслеживаемых деталей должно быть указано целочисленное количество"
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr "Курс продажи валюты"
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr "Шаг %(step)s из %(count)s"
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr "Сборки"
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "Доступный запас"
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Серийный номер"
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr "Настройки меток"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr "Настройки входа"
 
@@ -7922,8 +7957,9 @@ msgid "Open in new tab"
 msgstr "Открыть в новой вкладке"
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
-msgstr ""
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
+msgstr "Настройки уведомлений"
 
 #: templates/InvenTree/settings/notifications.html:18
 msgid "Slug"
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr "Настройки плагинов"
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "Настройки пользователя"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Настройки учётной записи"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Настройки отображения"
+msgid "Display"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr "Главная страница"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Настройки поиска"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "Поиск"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr "Глобальные настройки"
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr "Настройки заказов на продажу"
 msgid "Stock Settings"
 msgstr "Настройки склада"
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Настройки учётной записи"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr "Вы действительно хотите удалить выбранный адрес электронной почты?"
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Настройки отображения"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Настройки темы"
@@ -8459,9 +8503,9 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr "Настройки главной страницы"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr "Настройки уведомлений"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Настройки поиска"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr "Заказов на закупку не найдено"
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr "Общая стоимость"
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr "Заказы на продажу не найдены"
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "Подтвердите выделение запасов"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr "из"
 msgid "rows"
 msgstr "строк"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "Поиск"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr "Ничего не найдено"
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/sl/LC_MESSAGES/django.po b/InvenTree/locale/sl/LC_MESSAGES/django.po
index 3dbe938144..7a8c9b92d9 100644
--- a/InvenTree/locale/sl/LC_MESSAGES/django.po
+++ b/InvenTree/locale/sl/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Slovenian\n"
 "Language: sl_SI\n"
@@ -31,7 +31,7 @@ msgstr "Vnesi datum"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Vnesi datum"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Zapiski"
@@ -130,7 +130,7 @@ msgstr "Oddaljeni server vrnil prazen odziv"
 msgid "Supplied URL is not a valid image file"
 msgstr "Podani URL ni veljavna slikovna datoteka"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Podana napačna količina"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Izberite prilogo"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Povezava"
 
@@ -305,7 +305,7 @@ msgstr "Ime"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Ime"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "Podatki čtrne kode"
 msgid "Third party barcode data"
 msgstr "Podatki črtne kode tretje osebe"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "Oznaka črtne kode"
 
@@ -592,8 +592,8 @@ msgstr "Izgubljeno"
 msgid "Returned"
 msgstr "Vrnjeno"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Poslano"
 
@@ -790,16 +790,16 @@ msgstr "Neveljavna izbira za nadrejeno izgradnjo"
 msgid "Build Order Reference"
 msgstr "Referenca naloga izgradnje"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referenca"
 
@@ -818,7 +818,7 @@ msgstr "Nalog izgradnje na katerega se ta izgradnaj nanaša"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Nalog izgradnje na katerega se ta izgradnaj nanaša"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Nalog izgradnje na katerega se ta izgradnaj nanaša"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Dobavnica na katero se navezuje ta izgradnja"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Lokacija vira"
 
@@ -910,7 +911,7 @@ msgstr "Status izgradnje"
 msgid "Build status code"
 msgstr "Koda statusa izgradnje"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Številka serije"
@@ -919,12 +920,12 @@ msgstr "Številka serije"
 msgid "Batch code for this build output"
 msgstr "Številka serije za to izgradnjo"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Datum ustvarjenja"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Rok dokončanja"
 
@@ -932,7 +933,7 @@ msgstr "Rok dokončanja"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Rok končanja izdelave. Izdelava po tem datumu bo v zamudi po tem datumu."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Datom končanja"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Uporabnik, ki je izdal nalog za izgradnjo"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Odgovoren"
@@ -1014,11 +1015,11 @@ msgstr "Izdelana postavka mora imeti izgradnjo, če je glavni del označen kot s
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "Prestavljena zaloga ({q}) ne sme presegati zaloge ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Preveč zaloge je prestavljene"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Prestavljena količina mora biti večja od 0"
 
@@ -1040,16 +1041,16 @@ msgstr "Izdelava"
 msgid "Build to allocate parts"
 msgstr "Izdelaj da prestaviš dele"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Izvorna postavka zaloge"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Izvorna postavka zaloge"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr ""
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/sv/LC_MESSAGES/django.po b/InvenTree/locale/sv/LC_MESSAGES/django.po
index 0035ba59c6..200c224000 100644
--- a/InvenTree/locale/sv/LC_MESSAGES/django.po
+++ b/InvenTree/locale/sv/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Swedish\n"
 "Language: sv_SE\n"
@@ -31,7 +31,7 @@ msgstr "Ange datum"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Ange datum"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Anteeckningar"
@@ -130,7 +130,7 @@ msgstr "Fjärrservern returnerade tomt svar"
 msgid "Supplied URL is not a valid image file"
 msgstr "Angiven URL är inte en giltig bildfil"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Ogiltigt antal angivet"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Välj fil att bifoga"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Länk"
 
@@ -305,7 +305,7 @@ msgstr "Namn"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Namn"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "Förlorad"
 msgid "Returned"
 msgstr "Återlämnad"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Skickad"
 
@@ -790,16 +790,16 @@ msgstr "Ogiltigt val för överordnad bygge"
 msgid "Build Order Reference"
 msgstr "Byggorderreferens"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referens"
 
@@ -818,7 +818,7 @@ msgstr "Byggorder till vilken detta bygge är tilldelad"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Byggorder till vilken detta bygge är tilldelad"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Byggorder till vilken detta bygge är tilldelad"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Försäljningsorder till vilken detta bygge allokeras"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Källa Plats"
 
@@ -910,7 +911,7 @@ msgstr "Byggstatus"
 msgid "Build status code"
 msgstr "Bygg statuskod"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Batchkod"
@@ -919,12 +920,12 @@ msgstr "Batchkod"
 msgid "Batch code for this build output"
 msgstr "Batch-kod för denna byggutdata"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Skapad"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Datum för slutförande"
 
@@ -932,7 +933,7 @@ msgstr "Datum för slutförande"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Måldatum för färdigställande. Byggandet kommer att förfallas efter detta datum."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Slutförandedatum"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Användare som utfärdade denna byggorder"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Ansvarig"
@@ -1014,11 +1015,11 @@ msgstr "Byggobjekt måste ange en byggutgång, eftersom huvuddelen är markerad
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "Tilldelad kvantitet ({q}) får inte överstiga tillgängligt lagersaldo ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Lagerposten är överallokerad"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Allokeringsmängden måste vara större än noll"
 
@@ -1040,16 +1041,16 @@ msgstr "Bygg"
 msgid "Build to allocate parts"
 msgstr "Bygg för att allokera delar"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Källa lagervara"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Källa lagervara"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Status"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "Acceptera ofullständig"
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Måldatum"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Slutförd"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Försäljningsorder"
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Mål"
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/th/LC_MESSAGES/django.po b/InvenTree/locale/th/LC_MESSAGES/django.po
index 928f7ee8c0..1b6abfb1ab 100644
--- a/InvenTree/locale/th/LC_MESSAGES/django.po
+++ b/InvenTree/locale/th/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Thai\n"
 "Language: th_TH\n"
@@ -31,7 +31,7 @@ msgstr "ป้อนวันที่"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "ป้อนวันที่"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "หมายเหตุ"
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "ปริมาณสินค้าไม่ถูกต้อง"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "เลือกไฟล์ที่ต้องการแนบ"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "ลิงก์"
 
@@ -305,7 +305,7 @@ msgstr "ชื่อ"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "ชื่อ"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "ข้อมูลบาร์โค้ด"
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "สูญหาย"
 msgid "Returned"
 msgstr "ส่งคืนแล้ว"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "จัดส่งแล้ว"
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr ""
 
@@ -910,7 +911,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr ""
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr ""
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr ""
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr ""
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "สถานะ"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr ""
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,8 +8237,10 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr ""
@@ -8459,8 +8503,8 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
 msgstr ""
 
 #: templates/about.html:9
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/tr/LC_MESSAGES/django.po b/InvenTree/locale/tr/LC_MESSAGES/django.po
index 9e46de5b44..9afe47f0c7 100644
--- a/InvenTree/locale/tr/LC_MESSAGES/django.po
+++ b/InvenTree/locale/tr/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Turkish\n"
 "Language: tr_TR\n"
@@ -31,7 +31,7 @@ msgstr "Tarih giriniz"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "Tarih giriniz"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "Notlar"
@@ -130,7 +130,7 @@ msgstr "Uzak sunucu boş cevap döndü"
 msgid "Supplied URL is not a valid image file"
 msgstr "Sağlanan URL geçerli bir resim dosyası değil"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "Geçersiz veri sağlandı"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "Eklenecek dosyayı seç"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "Bağlantı"
 
@@ -305,7 +305,7 @@ msgstr "Adı"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "Adı"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr "Kayıp"
 msgid "Returned"
 msgstr "İade"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "Sevk edildi"
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr "Yapım İşi Emri Referansı"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "Referans"
 
@@ -818,7 +818,7 @@ msgstr "Bu yapım işinin tahsis edildiği yapım işi emri"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "Bu yapım işinin tahsis edildiği yapım işi emri"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "Bu yapım işinin tahsis edildiği yapım işi emri"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "Bu yapım işinin tahsis edildiği satış emri"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "Kaynak Konum"
 
@@ -910,7 +911,7 @@ msgstr "Yapım İşi Durumu"
 msgid "Build status code"
 msgstr "Yapım işi durum kodu"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "Sıra numarası"
@@ -919,12 +920,12 @@ msgstr "Sıra numarası"
 msgid "Batch code for this build output"
 msgstr "Yapım işi çıktısı için sıra numarası"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "Oluşturulma tarihi"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "Hedef tamamlama tarihi"
 
@@ -932,7 +933,7 @@ msgstr "Hedef tamamlama tarihi"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "Yapım işinin tamamlanması için hedef tarih. Bu tarihten sonra yapım işi gecikmiş olacak."
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Tamamlama tarihi"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "Bu yapım işi emrini veren kullanıcı"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "Sorumlu"
@@ -1014,11 +1015,11 @@ msgstr "Ana parça izlenebilir olarak işaretlendiğinden, yapım işi çıktıs
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "Stok kalemi fazladan tahsis edilmiş"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "Tahsis edilen miktar sıfırdan büyük olmalıdır"
 
@@ -1040,16 +1041,16 @@ msgstr "Yapım İşi"
 msgid "Build to allocate parts"
 msgstr "Yapım işi için tahsis edilen parçalar"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "Kaynak stok kalemi"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "Kaynak stok kalemi"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr "Yapım işi çıktısı için miktarını girin"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Durum"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr "Gerekli stok tamamen tahsis edilemedi"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "Stok, yapım işi emri için tamamen tahsis edilemedi"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "Hedeflenen tarih"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Tamamlandı"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "Sipariş Emri"
 
@@ -1512,8 +1513,8 @@ msgstr "Stok Kaynağı"
 msgid "Stock can be taken from any available location."
 msgstr "Stok herhangi bir konumdan alınabilir."
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "Hedef"
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "Üretici seçin"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr "ÜPN"
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "Tedarikçi seçin"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "Not"
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "Sipariş açıklaması"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "Harici sayfaya bağlantı"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "Oluşturan"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "Sipariş notları"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr "Sipariş referansı"
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr ""
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr "Tahsis miktarı stok miktarını aşamaz"
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr "Seri numaralı stok kalemi için miktar bir olmalı"
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr "Stok tahsis miktarını girin"
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr "Birim Maliyeti"
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr "Toplam Maliyet"
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr "İçin Gerekli Olan"
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "Seri Numara"
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr "Giriş"
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,13 +8225,11 @@ msgid "User Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
+msgid "Account"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
+msgid "Display"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
@@ -8203,9 +8237,11 @@ msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Arama Ayarları"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "Arama"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
-msgstr ""
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
+msgstr "Sunucu"
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr ""
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Tema Ayarları"
@@ -8459,9 +8503,9 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr "Ana Sayfa Ayarları"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr ""
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Arama Ayarları"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr "Stok tahsisini düzenle"
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr "Stok tahsisini sil"
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "Parçaları Seçin"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr "Ürünler"
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "Stok tahsisini onayla"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr "Silme İşlemini Onayla"
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr "Seri numaralarını tahsis et"
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr "Seri Numaralarını Tahsis Et"
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr "yüzünden"
 msgid "rows"
 msgstr "satırlar"
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "Arama"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr "Sonuç bulunamadı"
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr "Sunucu"
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr "Sistem adı"
diff --git a/InvenTree/locale/vi/LC_MESSAGES/django.po b/InvenTree/locale/vi/LC_MESSAGES/django.po
index aa296c46bb..831be296e5 100644
--- a/InvenTree/locale/vi/LC_MESSAGES/django.po
+++ b/InvenTree/locale/vi/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Vietnamese\n"
 "Language: vi_VN\n"
@@ -31,7 +31,7 @@ msgstr ""
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr ""
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr ""
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Supplied URL is not a valid image file"
 msgstr ""
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr ""
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr ""
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr ""
 
@@ -305,7 +305,7 @@ msgstr ""
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr ""
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr ""
 msgid "Third party barcode data"
 msgstr ""
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr ""
 
@@ -592,8 +592,8 @@ msgstr ""
 msgid "Returned"
 msgstr ""
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr ""
 
@@ -790,16 +790,16 @@ msgstr ""
 msgid "Build Order Reference"
 msgstr ""
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr ""
 
@@ -818,7 +818,7 @@ msgstr ""
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr ""
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr ""
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr ""
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr ""
 
@@ -910,7 +911,7 @@ msgstr ""
 msgid "Build status code"
 msgstr ""
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr ""
@@ -919,12 +920,12 @@ msgstr ""
 msgid "Batch code for this build output"
 msgstr ""
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr ""
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr ""
 
@@ -932,7 +933,7 @@ msgstr ""
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr ""
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "Ngày hoàn thành"
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr ""
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr ""
@@ -1014,11 +1015,11 @@ msgstr ""
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr ""
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr ""
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr ""
 
@@ -1040,16 +1041,16 @@ msgstr ""
 msgid "Build to allocate parts"
 msgstr ""
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr ""
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr ""
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr ""
 msgid "Enter quantity for build output"
 msgstr ""
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr ""
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr ""
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr ""
 msgid "A list of build outputs must be provided"
 msgstr ""
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr ""
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "Trạng thái"
@@ -1263,7 +1264,7 @@ msgstr ""
 msgid "Required stock has not been fully allocated"
 msgstr ""
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr ""
 
@@ -1300,7 +1301,7 @@ msgstr ""
 msgid "Item must be in stock"
 msgstr ""
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr ""
@@ -1317,7 +1318,7 @@ msgstr ""
 msgid "This stock item has already been allocated to this build output"
 msgstr ""
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr ""
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr ""
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr ""
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "Đã hoàn thành"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr ""
 
@@ -1512,8 +1513,8 @@ msgstr ""
 msgid "Stock can be taken from any available location."
 msgstr ""
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr ""
 
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr ""
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr ""
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr ""
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr ""
 
@@ -3357,7 +3359,7 @@ msgstr ""
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr ""
@@ -3443,12 +3445,12 @@ msgstr ""
 msgid "Delete image"
 msgstr ""
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr ""
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr "Đơn hàng"
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr ""
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr ""
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr ""
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr ""
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr ""
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr ""
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr ""
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr ""
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr ""
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr ""
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr ""
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr ""
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr ""
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr ""
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr ""
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr ""
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr ""
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr ""
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr ""
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "Giá mua"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr ""
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr ""
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr ""
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr ""
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr ""
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr ""
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr ""
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr ""
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr ""
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr ""
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr ""
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr ""
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr ""
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,7 +7957,8 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:18
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "Cài đặt người dùng"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "Cài đặt tài khoản"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "Thiết đặt hiển thị"
+msgid "Display"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "Cài đặt tìm kiếm"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr "Cài đặt toàn cục"
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr ""
 msgid "Stock Settings"
 msgstr ""
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "Cài đặt tài khoản"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "Thiết đặt hiển thị"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "Thiết lập giao diện"
@@ -8459,9 +8503,9 @@ msgstr ""
 msgid "Home Page Settings"
 msgstr "Thiết lập trang chủ"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr ""
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "Cài đặt tìm kiếm"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr ""
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr ""
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr ""
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""
diff --git a/InvenTree/locale/zh/LC_MESSAGES/django.po b/InvenTree/locale/zh/LC_MESSAGES/django.po
index 29042ba0a4..b4e69cf67b 100644
--- a/InvenTree/locale/zh/LC_MESSAGES/django.po
+++ b/InvenTree/locale/zh/LC_MESSAGES/django.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inventree\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-02 03:51+0000\n"
-"PO-Revision-Date: 2023-03-02 23:18\n"
+"POT-Creation-Date: 2023-03-05 13:01+0000\n"
+"PO-Revision-Date: 2023-03-06 11:38\n"
 "Last-Translator: \n"
 "Language-Team: Chinese Simplified\n"
 "Language: zh_CN\n"
@@ -31,7 +31,7 @@ msgstr "输入日期"
 
 #: InvenTree/fields.py:204 build/serializers.py:389
 #: build/templates/build/sidebar.html:21 company/models.py:549
-#: company/templates/company/sidebar.html:25 order/models.py:946
+#: company/templates/company/sidebar.html:25 order/models.py:990
 #: order/templates/order/po_sidebar.html:11
 #: order/templates/order/so_sidebar.html:17 part/admin.py:41
 #: part/models.py:2919 part/templates/part/part_sidebar.html:63
@@ -42,9 +42,9 @@ msgstr "输入日期"
 #: stock/templates/stock/stock_sidebar.html:25
 #: templates/js/translated/barcode.js:131 templates/js/translated/bom.js:1219
 #: templates/js/translated/company.js:1077
-#: templates/js/translated/order.js:2532 templates/js/translated/order.js:2664
-#: templates/js/translated/order.js:3157 templates/js/translated/order.js:4099
-#: templates/js/translated/order.js:4472 templates/js/translated/part.js:973
+#: templates/js/translated/order.js:2543 templates/js/translated/order.js:2675
+#: templates/js/translated/order.js:3179 templates/js/translated/order.js:4121
+#: templates/js/translated/order.js:4494 templates/js/translated/part.js:973
 #: templates/js/translated/stock.js:1456 templates/js/translated/stock.js:2074
 msgid "Notes"
 msgstr "备注"
@@ -130,7 +130,7 @@ msgstr "远程服务器返回了空响应"
 msgid "Supplied URL is not a valid image file"
 msgstr "提供的 URL 不是一个有效的图片文件"
 
-#: InvenTree/helpers.py:597 order/models.py:328 order/models.py:495
+#: InvenTree/helpers.py:597 order/models.py:347 order/models.py:514
 msgid "Invalid quantity provided"
 msgstr "提供的数量无效"
 
@@ -213,13 +213,13 @@ msgid "Select file to attach"
 msgstr "选择附件"
 
 #: InvenTree/models.py:416 common/models.py:2542 company/models.py:129
-#: company/models.py:300 company/models.py:536 order/models.py:84
-#: order/models.py:1284 part/admin.py:39 part/models.py:835
+#: company/models.py:300 company/models.py:536 order/models.py:88
+#: order/models.py:1338 part/admin.py:39 part/models.py:835
 #: part/templates/part/part_scheduling.html:11
 #: report/templates/report/inventree_build_order_base.html:164
 #: stock/admin.py:120 templates/js/translated/company.js:746
 #: templates/js/translated/company.js:1066
-#: templates/js/translated/order.js:3146 templates/js/translated/part.js:1990
+#: templates/js/translated/order.js:3168 templates/js/translated/part.js:1990
 msgid "Link"
 msgstr "链接"
 
@@ -305,7 +305,7 @@ msgstr "名称"
 #: company/models.py:542 company/templates/company/company_base.html:72
 #: company/templates/company/manufacturer_part.html:75
 #: company/templates/company/supplier_part.html:108 label/models.py:108
-#: order/models.py:82 part/admin.py:194 part/admin.py:275 part/models.py:802
+#: order/models.py:86 part/admin.py:194 part/admin.py:275 part/models.py:802
 #: part/models.py:3271 part/templates/part/category.html:81
 #: part/templates/part/part_base.html:172
 #: part/templates/part/part_scheduling.html:12 report/models.py:165
@@ -319,8 +319,8 @@ msgstr "名称"
 #: templates/js/translated/build.js:2628 templates/js/translated/company.js:499
 #: templates/js/translated/company.js:757
 #: templates/js/translated/company.js:1041
-#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2366
-#: templates/js/translated/order.js:2934 templates/js/translated/part.js:1150
+#: templates/js/translated/order.js:2122 templates/js/translated/order.js:2377
+#: templates/js/translated/order.js:2945 templates/js/translated/part.js:1150
 #: templates/js/translated/part.js:1600 templates/js/translated/part.js:1874
 #: templates/js/translated/part.js:2431 templates/js/translated/part.js:2528
 #: templates/js/translated/stock.js:1435 templates/js/translated/stock.js:1823
@@ -349,7 +349,7 @@ msgstr "条码数据"
 msgid "Third party barcode data"
 msgstr "第三方条形码数据"
 
-#: InvenTree/models.py:702 order/serializers.py:470
+#: InvenTree/models.py:702 order/serializers.py:472
 msgid "Barcode Hash"
 msgstr "条码哈希"
 
@@ -592,8 +592,8 @@ msgstr "丢失"
 msgid "Returned"
 msgstr "已退回"
 
-#: InvenTree/status_codes.py:141 order/models.py:1167
-#: templates/js/translated/order.js:3734 templates/js/translated/order.js:4074
+#: InvenTree/status_codes.py:141 order/models.py:1221
+#: templates/js/translated/order.js:3756 templates/js/translated/order.js:4096
 msgid "Shipped"
 msgstr "已发货"
 
@@ -790,16 +790,16 @@ msgstr "上级生产选项无效"
 msgid "Build Order Reference"
 msgstr "相关生产订单"
 
-#: build/models.py:156 order/models.py:240 order/models.py:655
-#: order/models.py:944 part/admin.py:277 part/models.py:3528
+#: build/models.py:156 order/models.py:259 order/models.py:674
+#: order/models.py:988 part/admin.py:277 part/models.py:3528
 #: part/templates/part/upload_bom.html:54
 #: report/templates/report/inventree_bill_of_materials_report.html:139
-#: report/templates/report/inventree_po_report.html:91
-#: report/templates/report/inventree_so_report.html:92
+#: report/templates/report/inventree_po_report_base.html:90
+#: report/templates/report/inventree_so_report_base.html:91
 #: templates/js/translated/bom.js:739 templates/js/translated/bom.js:915
-#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2397
-#: templates/js/translated/order.js:2613 templates/js/translated/order.js:3938
-#: templates/js/translated/order.js:4421 templates/js/translated/pricing.js:370
+#: templates/js/translated/build.js:1869 templates/js/translated/order.js:2408
+#: templates/js/translated/order.js:2624 templates/js/translated/order.js:3960
+#: templates/js/translated/order.js:4443 templates/js/translated/pricing.js:370
 msgid "Reference"
 msgstr "引用"
 
@@ -818,7 +818,7 @@ msgstr "此次生产匹配的订单"
 
 #: build/models.py:181 build/templates/build/build_base.html:80
 #: build/templates/build/detail.html:29 company/models.py:715
-#: order/models.py:1040 order/models.py:1151 order/models.py:1152
+#: order/models.py:1084 order/models.py:1200 order/models.py:1201
 #: part/models.py:382 part/models.py:2779 part/models.py:2893
 #: part/models.py:3033 part/models.py:3052 part/models.py:3071
 #: part/models.py:3092 part/models.py:3184 part/models.py:3305
@@ -830,9 +830,10 @@ msgstr "此次生产匹配的订单"
 #: report/templates/report/inventree_bill_of_materials_report.html:110
 #: report/templates/report/inventree_bill_of_materials_report.html:137
 #: report/templates/report/inventree_build_order_base.html:109
-#: report/templates/report/inventree_po_report.html:89
-#: report/templates/report/inventree_so_report.html:90 stock/serializers.py:144
-#: stock/serializers.py:482 templates/InvenTree/search.html:82
+#: report/templates/report/inventree_po_report_base.html:89
+#: report/templates/report/inventree_so_report_base.html:90
+#: stock/serializers.py:144 stock/serializers.py:482
+#: templates/InvenTree/search.html:82
 #: templates/email/build_order_completed.html:17
 #: templates/email/build_order_required_stock.html:17
 #: templates/email/low_stock_notification.html:16
@@ -846,8 +847,8 @@ msgstr "此次生产匹配的订单"
 #: templates/js/translated/company.js:698
 #: templates/js/translated/company.js:959 templates/js/translated/order.js:111
 #: templates/js/translated/order.js:1264 templates/js/translated/order.js:1768
-#: templates/js/translated/order.js:2351 templates/js/translated/order.js:3289
-#: templates/js/translated/order.js:3685 templates/js/translated/order.js:3922
+#: templates/js/translated/order.js:2362 templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3707 templates/js/translated/order.js:3944
 #: templates/js/translated/part.js:1585 templates/js/translated/part.js:1657
 #: templates/js/translated/part.js:1851 templates/js/translated/pricing.js:353
 #: templates/js/translated/stock.js:624 templates/js/translated/stock.js:791
@@ -870,7 +871,7 @@ msgid "SalesOrder to which this build is allocated"
 msgstr "此次生产匹配的销售订单"
 
 #: build/models.py:203 build/serializers.py:825
-#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3277
+#: templates/js/translated/build.js:2223 templates/js/translated/order.js:3299
 msgid "Source Location"
 msgstr "来源地点"
 
@@ -910,7 +911,7 @@ msgstr "生产状态"
 msgid "Build status code"
 msgstr "生产状态代码"
 
-#: build/models.py:246 build/serializers.py:226 order/serializers.py:448
+#: build/models.py:246 build/serializers.py:226 order/serializers.py:450
 #: stock/models.py:732 templates/js/translated/order.js:1626
 msgid "Batch Code"
 msgstr "批量代码"
@@ -919,12 +920,12 @@ msgstr "批量代码"
 msgid "Batch code for this build output"
 msgstr "此生产产出的批量代码"
 
-#: build/models.py:253 order/models.py:86 part/models.py:971
-#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2947
+#: build/models.py:253 order/models.py:90 part/models.py:971
+#: part/templates/part/part_base.html:318 templates/js/translated/order.js:2958
 msgid "Creation Date"
 msgstr "创建日期"
 
-#: build/models.py:257 order/models.py:685
+#: build/models.py:257 order/models.py:704
 msgid "Target completion date"
 msgstr "预计完成日期"
 
@@ -932,7 +933,7 @@ msgstr "预计完成日期"
 msgid "Target date for build completion. Build will be overdue after this date."
 msgstr "生产完成的目标日期。生产将在此日期之后逾期。"
 
-#: build/models.py:261 order/models.py:291
+#: build/models.py:261 order/models.py:310
 #: templates/js/translated/build.js:2724
 msgid "Completion Date"
 msgstr "完成日期："
@@ -950,12 +951,12 @@ msgid "User who issued this build order"
 msgstr "发布此生产订单的用户"
 
 #: build/models.py:284 build/templates/build/build_base.html:193
-#: build/templates/build/detail.html:122 order/models.py:100
+#: build/templates/build/detail.html:122 order/models.py:104
 #: order/templates/order/order_base.html:185
 #: order/templates/order/sales_order_base.html:183 part/models.py:975
 #: part/templates/part/part_base.html:398
 #: report/templates/report/inventree_build_order_base.html:158
-#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2156
+#: templates/js/translated/build.js:2696 templates/js/translated/order.js:2167
 #: templates/js/translated/table_filters.js:363
 msgid "Responsible"
 msgstr "责任人"
@@ -1014,11 +1015,11 @@ msgstr "生产项必须指定生产产出，因为主部件已经被标记为可
 msgid "Allocated quantity ({q}) must not exceed available stock quantity ({a})"
 msgstr "分配数量 ({q}) 不得超过可用库存数量 ({a})"
 
-#: build/models.py:1207 order/models.py:1418
+#: build/models.py:1207 order/models.py:1472
 msgid "Stock item is over-allocated"
 msgstr "库存物品分配过度！"
 
-#: build/models.py:1213 order/models.py:1421
+#: build/models.py:1213 order/models.py:1475
 msgid "Allocation quantity must be greater than zero"
 msgstr "分配数量必须大于0"
 
@@ -1040,16 +1041,16 @@ msgstr "生产"
 msgid "Build to allocate parts"
 msgstr "生产以分配部件"
 
-#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1008
-#: order/serializers.py:1029 stock/serializers.py:386 stock/serializers.py:739
+#: build/models.py:1362 build/serializers.py:674 order/serializers.py:1011
+#: order/serializers.py:1032 stock/serializers.py:386 stock/serializers.py:739
 #: stock/serializers.py:865 stock/templates/stock/item_base.html:10
 #: stock/templates/stock/item_base.html:23
 #: stock/templates/stock/item_base.html:200
 #: templates/js/translated/build.js:809 templates/js/translated/build.js:814
 #: templates/js/translated/build.js:2237 templates/js/translated/build.js:2809
-#: templates/js/translated/order.js:112 templates/js/translated/order.js:3290
-#: templates/js/translated/order.js:3592 templates/js/translated/order.js:3597
-#: templates/js/translated/order.js:3692 templates/js/translated/order.js:3784
+#: templates/js/translated/order.js:112 templates/js/translated/order.js:3312
+#: templates/js/translated/order.js:3614 templates/js/translated/order.js:3619
+#: templates/js/translated/order.js:3714 templates/js/translated/order.js:3806
 #: templates/js/translated/stock.js:625 templates/js/translated/stock.js:792
 #: templates/js/translated/stock.js:2697
 msgid "Stock Item"
@@ -1062,15 +1063,15 @@ msgstr "源库存项"
 #: build/models.py:1375 build/serializers.py:194
 #: build/templates/build/build_base.html:85
 #: build/templates/build/detail.html:34 common/models.py:2023
-#: order/models.py:937 order/models.py:1462 order/serializers.py:1182
+#: order/models.py:974 order/models.py:1516 order/serializers.py:1185
 #: order/templates/order/order_wizard/match_parts.html:30 part/admin.py:276
 #: part/forms.py:47 part/models.py:2906 part/models.py:3509
 #: part/templates/part/part_pricing.html:16
 #: part/templates/part/upload_bom.html:53
 #: report/templates/report/inventree_bill_of_materials_report.html:138
 #: report/templates/report/inventree_build_order_base.html:113
-#: report/templates/report/inventree_po_report.html:90
-#: report/templates/report/inventree_so_report.html:91
+#: report/templates/report/inventree_po_report_base.html:91
+#: report/templates/report/inventree_so_report_base.html:92
 #: report/templates/report/inventree_test_report_base.html:81
 #: report/templates/report/inventree_test_report_base.html:139
 #: stock/admin.py:103 stock/serializers.py:279
@@ -1085,10 +1086,10 @@ msgstr "源库存项"
 #: templates/js/translated/company.js:1214
 #: templates/js/translated/model_renderers.js:132
 #: templates/js/translated/order.js:128 templates/js/translated/order.js:1267
-#: templates/js/translated/order.js:2403 templates/js/translated/order.js:2619
-#: templates/js/translated/order.js:3291 templates/js/translated/order.js:3611
-#: templates/js/translated/order.js:3698 templates/js/translated/order.js:3790
-#: templates/js/translated/order.js:3944 templates/js/translated/order.js:4427
+#: templates/js/translated/order.js:2414 templates/js/translated/order.js:2630
+#: templates/js/translated/order.js:3313 templates/js/translated/order.js:3633
+#: templates/js/translated/order.js:3720 templates/js/translated/order.js:3812
+#: templates/js/translated/order.js:3966 templates/js/translated/order.js:4449
 #: templates/js/translated/part.js:850 templates/js/translated/part.js:1455
 #: templates/js/translated/part.js:2969 templates/js/translated/pricing.js:365
 #: templates/js/translated/pricing.js:458
@@ -1136,8 +1137,8 @@ msgstr "生产产出未被完成分配"
 msgid "Enter quantity for build output"
 msgstr "输入生产产出数量"
 
-#: build/serializers.py:209 build/serializers.py:694 order/models.py:326
-#: order/serializers.py:321 order/serializers.py:443 part/serializers.py:1071
+#: build/serializers.py:209 build/serializers.py:694 order/models.py:345
+#: order/serializers.py:323 order/serializers.py:445 part/serializers.py:1071
 #: part/serializers.py:1394 stock/models.py:586 stock/models.py:1338
 #: stock/serializers.py:288
 msgid "Quantity must be greater than zero"
@@ -1151,7 +1152,7 @@ msgstr "对于可追踪的部件，需要整数型数值"
 msgid "Integer quantity required, as the bill of materials contains trackable parts"
 msgstr "需要整数型数值，因为BOM包含可追踪的部件"
 
-#: build/serializers.py:233 order/serializers.py:456 order/serializers.py:1186
+#: build/serializers.py:233 order/serializers.py:458 order/serializers.py:1189
 #: stock/serializers.py:297 templates/js/translated/order.js:1637
 #: templates/js/translated/stock.js:303 templates/js/translated/stock.js:497
 msgid "Serial Numbers"
@@ -1177,15 +1178,15 @@ msgstr "以下序列号已存在或无效"
 msgid "A list of build outputs must be provided"
 msgstr "必须提供生产产出列表"
 
-#: build/serializers.py:371 order/serializers.py:429 order/serializers.py:548
+#: build/serializers.py:371 order/serializers.py:431 order/serializers.py:550
 #: part/serializers.py:838 stock/serializers.py:308 stock/serializers.py:443
 #: stock/serializers.py:524 stock/serializers.py:900 stock/serializers.py:1142
 #: stock/templates/stock/item_base.html:391
 #: templates/js/translated/barcode.js:504
 #: templates/js/translated/barcode.js:748 templates/js/translated/build.js:821
 #: templates/js/translated/build.js:1775 templates/js/translated/order.js:1664
-#: templates/js/translated/order.js:3604 templates/js/translated/order.js:3709
-#: templates/js/translated/order.js:3717 templates/js/translated/order.js:3798
+#: templates/js/translated/order.js:3626 templates/js/translated/order.js:3731
+#: templates/js/translated/order.js:3739 templates/js/translated/order.js:3820
 #: templates/js/translated/stock.js:626 templates/js/translated/stock.js:793
 #: templates/js/translated/stock.js:1005 templates/js/translated/stock.js:1931
 #: templates/js/translated/stock.js:2638
@@ -1197,12 +1198,12 @@ msgid "Location for completed build outputs"
 msgstr "已完成生产产出的仓储地点"
 
 #: build/serializers.py:378 build/templates/build/build_base.html:145
-#: build/templates/build/detail.html:62 order/models.py:674
-#: order/serializers.py:466 stock/admin.py:106
+#: build/templates/build/detail.html:62 order/models.py:693
+#: order/serializers.py:468 stock/admin.py:106
 #: stock/templates/stock/item_base.html:424
 #: templates/js/translated/barcode.js:237 templates/js/translated/build.js:2668
 #: templates/js/translated/order.js:1773 templates/js/translated/order.js:2126
-#: templates/js/translated/order.js:2939 templates/js/translated/stock.js:1906
+#: templates/js/translated/order.js:2950 templates/js/translated/stock.js:1906
 #: templates/js/translated/stock.js:2715 templates/js/translated/stock.js:2847
 msgid "Status"
 msgstr "状态"
@@ -1263,7 +1264,7 @@ msgstr "接受库存项未被完成分配至此生产订单"
 msgid "Required stock has not been fully allocated"
 msgstr "所需库存尚未完全分配"
 
-#: build/serializers.py:547 order/serializers.py:204 order/serializers.py:1076
+#: build/serializers.py:547 order/serializers.py:206 order/serializers.py:1079
 msgid "Accept Incomplete"
 msgstr "接受未完成"
 
@@ -1300,7 +1301,7 @@ msgstr "bom_item.part 必须与生产订单指向相同的部件"
 msgid "Item must be in stock"
 msgstr "项目必须在库存中"
 
-#: build/serializers.py:729 order/serializers.py:1066
+#: build/serializers.py:729 order/serializers.py:1069
 #, python-brace-format
 msgid "Available quantity ({q}) exceeded"
 msgstr "可用量 ({q}) 超出了限制"
@@ -1317,7 +1318,7 @@ msgstr "对于未被追踪的部件，无法指定生产产出"
 msgid "This stock item has already been allocated to this build output"
 msgstr "此库存项已被分配至此生产产出"
 
-#: build/serializers.py:770 order/serializers.py:1350
+#: build/serializers.py:770 order/serializers.py:1353
 msgid "Allocation items must be provided"
 msgstr "必须提供分配的项"
 
@@ -1440,13 +1441,13 @@ msgid "Stock has not been fully allocated to this Build Order"
 msgstr "库存尚未被完全分配到此构建订单"
 
 #: build/templates/build/build_base.html:154
-#: build/templates/build/detail.html:138 order/models.py:950
+#: build/templates/build/detail.html:138 order/models.py:994
 #: order/templates/order/order_base.html:171
 #: order/templates/order/sales_order_base.html:164
 #: report/templates/report/inventree_build_order_base.html:125
 #: templates/js/translated/build.js:2716 templates/js/translated/order.js:2143
-#: templates/js/translated/order.js:2479 templates/js/translated/order.js:2955
-#: templates/js/translated/order.js:3987 templates/js/translated/part.js:1470
+#: templates/js/translated/order.js:2490 templates/js/translated/order.js:2966
+#: templates/js/translated/order.js:4009 templates/js/translated/part.js:1470
 msgid "Target Date"
 msgstr "预计日期"
 
@@ -1473,15 +1474,15 @@ msgid "Completed"
 msgstr "已完成"
 
 #: build/templates/build/build_base.html:179
-#: build/templates/build/detail.html:101 order/api.py:1292 order/models.py:1144
-#: order/models.py:1238 order/models.py:1369
+#: build/templates/build/detail.html:101 order/api.py:1295 order/models.py:1193
+#: order/models.py:1292 order/models.py:1423
 #: order/templates/order/sales_order_base.html:9
 #: order/templates/order/sales_order_base.html:28
 #: report/templates/report/inventree_build_order_base.html:135
-#: report/templates/report/inventree_so_report.html:77
+#: report/templates/report/inventree_so_report_base.html:77
 #: stock/templates/stock/item_base.html:371
 #: templates/email/overdue_sales_order.html:15
-#: templates/js/translated/order.js:2901 templates/js/translated/pricing.js:896
+#: templates/js/translated/order.js:2912 templates/js/translated/pricing.js:896
 msgid "Sales Order"
 msgstr "销售订单"
 
@@ -1512,8 +1513,8 @@ msgstr "库存来源"
 msgid "Stock can be taken from any available location."
 msgstr "库存可以从任何可用的地点获得。"
 
-#: build/templates/build/detail.html:49 order/models.py:1062
-#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2521
+#: build/templates/build/detail.html:49 order/models.py:1111
+#: templates/js/translated/order.js:1774 templates/js/translated/order.js:2532
 msgid "Destination"
 msgstr "目的地"
 
@@ -1862,7 +1863,7 @@ msgstr "用于从 URL 下载的用户代理配置"
 
 #: common/models.py:966
 msgid "Allow to override the user-agent used to download images and files from external URL (leave blank for the default)"
-msgstr ""
+msgstr "允许覆盖用于从外部 URL 下载图像和文件的用户代理（默认值为空）"
 
 #: common/models.py:971
 msgid "Require confirm"
@@ -1948,11 +1949,11 @@ msgstr "允许在浏览器中通过摄像头扫描条码"
 
 #: common/models.py:1063
 msgid "IPN Regex"
-msgstr ""
+msgstr "IPN 正则表达式"
 
 #: common/models.py:1064
 msgid "Regular expression pattern for matching Part IPN"
-msgstr ""
+msgstr "用于匹配零件 IPN 的正则表达式模式"
 
 #: common/models.py:1068
 msgid "Allow Duplicate IPN"
@@ -1972,35 +1973,35 @@ msgstr "允许编辑部件时更改 IPN 值"
 
 #: common/models.py:1082
 msgid "Copy Part BOM Data"
-msgstr ""
+msgstr "复制零件 BOM 数据"
 
 #: common/models.py:1083
 msgid "Copy BOM data by default when duplicating a part"
-msgstr ""
+msgstr "复制零件时默认复制 BOM 数据"
 
 #: common/models.py:1089
 msgid "Copy Part Parameter Data"
-msgstr ""
+msgstr "复制零件参数数据"
 
 #: common/models.py:1090
 msgid "Copy parameter data by default when duplicating a part"
-msgstr ""
+msgstr "复制零件时默认复制参数数据"
 
 #: common/models.py:1096
 msgid "Copy Part Test Data"
-msgstr ""
+msgstr "复制零件测试数据"
 
 #: common/models.py:1097
 msgid "Copy test data by default when duplicating a part"
-msgstr ""
+msgstr "复制零件时默认复制测试数据"
 
 #: common/models.py:1103
 msgid "Copy Category Parameter Templates"
-msgstr ""
+msgstr "复制类别参数模板"
 
 #: common/models.py:1104
 msgid "Copy category parameter templates when creating a part"
-msgstr ""
+msgstr "创建零件时复制类别参数模板"
 
 #: common/models.py:1110 part/admin.py:55 part/models.py:3307
 #: report/models.py:158 templates/js/translated/table_filters.js:38
@@ -2010,7 +2011,7 @@ msgstr "模板"
 
 #: common/models.py:1111
 msgid "Parts are templates by default"
-msgstr ""
+msgstr "零件默认为模板"
 
 #: common/models.py:1117 part/admin.py:51 part/admin.py:282 part/models.py:927
 #: templates/js/translated/bom.js:1602
@@ -2089,7 +2090,7 @@ msgstr ""
 
 #: common/models.py:1173
 msgid "Initial Stock Data"
-msgstr ""
+msgstr "初始库存数据"
 
 #: common/models.py:1174
 msgid "Allow creation of initial stock when adding a new part"
@@ -2097,7 +2098,7 @@ msgstr ""
 
 #: common/models.py:1180 templates/js/translated/part.js:74
 msgid "Initial Supplier Data"
-msgstr ""
+msgstr "初始供应商数据"
 
 #: common/models.py:1181
 msgid "Allow creation of initial supplier data when adding a new part"
@@ -2109,15 +2110,15 @@ msgstr "部件名称显示格式"
 
 #: common/models.py:1188
 msgid "Format to display the part name"
-msgstr ""
+msgstr "零件名称显示格式"
 
 #: common/models.py:1195
 msgid "Part Category Default Icon"
-msgstr ""
+msgstr "零件类别默认图标"
 
 #: common/models.py:1196
 msgid "Part category default icon (empty means no icon)"
-msgstr ""
+msgstr "零件类别默认图标（留空表示没有图标）"
 
 #: common/models.py:1201
 msgid "Pricing Decimal Places"
@@ -2919,7 +2920,7 @@ msgstr ""
 msgid "Price break quantity"
 msgstr ""
 
-#: common/models.py:2031 company/serializers.py:407 order/models.py:977
+#: common/models.py:2031 company/serializers.py:407 order/models.py:1021
 #: templates/js/translated/company.js:1219 templates/js/translated/part.js:1522
 #: templates/js/translated/pricing.js:605
 msgid "Price"
@@ -3231,7 +3232,7 @@ msgstr "选择制造商"
 #: templates/js/translated/company.js:587
 #: templates/js/translated/company.js:739
 #: templates/js/translated/company.js:1030
-#: templates/js/translated/order.js:2385 templates/js/translated/part.js:1444
+#: templates/js/translated/order.js:2396 templates/js/translated/part.js:1444
 msgid "MPN"
 msgstr ""
 
@@ -3286,7 +3287,7 @@ msgid "Linked manufacturer part must reference the same base part"
 msgstr ""
 
 #: company/models.py:517 company/templates/company/company_base.html:82
-#: company/templates/company/supplier_part.html:136 order/models.py:263
+#: company/templates/company/supplier_part.html:136 order/models.py:282
 #: order/templates/order/order_base.html:121 part/bom.py:285 part/bom.py:313
 #: part/serializers.py:342 stock/templates/stock/item_base.html:230
 #: templates/email/overdue_purchase_order.html:16
@@ -3304,7 +3305,7 @@ msgstr "选择供应商"
 
 #: company/models.py:523 company/templates/company/supplier_part.html:146
 #: part/bom.py:286 part/bom.py:314 part/serializers.py:348
-#: templates/js/translated/company.js:320 templates/js/translated/order.js:2372
+#: templates/js/translated/company.js:320 templates/js/translated/order.js:2383
 #: templates/js/translated/part.js:1430 templates/js/translated/pricing.js:494
 msgid "SKU"
 msgstr ""
@@ -3328,8 +3329,9 @@ msgstr "供应商商品描述"
 #: company/models.py:548 company/templates/company/supplier_part.html:181
 #: part/admin.py:278 part/models.py:3531 part/templates/part/upload_bom.html:59
 #: report/templates/report/inventree_bill_of_materials_report.html:140
-#: report/templates/report/inventree_po_report.html:92
-#: report/templates/report/inventree_so_report.html:93 stock/serializers.py:391
+#: report/templates/report/inventree_po_report_base.html:94
+#: report/templates/report/inventree_so_report_base.html:95
+#: stock/serializers.py:391
 msgid "Note"
 msgstr "备注"
 
@@ -3357,7 +3359,7 @@ msgstr "商品打包"
 #: company/templates/company/supplier_part.html:174
 #: templates/js/translated/company.js:1051 templates/js/translated/order.js:901
 #: templates/js/translated/order.js:1345 templates/js/translated/order.js:1600
-#: templates/js/translated/order.js:2416 templates/js/translated/order.js:2433
+#: templates/js/translated/order.js:2427 templates/js/translated/order.js:2444
 #: templates/js/translated/part.js:1462 templates/js/translated/part.js:1514
 msgid "Pack Quantity"
 msgstr "包装数量"
@@ -3443,12 +3445,12 @@ msgstr "从 URL 下载图片"
 msgid "Delete image"
 msgstr "删除图片"
 
-#: company/templates/company/company_base.html:87 order/models.py:669
+#: company/templates/company/company_base.html:87 order/models.py:688
 #: order/templates/order/sales_order_base.html:116 stock/models.py:713
 #: stock/models.py:714 stock/serializers.py:794
 #: stock/templates/stock/item_base.html:402
 #: templates/email/overdue_sales_order.html:16
-#: templates/js/translated/company.js:483 templates/js/translated/order.js:2916
+#: templates/js/translated/company.js:483 templates/js/translated/order.js:2927
 #: templates/js/translated/stock.js:2679
 #: templates/js/translated/table_filters.js:482
 msgid "Customer"
@@ -3919,10 +3921,10 @@ msgstr "商品查询筛选器 (逗号分隔的键值对列表)"
 msgid "No matching purchase order found"
 msgstr ""
 
-#: order/api.py:1290 order/models.py:1023 order/models.py:1102
+#: order/api.py:1293 order/models.py:1067 order/models.py:1151
 #: order/templates/order/order_base.html:9
 #: order/templates/order/order_base.html:18
-#: report/templates/report/inventree_po_report.html:76
+#: report/templates/report/inventree_po_report_base.html:76
 #: stock/templates/stock/item_base.html:182
 #: templates/email/overdue_purchase_order.html:15
 #: templates/js/translated/order.js:672 templates/js/translated/order.js:1266
@@ -3932,426 +3934,437 @@ msgstr ""
 msgid "Purchase Order"
 msgstr ""
 
-#: order/api.py:1294
+#: order/api.py:1297
 msgid "Unknown"
 msgstr "未知"
 
-#: order/models.py:82
+#: order/models.py:86
 msgid "Order description"
 msgstr "订单描述"
 
-#: order/models.py:84 order/models.py:1285
+#: order/models.py:88 order/models.py:1339
 msgid "Link to external page"
 msgstr "链接到外部页面"
 
-#: order/models.py:92
+#: order/models.py:96
 msgid "Created By"
 msgstr "创建者"
 
-#: order/models.py:99
+#: order/models.py:103
 msgid "User or group responsible for this order"
 msgstr "负责此订单的用户或群组"
 
-#: order/models.py:104
+#: order/models.py:108
 msgid "Order notes"
 msgstr "订单备注"
 
-#: order/models.py:241 order/models.py:656
+#: order/models.py:113 report/templates/report/inventree_po_report_base.html:93
+#: report/templates/report/inventree_so_report_base.html:94
+#: templates/js/translated/order.js:2468 templates/js/translated/order.js:2653
+#: templates/js/translated/order.js:3989 templates/js/translated/order.js:4472
+msgid "Total Price"
+msgstr ""
+
+#: order/models.py:114
+msgid "Total price for this order"
+msgstr ""
+
+#: order/models.py:260 order/models.py:675
 msgid "Order reference"
 msgstr ""
 
-#: order/models.py:249 order/models.py:674
+#: order/models.py:268 order/models.py:693
 msgid "Purchase order status"
 msgstr ""
 
-#: order/models.py:264
+#: order/models.py:283
 msgid "Company from which the items are being ordered"
 msgstr "订购该商品的公司"
 
-#: order/models.py:267 order/templates/order/order_base.html:133
+#: order/models.py:286 order/templates/order/order_base.html:133
 #: templates/js/translated/order.js:2118
 msgid "Supplier Reference"
 msgstr ""
 
-#: order/models.py:267
+#: order/models.py:286
 msgid "Supplier order reference code"
 msgstr ""
 
-#: order/models.py:274
+#: order/models.py:293
 msgid "received by"
 msgstr "接收方"
 
-#: order/models.py:279
+#: order/models.py:298
 msgid "Issue Date"
 msgstr "签发日期"
 
-#: order/models.py:280
+#: order/models.py:299
 msgid "Date order was issued"
 msgstr "订单签发日期"
 
-#: order/models.py:285
+#: order/models.py:304
 msgid "Target Delivery Date"
 msgstr "目标交付日期"
 
-#: order/models.py:286
+#: order/models.py:305
 msgid "Expected date for order delivery. Order will be overdue after this date."
 msgstr "预期订单交付日期。超过该日期后订单将逾期。"
 
-#: order/models.py:292
+#: order/models.py:311
 msgid "Date order was completed"
 msgstr "订单完成日期"
 
-#: order/models.py:331
+#: order/models.py:350
 msgid "Part supplier must match PO supplier"
 msgstr ""
 
-#: order/models.py:490
+#: order/models.py:509
 msgid "Quantity must be a positive number"
 msgstr "数量必须大于0"
 
-#: order/models.py:670
+#: order/models.py:689
 msgid "Company to which the items are being sold"
 msgstr "向其出售该商品的公司"
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer Reference "
 msgstr ""
 
-#: order/models.py:681
+#: order/models.py:700
 msgid "Customer order reference code"
 msgstr ""
 
-#: order/models.py:686
+#: order/models.py:705
 msgid "Target date for order completion. Order will be overdue after this date."
 msgstr ""
 
-#: order/models.py:689 order/models.py:1243
-#: templates/js/translated/order.js:2963 templates/js/translated/order.js:3126
+#: order/models.py:708 order/models.py:1297
+#: templates/js/translated/order.js:2974 templates/js/translated/order.js:3148
 msgid "Shipment Date"
 msgstr "发货日期"
 
-#: order/models.py:696
+#: order/models.py:715
 msgid "shipped by"
 msgstr ""
 
-#: order/models.py:751
+#: order/models.py:770
 msgid "Order cannot be completed as no parts have been assigned"
 msgstr "尚未分配部件，因此订单无法完成"
 
-#: order/models.py:755
+#: order/models.py:774
 msgid "Only a pending order can be marked as complete"
 msgstr "只有带完成订单可被标记为完成"
 
-#: order/models.py:758 templates/js/translated/order.js:424
+#: order/models.py:777 templates/js/translated/order.js:424
 msgid "Order cannot be completed as there are incomplete shipments"
 msgstr ""
 
-#: order/models.py:761
+#: order/models.py:780
 msgid "Order cannot be completed as there are incomplete line items"
 msgstr ""
 
-#: order/models.py:938
+#: order/models.py:975
 msgid "Item quantity"
 msgstr "物品数量"
 
-#: order/models.py:944
+#: order/models.py:988
 msgid "Line item reference"
 msgstr ""
 
-#: order/models.py:946
+#: order/models.py:990
 msgid "Line item notes"
 msgstr ""
 
-#: order/models.py:951
+#: order/models.py:995
 msgid "Target date for this line item (leave blank to use the target date from the order)"
 msgstr ""
 
-#: order/models.py:968
+#: order/models.py:1012
 msgid "Context"
 msgstr ""
 
-#: order/models.py:969
+#: order/models.py:1013
 msgid "Additional context for this line"
 msgstr ""
 
-#: order/models.py:978
+#: order/models.py:1022
 msgid "Unit price"
 msgstr "单价"
 
-#: order/models.py:1008
+#: order/models.py:1052
 msgid "Supplier part must match supplier"
 msgstr ""
 
-#: order/models.py:1016
+#: order/models.py:1060
 msgid "deleted"
 msgstr ""
 
-#: order/models.py:1022 order/models.py:1102 order/models.py:1143
-#: order/models.py:1237 order/models.py:1369
-#: templates/js/translated/order.js:3582
+#: order/models.py:1066 order/models.py:1151 order/models.py:1192
+#: order/models.py:1291 order/models.py:1423
+#: templates/js/translated/order.js:3604
 msgid "Order"
 msgstr ""
 
-#: order/models.py:1041
+#: order/models.py:1085
 msgid "Supplier part"
 msgstr "供应商商品"
 
-#: order/models.py:1048 order/templates/order/order_base.html:178
-#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2501
+#: order/models.py:1092 order/templates/order/order_base.html:178
+#: templates/js/translated/order.js:1771 templates/js/translated/order.js:2512
 #: templates/js/translated/part.js:1506 templates/js/translated/part.js:1538
 #: templates/js/translated/table_filters.js:393
 msgid "Received"
 msgstr ""
 
-#: order/models.py:1049
+#: order/models.py:1093
 msgid "Number of items received"
 msgstr ""
 
-#: order/models.py:1056 stock/models.py:810 stock/serializers.py:227
+#: order/models.py:1100 stock/models.py:810 stock/serializers.py:227
 #: stock/templates/stock/item_base.html:189
 #: templates/js/translated/stock.js:2041
 msgid "Purchase Price"
 msgstr "采购价格"
 
-#: order/models.py:1057
+#: order/models.py:1101
 msgid "Unit purchase price"
 msgstr ""
 
-#: order/models.py:1065
+#: order/models.py:1114
 msgid "Where does the Purchaser want this item to be stored?"
 msgstr ""
 
-#: order/models.py:1131
+#: order/models.py:1180
 msgid "Virtual part cannot be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1136
+#: order/models.py:1185
 msgid "Only salable parts can be assigned to a sales order"
 msgstr ""
 
-#: order/models.py:1162 part/templates/part/part_pricing.html:107
+#: order/models.py:1211 part/templates/part/part_pricing.html:107
 #: part/templates/part/prices.html:128 templates/js/translated/pricing.js:924
 msgid "Sale Price"
 msgstr "销售价格"
 
-#: order/models.py:1163
+#: order/models.py:1212
 msgid "Unit sale price"
 msgstr ""
 
-#: order/models.py:1168
+#: order/models.py:1222
 msgid "Shipped quantity"
 msgstr ""
 
-#: order/models.py:1244
+#: order/models.py:1298
 msgid "Date of shipment"
 msgstr ""
 
-#: order/models.py:1251
+#: order/models.py:1305
 msgid "Checked By"
 msgstr ""
 
-#: order/models.py:1252
+#: order/models.py:1306
 msgid "User who checked this shipment"
 msgstr ""
 
-#: order/models.py:1259 order/models.py:1444 order/serializers.py:1197
-#: order/serializers.py:1325 templates/js/translated/model_renderers.js:338
+#: order/models.py:1313 order/models.py:1498 order/serializers.py:1200
+#: order/serializers.py:1328 templates/js/translated/model_renderers.js:338
 msgid "Shipment"
 msgstr ""
 
-#: order/models.py:1260
+#: order/models.py:1314
 msgid "Shipment number"
 msgstr ""
 
-#: order/models.py:1264
+#: order/models.py:1318
 msgid "Shipment notes"
 msgstr ""
 
-#: order/models.py:1270
+#: order/models.py:1324
 msgid "Tracking Number"
 msgstr ""
 
-#: order/models.py:1271
+#: order/models.py:1325
 msgid "Shipment tracking information"
 msgstr ""
 
-#: order/models.py:1278
+#: order/models.py:1332
 msgid "Invoice Number"
 msgstr ""
 
-#: order/models.py:1279
+#: order/models.py:1333
 msgid "Reference number for associated invoice"
 msgstr ""
 
-#: order/models.py:1297
+#: order/models.py:1351
 msgid "Shipment has already been sent"
 msgstr ""
 
-#: order/models.py:1300
+#: order/models.py:1354
 msgid "Shipment has no allocated stock items"
 msgstr ""
 
-#: order/models.py:1403 order/models.py:1405
+#: order/models.py:1457 order/models.py:1459
 msgid "Stock item has not been assigned"
 msgstr ""
 
-#: order/models.py:1409
+#: order/models.py:1463
 msgid "Cannot allocate stock item to a line with a different part"
 msgstr ""
 
-#: order/models.py:1411
+#: order/models.py:1465
 msgid "Cannot allocate stock to a line without a part"
 msgstr ""
 
-#: order/models.py:1414
+#: order/models.py:1468
 msgid "Allocation quantity cannot exceed stock quantity"
 msgstr ""
 
-#: order/models.py:1424 order/serializers.py:1059
+#: order/models.py:1478 order/serializers.py:1062
 msgid "Quantity must be 1 for serialized stock item"
 msgstr ""
 
-#: order/models.py:1427
+#: order/models.py:1481
 msgid "Sales order does not match shipment"
 msgstr ""
 
-#: order/models.py:1428
+#: order/models.py:1482
 msgid "Shipment does not match sales order"
 msgstr ""
 
-#: order/models.py:1436
+#: order/models.py:1490
 msgid "Line"
 msgstr ""
 
-#: order/models.py:1445
+#: order/models.py:1499
 msgid "Sales order shipment reference"
 msgstr ""
 
-#: order/models.py:1458
+#: order/models.py:1512
 msgid "Item"
 msgstr "物品"
 
-#: order/models.py:1459
+#: order/models.py:1513
 msgid "Select stock item to allocate"
 msgstr ""
 
-#: order/models.py:1462
+#: order/models.py:1516
 msgid "Enter stock allocation quantity"
 msgstr ""
 
-#: order/serializers.py:190
+#: order/serializers.py:192
 msgid "Order cannot be cancelled"
 msgstr "无法取消订单"
 
-#: order/serializers.py:205 order/serializers.py:1077
+#: order/serializers.py:207 order/serializers.py:1080
 msgid "Allow order to be closed with incomplete line items"
 msgstr ""
 
-#: order/serializers.py:216 order/serializers.py:1088
+#: order/serializers.py:218 order/serializers.py:1091
 msgid "Order has incomplete line items"
 msgstr ""
 
-#: order/serializers.py:328
+#: order/serializers.py:330
 msgid "Order is not open"
 msgstr ""
 
-#: order/serializers.py:346
+#: order/serializers.py:348
 msgid "Purchase price currency"
 msgstr ""
 
-#: order/serializers.py:364
+#: order/serializers.py:366
 msgid "Supplier part must be specified"
 msgstr ""
 
-#: order/serializers.py:369
+#: order/serializers.py:371
 msgid "Purchase order must be specified"
 msgstr ""
 
-#: order/serializers.py:375
+#: order/serializers.py:377
 msgid "Supplier must match purchase order"
 msgstr ""
 
-#: order/serializers.py:376
+#: order/serializers.py:378
 msgid "Purchase order must match supplier"
 msgstr ""
 
-#: order/serializers.py:414 order/serializers.py:1165
+#: order/serializers.py:416 order/serializers.py:1168
 msgid "Line Item"
 msgstr ""
 
-#: order/serializers.py:420
+#: order/serializers.py:422
 msgid "Line item does not match purchase order"
 msgstr ""
 
-#: order/serializers.py:430 order/serializers.py:549
+#: order/serializers.py:432 order/serializers.py:551
 msgid "Select destination location for received items"
 msgstr ""
 
-#: order/serializers.py:449 templates/js/translated/order.js:1627
+#: order/serializers.py:451 templates/js/translated/order.js:1627
 msgid "Enter batch code for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:457 templates/js/translated/order.js:1638
+#: order/serializers.py:459 templates/js/translated/order.js:1638
 msgid "Enter serial numbers for incoming stock items"
 msgstr ""
 
-#: order/serializers.py:471
+#: order/serializers.py:473
 msgid "Unique identifier field"
 msgstr ""
 
-#: order/serializers.py:485
+#: order/serializers.py:487
 msgid "Barcode is already in use"
 msgstr ""
 
-#: order/serializers.py:511
+#: order/serializers.py:513
 msgid "An integer quantity must be provided for trackable parts"
 msgstr ""
 
-#: order/serializers.py:565
+#: order/serializers.py:567
 msgid "Line items must be provided"
 msgstr ""
 
-#: order/serializers.py:582
+#: order/serializers.py:584
 msgid "Destination location must be specified"
 msgstr ""
 
-#: order/serializers.py:593
+#: order/serializers.py:595
 msgid "Supplied barcode values must be unique"
 msgstr ""
 
-#: order/serializers.py:902
+#: order/serializers.py:905
 msgid "Sale price currency"
 msgstr ""
 
-#: order/serializers.py:957
+#: order/serializers.py:960
 msgid "No shipment details provided"
 msgstr ""
 
-#: order/serializers.py:1020 order/serializers.py:1174
+#: order/serializers.py:1023 order/serializers.py:1177
 msgid "Line item is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1042
+#: order/serializers.py:1045
 msgid "Quantity must be positive"
 msgstr "数量必须大于0"
 
-#: order/serializers.py:1187
+#: order/serializers.py:1190
 msgid "Enter serial numbers to allocate"
 msgstr "输入序列号以进行分配"
 
-#: order/serializers.py:1209 order/serializers.py:1333
+#: order/serializers.py:1212 order/serializers.py:1336
 msgid "Shipment has already been shipped"
 msgstr ""
 
-#: order/serializers.py:1212 order/serializers.py:1336
+#: order/serializers.py:1215 order/serializers.py:1339
 msgid "Shipment is not associated with this order"
 msgstr ""
 
-#: order/serializers.py:1266
+#: order/serializers.py:1269
 msgid "No match found for the following serial numbers"
 msgstr ""
 
-#: order/serializers.py:1276
+#: order/serializers.py:1279
 msgid "The following serial numbers are already allocated"
 msgstr ""
 
@@ -4521,7 +4534,7 @@ msgstr ""
 #: templates/js/translated/bom.js:102 templates/js/translated/build.js:489
 #: templates/js/translated/build.js:650 templates/js/translated/build.js:2119
 #: templates/js/translated/order.js:1210 templates/js/translated/order.js:1716
-#: templates/js/translated/order.js:3201 templates/js/translated/stock.js:663
+#: templates/js/translated/order.js:3223 templates/js/translated/stock.js:663
 #: templates/js/translated/stock.js:833
 #: templates/patterns/wizard/match_fields.html:70
 msgid "Remove row"
@@ -4565,8 +4578,8 @@ msgstr "步骤 %(step)s / %(count)s"
 
 #: order/templates/order/po_sidebar.html:5
 #: order/templates/order/so_sidebar.html:5
-#: report/templates/report/inventree_po_report.html:84
-#: report/templates/report/inventree_so_report.html:85
+#: report/templates/report/inventree_po_report_base.html:84
+#: report/templates/report/inventree_so_report_base.html:85
 msgid "Line Items"
 msgstr ""
 
@@ -4640,7 +4653,7 @@ msgid "This Sales Order has not been fully allocated"
 msgstr ""
 
 #: order/templates/order/sales_order_base.html:123
-#: templates/js/translated/order.js:2929
+#: templates/js/translated/order.js:2940
 msgid "Customer Reference"
 msgstr ""
 
@@ -4762,7 +4775,7 @@ msgstr "用于"
 
 #: part/admin.py:64 templates/js/translated/build.js:1974
 #: templates/js/translated/build.js:2236 templates/js/translated/build.js:2823
-#: templates/js/translated/order.js:4046
+#: templates/js/translated/order.js:4068
 msgid "Allocated"
 msgstr "已分配"
 
@@ -4868,7 +4881,7 @@ msgid "Total Stock"
 msgstr "总库存"
 
 #: part/bom.py:177 part/templates/part/part_base.html:195
-#: templates/js/translated/order.js:4013
+#: templates/js/translated/order.js:4035
 msgid "Available Stock"
 msgstr "可用库存"
 
@@ -5758,7 +5771,7 @@ msgstr ""
 msgid "The available stock for {part.name} has fallen below the configured minimum level"
 msgstr ""
 
-#: part/tasks.py:289 templates/js/translated/order.js:2416
+#: part/tasks.py:289 templates/js/translated/order.js:2427
 #: templates/js/translated/part.js:959 templates/js/translated/part.js:1462
 #: templates/js/translated/part.js:1514
 msgid "Total Quantity"
@@ -6265,6 +6278,7 @@ msgstr "单位成本"
 #: part/templates/part/part_pricing.html:58
 #: part/templates/part/part_pricing.html:99
 #: part/templates/part/part_pricing.html:114
+#: templates/js/translated/order.js:2156 templates/js/translated/order.js:2986
 #: templates/js/translated/part.js:965
 msgid "Total Cost"
 msgstr "总成本"
@@ -6828,10 +6842,31 @@ msgstr ""
 msgid "Required For"
 msgstr ""
 
-#: report/templates/report/inventree_po_report.html:77
+#: report/templates/report/inventree_po_report_base.html:77
 msgid "Supplier was deleted"
 msgstr ""
 
+#: report/templates/report/inventree_po_report_base.html:92
+#: report/templates/report/inventree_so_report_base.html:93
+#: templates/js/translated/order.js:2458 templates/js/translated/order.js:2643
+#: templates/js/translated/order.js:3979 templates/js/translated/order.js:4462
+#: templates/js/translated/pricing.js:511
+#: templates/js/translated/pricing.js:580
+#: templates/js/translated/pricing.js:804
+msgid "Unit Price"
+msgstr "单价"
+
+#: report/templates/report/inventree_po_report_base.html:117
+#: report/templates/report/inventree_so_report_base.html:118
+msgid "Extra Line Items"
+msgstr ""
+
+#: report/templates/report/inventree_po_report_base.html:134
+#: report/templates/report/inventree_so_report_base.html:135
+#: templates/js/translated/order.js:2372 templates/js/translated/order.js:3954
+msgid "Total"
+msgstr ""
+
 #: report/templates/report/inventree_test_report_base.html:21
 msgid "Stock Item Test Report"
 msgstr ""
@@ -6841,8 +6876,8 @@ msgstr ""
 #: templates/js/translated/build.js:479 templates/js/translated/build.js:640
 #: templates/js/translated/build.js:1253 templates/js/translated/build.js:1758
 #: templates/js/translated/model_renderers.js:126
-#: templates/js/translated/order.js:126 templates/js/translated/order.js:3701
-#: templates/js/translated/order.js:3788 templates/js/translated/stock.js:528
+#: templates/js/translated/order.js:126 templates/js/translated/order.js:3723
+#: templates/js/translated/order.js:3810 templates/js/translated/stock.js:528
 msgid "Serial Number"
 msgstr "序列号"
 
@@ -7710,7 +7745,8 @@ msgstr ""
 msgid "You have been logged out from InvenTree."
 msgstr ""
 
-#: templates/403_csrf.html:19 templates/navbar.html:142
+#: templates/403_csrf.html:19 templates/InvenTree/settings/sidebar.html:29
+#: templates/navbar.html:142
 msgid "Login"
 msgstr ""
 
@@ -7886,7 +7922,6 @@ msgid "Label Settings"
 msgstr "标签设置"
 
 #: templates/InvenTree/settings/login.html:9
-#: templates/InvenTree/settings/sidebar.html:29
 msgid "Login Settings"
 msgstr ""
 
@@ -7922,8 +7957,9 @@ msgid "Open in new tab"
 msgstr ""
 
 #: templates/InvenTree/settings/notifications.html:9
-msgid "Global Notification Settings"
-msgstr ""
+#: templates/InvenTree/settings/user_notifications.html:9
+msgid "Notification Settings"
+msgstr "通知设置"
 
 #: templates/InvenTree/settings/notifications.html:18
 msgid "Slug"
@@ -7954,7 +7990,7 @@ msgid "Stocktake Reports"
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:10
-#: templates/InvenTree/settings/sidebar.html:57
+#: templates/InvenTree/settings/sidebar.html:56
 msgid "Plugin Settings"
 msgstr ""
 
@@ -7963,7 +7999,7 @@ msgid "Changing the settings below require you to immediately restart the server
 msgstr ""
 
 #: templates/InvenTree/settings/plugin.html:38
-#: templates/InvenTree/settings/sidebar.html:59
+#: templates/InvenTree/settings/sidebar.html:58
 msgid "Plugins"
 msgstr ""
 
@@ -8189,23 +8225,23 @@ msgid "User Settings"
 msgstr "用户设置"
 
 #: templates/InvenTree/settings/sidebar.html:9
-#: templates/InvenTree/settings/user.html:12
-msgid "Account Settings"
-msgstr "帐户设置"
+msgid "Account"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:11
-#: templates/InvenTree/settings/user_display.html:9
-msgid "Display Settings"
-msgstr "显示设置"
+msgid "Display"
+msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:13
 msgid "Home Page"
 msgstr "主页"
 
 #: templates/InvenTree/settings/sidebar.html:15
-#: templates/InvenTree/settings/user_search.html:9
-msgid "Search Settings"
-msgstr "搜索设置"
+#: templates/js/translated/tables.js:538 templates/navbar.html:102
+#: templates/search.html:8 templates/search_form.html:6
+#: templates/search_form.html:7
+msgid "Search"
+msgstr "搜索"
 
 #: templates/InvenTree/settings/sidebar.html:19
 #: templates/InvenTree/settings/sidebar.html:39
@@ -8216,12 +8252,12 @@ msgstr ""
 msgid "Global Settings"
 msgstr ""
 
-#: templates/InvenTree/settings/sidebar.html:27
-msgid "Server Configuration"
+#: templates/InvenTree/settings/sidebar.html:27 templates/stats.html:9
+msgid "Server"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:37
-msgid "Label Printing"
+msgid "Labels"
 msgstr ""
 
 #: templates/InvenTree/settings/sidebar.html:41
@@ -8236,6 +8272,10 @@ msgstr "销售订单设置"
 msgid "Stock Settings"
 msgstr "库存设置"
 
+#: templates/InvenTree/settings/user.html:12
+msgid "Account Settings"
+msgstr "帐户设置"
+
 #: templates/InvenTree/settings/user.html:18
 #: templates/account/password_reset_from_key.html:4
 #: templates/account/password_reset_from_key.html:7
@@ -8394,6 +8434,10 @@ msgstr ""
 msgid "Do you really want to remove the selected email address?"
 msgstr ""
 
+#: templates/InvenTree/settings/user_display.html:9
+msgid "Display Settings"
+msgstr "显示设置"
+
 #: templates/InvenTree/settings/user_display.html:29
 msgid "Theme Settings"
 msgstr "主题设置"
@@ -8459,9 +8503,9 @@ msgstr "InvenTree 翻译项目"
 msgid "Home Page Settings"
 msgstr "主页设置"
 
-#: templates/InvenTree/settings/user_notifications.html:9
-msgid "Notification Settings"
-msgstr "通知设置"
+#: templates/InvenTree/settings/user_search.html:9
+msgid "Search Settings"
+msgstr "搜索设置"
 
 #: templates/about.html:9
 msgid "InvenTree Version"
@@ -9122,7 +9166,7 @@ msgid "No pricing available"
 msgstr ""
 
 #: templates/js/translated/bom.js:1145 templates/js/translated/build.js:1944
-#: templates/js/translated/order.js:4027
+#: templates/js/translated/order.js:4049
 msgid "No Stock Available"
 msgstr ""
 
@@ -9323,12 +9367,12 @@ msgid "No required tests for this build"
 msgstr ""
 
 #: templates/js/translated/build.js:1801 templates/js/translated/build.js:2827
-#: templates/js/translated/order.js:3736
+#: templates/js/translated/order.js:3758
 msgid "Edit stock allocation"
 msgstr ""
 
 #: templates/js/translated/build.js:1803 templates/js/translated/build.js:2828
-#: templates/js/translated/order.js:3737
+#: templates/js/translated/order.js:3759
 msgid "Delete stock allocation"
 msgstr ""
 
@@ -9348,15 +9392,15 @@ msgstr ""
 msgid "Quantity Per"
 msgstr ""
 
-#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4034
+#: templates/js/translated/build.js:1938 templates/js/translated/order.js:4056
 msgid "Insufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4032
+#: templates/js/translated/build.js:1940 templates/js/translated/order.js:4054
 msgid "Sufficient stock available"
 msgstr ""
 
-#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4126
+#: templates/js/translated/build.js:2034 templates/js/translated/order.js:4148
 msgid "Build stock"
 msgstr ""
 
@@ -9364,21 +9408,21 @@ msgstr ""
 msgid "Order stock"
 msgstr ""
 
-#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4119
+#: templates/js/translated/build.js:2041 templates/js/translated/order.js:4141
 msgid "Allocate stock"
 msgstr ""
 
 #: templates/js/translated/build.js:2080 templates/js/translated/label.js:172
-#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3263
+#: templates/js/translated/order.js:1133 templates/js/translated/order.js:3285
 #: templates/js/translated/report.js:225
 msgid "Select Parts"
 msgstr "选择商品"
 
-#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3264
+#: templates/js/translated/build.js:2081 templates/js/translated/order.js:3286
 msgid "You must select at least one part to allocate"
 msgstr ""
 
-#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3212
+#: templates/js/translated/build.js:2130 templates/js/translated/order.js:3234
 msgid "Specify stock allocation quantity"
 msgstr ""
 
@@ -9390,7 +9434,7 @@ msgstr ""
 msgid "All selected parts have been fully allocated"
 msgstr ""
 
-#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3278
+#: templates/js/translated/build.js:2224 templates/js/translated/order.js:3300
 msgid "Select source location (leave blank to take from all locations)"
 msgstr ""
 
@@ -9398,11 +9442,11 @@ msgstr ""
 msgid "Allocate Stock Items to Build Order"
 msgstr ""
 
-#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3375
+#: templates/js/translated/build.js:2263 templates/js/translated/order.js:3397
 msgid "No matching stock locations"
 msgstr ""
 
-#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3452
+#: templates/js/translated/build.js:2336 templates/js/translated/order.js:3474
 msgid "No matching stock items"
 msgstr ""
 
@@ -10077,215 +10121,198 @@ msgstr ""
 msgid "No purchase orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2906
+#: templates/js/translated/order.js:2101 templates/js/translated/order.js:2917
 msgid "Order is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2971
-#: templates/js/translated/order.js:3113
+#: templates/js/translated/order.js:2151 templates/js/translated/order.js:2982
+#: templates/js/translated/order.js:3135
 msgid "Items"
 msgstr ""
 
-#: templates/js/translated/order.js:2261 templates/js/translated/order.js:4178
+#: templates/js/translated/order.js:2272 templates/js/translated/order.js:4200
 msgid "Duplicate Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2278 templates/js/translated/order.js:4193
+#: templates/js/translated/order.js:2289 templates/js/translated/order.js:4215
 msgid "Edit Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2291 templates/js/translated/order.js:4204
+#: templates/js/translated/order.js:2302 templates/js/translated/order.js:4226
 msgid "Delete Line Item"
 msgstr ""
 
-#: templates/js/translated/order.js:2334
+#: templates/js/translated/order.js:2345
 msgid "No line items found"
 msgstr ""
 
-#: templates/js/translated/order.js:2361 templates/js/translated/order.js:3932
-msgid "Total"
-msgstr ""
-
-#: templates/js/translated/order.js:2447 templates/js/translated/order.js:2632
-#: templates/js/translated/order.js:3957 templates/js/translated/order.js:4440
-#: templates/js/translated/pricing.js:511
-#: templates/js/translated/pricing.js:580
-#: templates/js/translated/pricing.js:804
-msgid "Unit Price"
-msgstr "单价"
-
-#: templates/js/translated/order.js:2457 templates/js/translated/order.js:2642
-#: templates/js/translated/order.js:3967 templates/js/translated/order.js:4450
-msgid "Total Price"
-msgstr ""
-
-#: templates/js/translated/order.js:2485 templates/js/translated/order.js:3995
+#: templates/js/translated/order.js:2496 templates/js/translated/order.js:4017
 #: templates/js/translated/part.js:1498
 msgid "This line item is overdue"
 msgstr ""
 
-#: templates/js/translated/order.js:2544 templates/js/translated/part.js:1543
+#: templates/js/translated/order.js:2555 templates/js/translated/part.js:1543
 msgid "Receive line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2548 templates/js/translated/order.js:4132
+#: templates/js/translated/order.js:2559 templates/js/translated/order.js:4154
 msgid "Duplicate line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2549 templates/js/translated/order.js:4133
+#: templates/js/translated/order.js:2560 templates/js/translated/order.js:4155
 msgid "Edit line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2550 templates/js/translated/order.js:4137
+#: templates/js/translated/order.js:2561 templates/js/translated/order.js:4159
 msgid "Delete line item"
 msgstr ""
 
-#: templates/js/translated/order.js:2677 templates/js/translated/order.js:4484
+#: templates/js/translated/order.js:2688 templates/js/translated/order.js:4506
 msgid "Duplicate line"
 msgstr ""
 
-#: templates/js/translated/order.js:2678 templates/js/translated/order.js:4485
+#: templates/js/translated/order.js:2689 templates/js/translated/order.js:4507
 msgid "Edit line"
 msgstr ""
 
-#: templates/js/translated/order.js:2679 templates/js/translated/order.js:4486
+#: templates/js/translated/order.js:2690 templates/js/translated/order.js:4508
 msgid "Delete line"
 msgstr ""
 
-#: templates/js/translated/order.js:2709 templates/js/translated/order.js:4515
+#: templates/js/translated/order.js:2720 templates/js/translated/order.js:4537
 msgid "Duplicate Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2724 templates/js/translated/order.js:4530
+#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4552
 msgid "Edit Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2735 templates/js/translated/order.js:4541
+#: templates/js/translated/order.js:2746 templates/js/translated/order.js:4563
 msgid "Delete Line"
 msgstr ""
 
-#: templates/js/translated/order.js:2746
+#: templates/js/translated/order.js:2757
 msgid "No matching line"
 msgstr ""
 
-#: templates/js/translated/order.js:2857
+#: templates/js/translated/order.js:2868
 msgid "No sales orders found"
 msgstr ""
 
-#: templates/js/translated/order.js:2920
+#: templates/js/translated/order.js:2931
 msgid "Invalid Customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3018
+#: templates/js/translated/order.js:3040
 msgid "Edit shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3021
+#: templates/js/translated/order.js:3043
 msgid "Complete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3026
+#: templates/js/translated/order.js:3048
 msgid "Delete shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3046
+#: templates/js/translated/order.js:3068
 msgid "Edit Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3063
+#: templates/js/translated/order.js:3085
 msgid "Delete Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3098
+#: templates/js/translated/order.js:3120
 msgid "No matching shipments found"
 msgstr ""
 
-#: templates/js/translated/order.js:3108
+#: templates/js/translated/order.js:3130
 msgid "Shipment Reference"
 msgstr ""
 
-#: templates/js/translated/order.js:3132
+#: templates/js/translated/order.js:3154
 msgid "Not shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:3138
+#: templates/js/translated/order.js:3160
 msgid "Tracking"
 msgstr ""
 
-#: templates/js/translated/order.js:3142
+#: templates/js/translated/order.js:3164
 msgid "Invoice"
 msgstr ""
 
-#: templates/js/translated/order.js:3311
+#: templates/js/translated/order.js:3333
 msgid "Add Shipment"
 msgstr ""
 
-#: templates/js/translated/order.js:3362
+#: templates/js/translated/order.js:3384
 msgid "Confirm stock allocation"
 msgstr "确认库存分配"
 
-#: templates/js/translated/order.js:3363
+#: templates/js/translated/order.js:3385
 msgid "Allocate Stock Items to Sales Order"
 msgstr ""
 
-#: templates/js/translated/order.js:3571
+#: templates/js/translated/order.js:3593
 msgid "No sales order allocations found"
 msgstr ""
 
-#: templates/js/translated/order.js:3650
+#: templates/js/translated/order.js:3672
 msgid "Edit Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3667
+#: templates/js/translated/order.js:3689
 msgid "Confirm Delete Operation"
 msgstr "确认删除操作"
 
-#: templates/js/translated/order.js:3668
+#: templates/js/translated/order.js:3690
 msgid "Delete Stock Allocation"
 msgstr ""
 
-#: templates/js/translated/order.js:3713 templates/js/translated/order.js:3802
+#: templates/js/translated/order.js:3735 templates/js/translated/order.js:3824
 #: templates/js/translated/stock.js:1681
 msgid "Shipped to customer"
 msgstr ""
 
-#: templates/js/translated/order.js:3721 templates/js/translated/order.js:3811
+#: templates/js/translated/order.js:3743 templates/js/translated/order.js:3833
 msgid "Stock location not specified"
 msgstr ""
 
-#: templates/js/translated/order.js:4116
+#: templates/js/translated/order.js:4138
 msgid "Allocate serial numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4122
+#: templates/js/translated/order.js:4144
 msgid "Purchase stock"
 msgstr ""
 
-#: templates/js/translated/order.js:4129 templates/js/translated/order.js:4320
+#: templates/js/translated/order.js:4151 templates/js/translated/order.js:4342
 msgid "Calculate price"
 msgstr ""
 
-#: templates/js/translated/order.js:4141
+#: templates/js/translated/order.js:4163
 msgid "Cannot be deleted as items have been shipped"
 msgstr ""
 
-#: templates/js/translated/order.js:4144
+#: templates/js/translated/order.js:4166
 msgid "Cannot be deleted as items have been allocated"
 msgstr ""
 
-#: templates/js/translated/order.js:4219
+#: templates/js/translated/order.js:4241
 msgid "Allocate Serial Numbers"
 msgstr ""
 
-#: templates/js/translated/order.js:4328
+#: templates/js/translated/order.js:4350
 msgid "Update Unit Price"
 msgstr ""
 
-#: templates/js/translated/order.js:4342
+#: templates/js/translated/order.js:4364
 msgid "No matching line items"
 msgstr ""
 
-#: templates/js/translated/order.js:4552
+#: templates/js/translated/order.js:4574
 msgid "No matching lines"
 msgstr ""
 
@@ -11426,12 +11453,6 @@ msgstr ""
 msgid "rows"
 msgstr ""
 
-#: templates/js/translated/tables.js:538 templates/navbar.html:102
-#: templates/search.html:8 templates/search_form.html:6
-#: templates/search_form.html:7
-msgid "Search"
-msgstr "搜索"
-
 #: templates/js/translated/tables.js:541
 msgid "No matching results"
 msgstr ""
@@ -11566,10 +11587,6 @@ msgid "You are about to use your %(provider_name)s account to login to\n"
 "%(site_name)s.<br>As a final step, please complete the following form:"
 msgstr ""
 
-#: templates/stats.html:9
-msgid "Server"
-msgstr ""
-
 #: templates/stats.html:13
 msgid "Instance Name"
 msgstr ""