diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 0b3b72468..b6274d250 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -3078,6 +3078,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>generatepartslabel</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>iouexists</name>
                                         <definition_loaded>false</definition_loaded>
@@ -26210,6 +26231,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>alreadyaddedtoscoreboard</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>alreadyclosed</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
index 2200809ee..ca94a70b3 100644
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -1,5 +1,5 @@
 import { useApolloClient, useMutation } from "@apollo/client";
-import { Button, Form, Modal, notification, Space } from "antd";
+import { Button, Checkbox, Form, Modal, notification, Space } from "antd";
 import _ from "lodash";
 import React, { useEffect, useState, useMemo } from "react";
 import { useTranslation } from "react-i18next";
@@ -26,6 +26,9 @@ import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
 import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";
+import useLocalStorage from "../../utils/useLocalStorage";
+import { GenerateDocument } from "../../utils/RenderTemplate";
+import { TemplateList } from "../../utils/TemplateConstants";
 
 const mapStateToProps = createStructuredSelector({
   billEnterModal: selectBillEnterModal,
@@ -38,6 +41,8 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(insertAuditTrail({ jobid, operation })),
 });
 
+const Templates = TemplateList("job_special");
+
 function BillEnterModalContainer({
   billEnterModal,
   toggleModalVisible,
@@ -54,7 +59,10 @@ function BillEnterModalContainer({
   const [updateInventoryLines] = useMutation(UPDATE_INVENTORY_LINES);
   const [loading, setLoading] = useState(false);
   const client = useApolloClient();
-
+  const [generateLabel, setGenerateLabel] = useLocalStorage(
+    "enter_bill_generate_label",
+    false
+  );
   const formValues = useMemo(() => {
     return {
       ...billEnterModal.context.bill,
@@ -275,6 +283,20 @@ function BillEnterModalContainer({
     notification["success"]({
       message: t("bills.successes.created"),
     });
+
+    if (generateLabel) {
+      GenerateDocument(
+        {
+          name: Templates.parts_invoice_label_single.key,
+          variables: {
+            id: billId,
+          },
+        },
+        {},
+        "p"
+      );
+    }
+
     if (billEnterModal.actions.refetch) billEnterModal.actions.refetch();
 
     insertAuditTrail({
@@ -330,6 +352,12 @@ function BillEnterModalContainer({
       }}
       footer={
         <Space>
+          <Checkbox
+            checked={generateLabel}
+            onChange={(e) => setGenerateLabel(e.target.checked)}
+          >
+            {t("bills.labels.generatepartslabel")}
+          </Checkbox>
           <Button onClick={handleCancel}>{t("general.actions.cancel")}</Button>
           <Button loading={loading} onClick={() => form.submit()}>
             {t("general.actions.save")}
diff --git a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
index f72457ea9..fc39eb5de 100644
--- a/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
+++ b/client/src/components/job-scoreboard-add-button/job-scoreboard-add-button.component.jsx
@@ -1,4 +1,5 @@
 import { useMutation, useLazyQuery } from "@apollo/client";
+import { CheckCircleOutlined } from "@ant-design/icons";
 import {
   Button,
   Card,
@@ -141,6 +142,12 @@ export default function ScoreboardAddButton({
           </Form>
         )}
       </div>
+      {entryData && entryData.scoreboard && entryData.scoreboard[0] && (
+        <Space>
+          <CheckCircleOutlined style={{ color: "green" }} />
+          <span>{t("jobs.labels.alreadyaddedtoscoreboard")}</span>
+        </Space>
+      )}
     </Card>
   );
 
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 429038159..12e52e1a5 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -195,6 +195,7 @@
 				"entered_total": "Total of Entered Lines",
 				"enteringcreditmemo": "You are entering a credit memo. Please ensure you are also entering positive values.",
 				"federal_tax": "Federal Tax",
+				"generatepartslabel": "Generate Parts Labels after Saving?",
 				"iouexists": "An IOU exists that is associated to this RO.",
 				"local_tax": "Local Tax",
 				"markexported": "Mark Exported",
@@ -1552,6 +1553,7 @@
 				"adjustments": "Adjustments",
 				"adminwarning": "Use the functionality on this page at your own risk.  You are responsible for any and all changes to your data.",
 				"allocations": "Allocations",
+				"alreadyaddedtoscoreboard": "Job has already been added to scoreboard. Saving will update the previous entry.",
 				"alreadyclosed": "This job has already been closed.",
 				"appointmentconfirmation": "Send confirmation to customer?",
 				"associationwarning": "Any changes to associations will require updating the data from the new parent record to the job.",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 53fe8fbf3..6bba2a817 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -195,6 +195,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
 				"markexported": "",
@@ -1552,6 +1553,7 @@
 				"adjustments": "",
 				"adminwarning": "",
 				"allocations": "",
+				"alreadyaddedtoscoreboard": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "¿Enviar confirmación al cliente?",
 				"associationwarning": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index a35d205c2..1c446e2a3 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -195,6 +195,7 @@
 				"entered_total": "",
 				"enteringcreditmemo": "",
 				"federal_tax": "",
+				"generatepartslabel": "",
 				"iouexists": "",
 				"local_tax": "",
 				"markexported": "",
@@ -1552,6 +1553,7 @@
 				"adjustments": "",
 				"adminwarning": "",
 				"allocations": "",
+				"alreadyaddedtoscoreboard": "",
 				"alreadyclosed": "",
 				"appointmentconfirmation": "Envoyer une confirmation au client?",
 				"associationwarning": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 6cc6dc9b5..ecdf31997 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -510,6 +510,12 @@ export const TemplateList = (type, context) => {
             key: "parts_label_multiple",
             disabled: false,
           },
+          parts_invoice_label_single: {
+            title: i18n.t("printcenter.jobs.parts_invoice_label_single"),
+            description: "Parts Label Multiple",
+            key: "parts_invoice_label_single",
+            disabled: false,
+          },
           csi_invitation_action: {
             title: i18n.t("printcenter.jobs.csi_invitation_action"),
             description: "CSI invite",