diff --git a/InvenTree/locale/it/LC_MESSAGES/django.po b/InvenTree/locale/it/LC_MESSAGES/django.po
index da24dea7ab..6aa5c5bf58 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: 2021-08-09 23:12+0000\n"
-"PO-Revision-Date: 2021-08-09 23:23\n"
+"POT-Creation-Date: 2021-08-10 01:19+0000\n"
+"PO-Revision-Date: 2021-08-10 02:20\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
 "Language: it_IT\n"
@@ -133,19 +133,19 @@ msgstr ""
 msgid "Invalid choice"
 msgstr ""
 
-#: InvenTree/models.py:129 InvenTree/models.py:130 company/models.py:412
+#: InvenTree/models.py:129 InvenTree/models.py:130 company/models.py:414
 #: label/models.py:112 part/models.py:656 part/models.py:2196
 #: part/templates/part/part_base.html:234 report/models.py:181
 #: templates/InvenTree/search.html:137 templates/InvenTree/search.html:289
-#: templates/js/translated/company.js:583 templates/js/translated/part.js:338
+#: templates/js/translated/company.js:592 templates/js/translated/part.js:338
 #: templates/js/translated/part.js:471 templates/js/translated/part.js:963
 #: templates/js/translated/stock.js:1342
 msgid "Name"
 msgstr ""
 
 #: InvenTree/models.py:136 build/models.py:187
-#: build/templates/build/detail.html:24 company/models.py:351
-#: company/models.py:519 company/templates/company/manufacturer_part.html:76
+#: build/templates/build/detail.html:24 company/models.py:353
+#: company/models.py:541 company/templates/company/manufacturer_part.html:76
 #: company/templates/company/supplier_part.html:75 label/models.py:119
 #: order/models.py:158 order/templates/order/purchase_order_detail.html:312
 #: part/models.py:679 part/templates/part/part_base.html:239
@@ -156,9 +156,9 @@ msgstr ""
 #: templates/InvenTree/search.html:296
 #: templates/InvenTree/settings/header.html:9
 #: templates/js/translated/bom.js:210 templates/js/translated/build.js:868
-#: templates/js/translated/build.js:1162 templates/js/translated/company.js:299
-#: templates/js/translated/company.js:497
-#: templates/js/translated/company.js:779 templates/js/translated/order.js:267
+#: templates/js/translated/build.js:1162 templates/js/translated/company.js:308
+#: templates/js/translated/company.js:506
+#: templates/js/translated/company.js:788 templates/js/translated/order.js:267
 #: templates/js/translated/order.js:369 templates/js/translated/part.js:397
 #: templates/js/translated/part.js:581 templates/js/translated/part.js:758
 #: templates/js/translated/part.js:975 templates/js/translated/part.js:1043
@@ -695,7 +695,7 @@ msgstr ""
 
 #: build/models.py:205 build/templates/build/auto_allocate.html:16
 #: build/templates/build/build_base.html:128
-#: build/templates/build/detail.html:29 company/models.py:654
+#: build/templates/build/detail.html:29 company/models.py:676
 #: order/models.py:766 order/models.py:825
 #: order/templates/order/order_wizard/select_parts.html:32
 #: order/templates/order/purchase_order_detail.html:297
@@ -713,8 +713,8 @@ msgstr ""
 #: templates/InvenTree/search.html:112 templates/InvenTree/search.html:210
 #: templates/js/translated/barcode.js:362 templates/js/translated/bom.js:183
 #: templates/js/translated/build.js:586 templates/js/translated/build.js:873
-#: templates/js/translated/build.js:1139 templates/js/translated/company.js:438
-#: templates/js/translated/company.js:688 templates/js/translated/part.js:562
+#: templates/js/translated/build.js:1139 templates/js/translated/company.js:447
+#: templates/js/translated/company.js:697 templates/js/translated/part.js:562
 #: templates/js/translated/part.js:725 templates/js/translated/stock.js:132
 #: templates/js/translated/stock.js:895 templates/js/translated/stock.js:1720
 msgid "Part"
@@ -831,7 +831,7 @@ msgid "Link to external URL"
 msgstr ""
 
 #: build/models.py:314 build/templates/build/navbar.html:52
-#: company/models.py:139 company/models.py:526
+#: company/models.py:141 company/models.py:548
 #: company/templates/company/navbar.html:63
 #: company/templates/company/navbar.html:66 order/models.py:180
 #: order/models.py:715 order/templates/order/po_navbar.html:38
@@ -846,7 +846,7 @@ msgstr ""
 #: stock/forms.py:138 stock/forms.py:250 stock/forms.py:282 stock/models.py:573
 #: stock/models.py:1715 stock/models.py:1821
 #: stock/templates/stock/navbar.html:57 templates/js/translated/barcode.js:37
-#: templates/js/translated/bom.js:369 templates/js/translated/company.js:784
+#: templates/js/translated/bom.js:369 templates/js/translated/company.js:793
 #: templates/js/translated/stock.js:268 templates/js/translated/stock.js:509
 #: templates/js/translated/stock.js:1090
 msgid "Notes"
@@ -1596,7 +1596,7 @@ msgstr ""
 msgid "Use the instance name in the title-bar"
 msgstr ""
 
-#: common/models.py:536 company/models.py:97 company/models.py:98
+#: common/models.py:536 company/models.py:99 company/models.py:100
 msgid "Company name"
 msgstr ""
 
@@ -2169,244 +2169,248 @@ msgstr ""
 msgid "Image URL"
 msgstr ""
 
-#: company/models.py:102
+#: company/models.py:104
 msgid "Company description"
 msgstr ""
 
-#: company/models.py:103
+#: company/models.py:105
 msgid "Description of the company"
 msgstr ""
 
-#: company/models.py:109 company/templates/company/company_base.html:70
-#: templates/js/translated/company.js:303
+#: company/models.py:111 company/templates/company/company_base.html:70
+#: templates/js/translated/company.js:312
 msgid "Website"
 msgstr ""
 
-#: company/models.py:110
+#: company/models.py:112
 msgid "Company website URL"
 msgstr ""
 
-#: company/models.py:114 company/templates/company/company_base.html:88
+#: company/models.py:116 company/templates/company/company_base.html:88
 msgid "Address"
 msgstr ""
 
-#: company/models.py:115
+#: company/models.py:117
 msgid "Company address"
 msgstr ""
 
-#: company/models.py:118
+#: company/models.py:120
 msgid "Phone number"
 msgstr ""
 
-#: company/models.py:119
+#: company/models.py:121
 msgid "Contact phone number"
 msgstr ""
 
-#: company/models.py:122 company/templates/company/company_base.html:102
+#: company/models.py:124 company/templates/company/company_base.html:102
 msgid "Email"
 msgstr ""
 
-#: company/models.py:122
+#: company/models.py:124
 msgid "Contact email address"
 msgstr ""
 
-#: company/models.py:125 company/templates/company/company_base.html:109
+#: company/models.py:127 company/templates/company/company_base.html:109
 msgid "Contact"
 msgstr ""
 
-#: company/models.py:126
+#: company/models.py:128
 msgid "Point of contact"
 msgstr ""
 
-#: company/models.py:128 company/models.py:345 company/models.py:513
+#: company/models.py:130 company/models.py:347 company/models.py:535
 #: order/models.py:160 part/models.py:712
 #: report/templates/report/inventree_build_order_base.html:165
-#: templates/js/translated/company.js:486
-#: templates/js/translated/company.js:768 templates/js/translated/part.js:819
+#: templates/js/translated/company.js:495
+#: templates/js/translated/company.js:777 templates/js/translated/part.js:819
 msgid "Link"
 msgstr ""
 
-#: company/models.py:128
+#: company/models.py:130
 msgid "Link to external company information"
 msgstr ""
 
-#: company/models.py:136 part/models.py:722
+#: company/models.py:138 part/models.py:722
 msgid "Image"
 msgstr ""
 
-#: company/models.py:141
+#: company/models.py:143
 msgid "is customer"
 msgstr ""
 
-#: company/models.py:141
+#: company/models.py:143
 msgid "Do you sell items to this company?"
 msgstr ""
 
-#: company/models.py:143
+#: company/models.py:145
 msgid "is supplier"
 msgstr ""
 
-#: company/models.py:143
+#: company/models.py:145
 msgid "Do you purchase items from this company?"
 msgstr ""
 
-#: company/models.py:145
+#: company/models.py:147
 msgid "is manufacturer"
 msgstr ""
 
-#: company/models.py:145
+#: company/models.py:147
 msgid "Does this company manufacture parts?"
 msgstr ""
 
-#: company/models.py:149 company/serializers.py:245
+#: company/models.py:151 company/serializers.py:245
 #: company/templates/company/company_base.html:76
 msgid "Currency"
 msgstr ""
 
-#: company/models.py:152
+#: company/models.py:154
 msgid "Default currency used for this company"
 msgstr ""
 
-#: company/models.py:317 company/models.py:484 stock/models.py:448
+#: company/models.py:319 company/models.py:506 stock/models.py:448
 #: stock/templates/stock/item_base.html:237
 msgid "Base Part"
 msgstr ""
 
-#: company/models.py:321 company/models.py:488 order/views.py:1082
+#: company/models.py:323 company/models.py:510 order/views.py:1082
 msgid "Select part"
 msgstr ""
 
-#: company/models.py:332 company/templates/company/company_base.html:116
+#: company/models.py:334 company/templates/company/company_base.html:116
 #: company/templates/company/manufacturer_part.html:89
 #: company/templates/company/supplier_part.html:98 part/bom.py:170
 #: part/bom.py:241 stock/templates/stock/item_base.html:366
-#: templates/js/translated/company.js:287
-#: templates/js/translated/company.js:463
-#: templates/js/translated/company.js:739
+#: templates/js/translated/company.js:296
+#: templates/js/translated/company.js:472
+#: templates/js/translated/company.js:748
 msgid "Manufacturer"
 msgstr ""
 
-#: company/models.py:333
+#: company/models.py:335
 msgid "Select manufacturer"
 msgstr ""
 
-#: company/models.py:339 company/templates/company/manufacturer_part.html:93
+#: company/models.py:341 company/templates/company/manufacturer_part.html:93
 #: company/templates/company/supplier_part.html:106
 #: order/templates/order/purchase_order_detail.html:331 part/bom.py:171
-#: part/bom.py:242 templates/js/translated/company.js:479
-#: templates/js/translated/company.js:757
+#: part/bom.py:242 templates/js/translated/company.js:488
+#: templates/js/translated/company.js:766
 msgid "MPN"
 msgstr ""
 
-#: company/models.py:340
+#: company/models.py:342
 msgid "Manufacturer Part Number"
 msgstr ""
 
-#: company/models.py:346
+#: company/models.py:348
 msgid "URL for external manufacturer part link"
 msgstr ""
 
-#: company/models.py:352
+#: company/models.py:354
 msgid "Manufacturer part description"
 msgstr ""
 
-#: company/models.py:406 company/models.py:507
+#: company/models.py:408 company/models.py:529
 #: company/templates/company/manufacturer_part.html:6
 #: company/templates/company/manufacturer_part.html:23
 #: stock/templates/stock/item_base.html:376
 msgid "Manufacturer Part"
 msgstr ""
 
-#: company/models.py:413
+#: company/models.py:415
 msgid "Parameter name"
 msgstr ""
 
-#: company/models.py:419
+#: company/models.py:421
 #: report/templates/report/inventree_test_report_base.html:90
 #: stock/models.py:1808 templates/InvenTree/settings/header.html:8
-#: templates/js/translated/company.js:589 templates/js/translated/part.js:480
+#: templates/js/translated/company.js:598 templates/js/translated/part.js:480
 #: templates/js/translated/stock.js:505
 msgid "Value"
 msgstr ""
 
-#: company/models.py:420
+#: company/models.py:422
 msgid "Parameter value"
 msgstr ""
 
-#: company/models.py:426 part/models.py:797 part/models.py:2204
-#: templates/js/translated/company.js:595 templates/js/translated/part.js:486
+#: company/models.py:428 part/models.py:797 part/models.py:2204
+#: templates/js/translated/company.js:604 templates/js/translated/part.js:486
 msgid "Units"
 msgstr ""
 
-#: company/models.py:427
+#: company/models.py:429
 msgid "Parameter units"
 msgstr ""
 
-#: company/models.py:494 company/templates/company/company_base.html:121
+#: company/models.py:501
+msgid "Linked manufacturer part must reference the same base part"
+msgstr ""
+
+#: company/models.py:516 company/templates/company/company_base.html:121
 #: company/templates/company/supplier_part.html:88 order/models.py:260
 #: order/templates/order/order_base.html:92
 #: order/templates/order/order_wizard/select_pos.html:30 part/bom.py:175
 #: part/bom.py:286 stock/templates/stock/item_base.html:383
-#: templates/js/translated/company.js:291
-#: templates/js/translated/company.js:713 templates/js/translated/order.js:254
+#: templates/js/translated/company.js:300
+#: templates/js/translated/company.js:722 templates/js/translated/order.js:254
 msgid "Supplier"
 msgstr ""
 
-#: company/models.py:495
+#: company/models.py:517
 msgid "Select supplier"
 msgstr ""
 
-#: company/models.py:500 company/templates/company/supplier_part.html:92
+#: company/models.py:522 company/templates/company/supplier_part.html:92
 #: order/templates/order/purchase_order_detail.html:318 part/bom.py:176
 #: part/bom.py:287
 msgid "SKU"
 msgstr ""
 
-#: company/models.py:501
+#: company/models.py:523
 msgid "Supplier stock keeping unit"
 msgstr ""
 
-#: company/models.py:508
+#: company/models.py:530
 msgid "Select manufacturer part"
 msgstr ""
 
-#: company/models.py:514
+#: company/models.py:536
 msgid "URL for external supplier part link"
 msgstr ""
 
-#: company/models.py:520
+#: company/models.py:542
 msgid "Supplier part description"
 msgstr ""
 
-#: company/models.py:525 company/templates/company/supplier_part.html:120
+#: company/models.py:547 company/templates/company/supplier_part.html:120
 #: part/models.py:2352 report/templates/report/inventree_po_report.html:93
 #: report/templates/report/inventree_so_report.html:93
 msgid "Note"
 msgstr ""
 
-#: company/models.py:529 part/models.py:1590
+#: company/models.py:551 part/models.py:1590
 msgid "base cost"
 msgstr ""
 
-#: company/models.py:529 part/models.py:1590
+#: company/models.py:551 part/models.py:1590
 msgid "Minimum charge (e.g. stocking fee)"
 msgstr ""
 
-#: company/models.py:531 company/templates/company/supplier_part.html:113
+#: company/models.py:553 company/templates/company/supplier_part.html:113
 #: stock/models.py:472 stock/templates/stock/item_base.html:324
-#: templates/js/translated/company.js:789 templates/js/translated/stock.js:1086
+#: templates/js/translated/company.js:798 templates/js/translated/stock.js:1086
 msgid "Packaging"
 msgstr ""
 
-#: company/models.py:531
+#: company/models.py:553
 msgid "Part packaging"
 msgstr ""
 
-#: company/models.py:533 part/models.py:1592
+#: company/models.py:555 part/models.py:1592
 msgid "multiple"
 msgstr ""
 
-#: company/models.py:533
+#: company/models.py:555
 msgid "Order multiple"
 msgstr ""
 
@@ -2420,7 +2424,7 @@ msgstr ""
 
 #: company/templates/company/company_base.html:9
 #: company/templates/company/company_base.html:35
-#: templates/InvenTree/search.html:304 templates/js/translated/company.js:276
+#: templates/InvenTree/search.html:304 templates/js/translated/company.js:285
 msgid "Company"
 msgstr ""
 
@@ -2463,7 +2467,7 @@ msgstr ""
 #: company/templates/company/company_base.html:126 order/models.py:544
 #: order/templates/order/sales_order_base.html:94 stock/models.py:490
 #: stock/models.py:491 stock/templates/stock/item_base.html:276
-#: templates/js/translated/company.js:283 templates/js/translated/order.js:351
+#: templates/js/translated/company.js:292 templates/js/translated/order.js:351
 #: templates/js/translated/stock.js:1467
 msgid "Customer"
 msgstr ""
@@ -2614,12 +2618,12 @@ msgid "Order part"
 msgstr ""
 
 #: company/templates/company/manufacturer_part.html:45
-#: templates/js/translated/company.js:511
+#: templates/js/translated/company.js:520
 msgid "Edit manufacturer part"
 msgstr ""
 
 #: company/templates/company/manufacturer_part.html:49
-#: templates/js/translated/company.js:512
+#: templates/js/translated/company.js:521
 msgid "Delete manufacturer part"
 msgstr ""
 
@@ -2649,7 +2653,7 @@ msgstr ""
 #: company/templates/company/manufacturer_part.html:138
 #: company/templates/company/manufacturer_part.html:239
 #: part/templates/part/detail.html:214 part/templates/part/detail.html:294
-#: part/templates/part/detail.html:317 templates/js/translated/company.js:377
+#: part/templates/part/detail.html:317 templates/js/translated/company.js:386
 #: users/models.py:194
 msgid "Delete"
 msgstr ""
@@ -2741,17 +2745,17 @@ msgstr ""
 #: company/templates/company/supplier_part.html:7
 #: company/templates/company/supplier_part.html:24 stock/models.py:457
 #: stock/templates/stock/item_base.html:388
-#: templates/js/translated/company.js:729 templates/js/translated/stock.js:1058
+#: templates/js/translated/company.js:738 templates/js/translated/stock.js:1058
 msgid "Supplier Part"
 msgstr ""
 
 #: company/templates/company/supplier_part.html:44
-#: templates/js/translated/company.js:802
+#: templates/js/translated/company.js:811
 msgid "Edit supplier part"
 msgstr ""
 
 #: company/templates/company/supplier_part.html:48
-#: templates/js/translated/company.js:803
+#: templates/js/translated/company.js:812
 msgid "Delete supplier part"
 msgstr ""
 
@@ -4750,8 +4754,8 @@ msgstr ""
 msgid "Part is virtual (not a physical part)"
 msgstr ""
 
-#: part/templates/part/part_base.html:53 templates/js/translated/company.js:454
-#: templates/js/translated/company.js:704 templates/js/translated/part.js:304
+#: part/templates/part/part_base.html:53 templates/js/translated/company.js:463
+#: templates/js/translated/company.js:713 templates/js/translated/part.js:304
 #: templates/js/translated/part.js:381
 msgid "Inactive"
 msgstr ""
@@ -6879,99 +6883,99 @@ msgstr ""
 msgid "Add Manufacturer"
 msgstr ""
 
-#: templates/js/translated/company.js:47 templates/js/translated/company.js:136
+#: templates/js/translated/company.js:47 templates/js/translated/company.js:140
 msgid "Add Manufacturer Part"
 msgstr ""
 
-#: templates/js/translated/company.js:59
+#: templates/js/translated/company.js:63
 msgid "Edit Manufacturer Part"
 msgstr ""
 
-#: templates/js/translated/company.js:68
+#: templates/js/translated/company.js:72
 msgid "Delete Manufacturer Part"
 msgstr ""
 
-#: templates/js/translated/company.js:124 templates/js/translated/order.js:58
+#: templates/js/translated/company.js:128 templates/js/translated/order.js:58
 msgid "Add Supplier"
 msgstr ""
 
-#: templates/js/translated/company.js:152
+#: templates/js/translated/company.js:156
 msgid "Add Supplier Part"
 msgstr ""
 
-#: templates/js/translated/company.js:162
+#: templates/js/translated/company.js:171
 msgid "Edit Supplier Part"
 msgstr ""
 
-#: templates/js/translated/company.js:172
+#: templates/js/translated/company.js:181
 msgid "Delete Supplier Part"
 msgstr ""
 
-#: templates/js/translated/company.js:219
+#: templates/js/translated/company.js:228
 msgid "Edit Company"
 msgstr ""
 
-#: templates/js/translated/company.js:240
+#: templates/js/translated/company.js:249
 msgid "Add new Company"
 msgstr ""
 
-#: templates/js/translated/company.js:317
+#: templates/js/translated/company.js:326
 msgid "Parts Supplied"
 msgstr ""
 
-#: templates/js/translated/company.js:326
+#: templates/js/translated/company.js:335
 msgid "Parts Manufactured"
 msgstr ""
 
-#: templates/js/translated/company.js:339
+#: templates/js/translated/company.js:348
 msgid "No company information found"
 msgstr ""
 
-#: templates/js/translated/company.js:357
+#: templates/js/translated/company.js:366
 msgid "The following manufacturer parts will be deleted"
 msgstr ""
 
-#: templates/js/translated/company.js:374
+#: templates/js/translated/company.js:383
 msgid "Delete Manufacturer Parts"
 msgstr ""
 
-#: templates/js/translated/company.js:427
+#: templates/js/translated/company.js:436
 msgid "No manufacturer parts found"
 msgstr ""
 
-#: templates/js/translated/company.js:446
-#: templates/js/translated/company.js:696 templates/js/translated/part.js:288
+#: templates/js/translated/company.js:455
+#: templates/js/translated/company.js:705 templates/js/translated/part.js:288
 #: templates/js/translated/part.js:373
 msgid "Template part"
 msgstr ""
 
-#: templates/js/translated/company.js:450
-#: templates/js/translated/company.js:700 templates/js/translated/part.js:292
+#: templates/js/translated/company.js:459
+#: templates/js/translated/company.js:709 templates/js/translated/part.js:292
 #: templates/js/translated/part.js:377
 msgid "Assembled part"
 msgstr ""
 
-#: templates/js/translated/company.js:574 templates/js/translated/part.js:462
+#: templates/js/translated/company.js:583 templates/js/translated/part.js:462
 msgid "No parameters found"
 msgstr ""
 
-#: templates/js/translated/company.js:610 templates/js/translated/part.js:503
+#: templates/js/translated/company.js:619 templates/js/translated/part.js:503
 msgid "Edit parameter"
 msgstr ""
 
-#: templates/js/translated/company.js:611 templates/js/translated/part.js:504
+#: templates/js/translated/company.js:620 templates/js/translated/part.js:504
 msgid "Delete parameter"
 msgstr ""
 
-#: templates/js/translated/company.js:630 templates/js/translated/part.js:521
+#: templates/js/translated/company.js:639 templates/js/translated/part.js:521
 msgid "Edit Parameter"
 msgstr ""
 
-#: templates/js/translated/company.js:641 templates/js/translated/part.js:533
+#: templates/js/translated/company.js:650 templates/js/translated/part.js:533
 msgid "Delete Parameter"
 msgstr ""
 
-#: templates/js/translated/company.js:677
+#: templates/js/translated/company.js:686
 msgid "No supplier parts found"
 msgstr ""