diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx
index e8cbec5e1..cdd71741a 100644
--- a/client/src/components/job-detail-lines/job-lines.component.jsx
+++ b/client/src/components/job-detail-lines/job-lines.component.jsx
@@ -322,19 +322,17 @@ export function JobLinesComponent({
             render: (text, record) => (
               <Space>
                 {(record.manual_line || jobIsPrivate) && !technician && (
-                  <>
-                    <Button
-                      disabled={jobRO}
-                      onClick={() => {
-                        setJobLineEditContext({
-                          actions: { refetch: refetch, submit: form && form.submit },
-                          context: { ...record, jobid: job.id }
-                        });
-                      }}
-                    >
-                      <EditFilled />
-                    </Button>
-                  </>
+                  <Button
+                    disabled={jobRO}
+                    onClick={() => {
+                      setJobLineEditContext({
+                        actions: { refetch: refetch, submit: form && form.submit },
+                        context: { ...record, jobid: job.id }
+                      });
+                    }}
+                  >
+                    <EditFilled />
+                  </Button>
                 )}
                 <Button
                   title={t("tasks.buttons.create")}
@@ -350,31 +348,29 @@ export function JobLinesComponent({
                   <FaTasks />
                 </Button>
                 {(record.manual_line || jobIsPrivate) && !technician && (
-                  <>
-                    <Button
-                      disabled={jobRO}
-                      onClick={async () => {
-                        await deleteJobLine({
-                          variables: { joblineId: record.id },
-                          update(cache) {
-                            cache.modify({
-                              fields: {
-                                joblines(existingJobLines, { readField }) {
-                                  return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
-                                }
+                  <Button
+                    disabled={jobRO}
+                    onClick={async () => {
+                      await deleteJobLine({
+                        variables: { joblineId: record.id },
+                        update(cache) {
+                          cache.modify({
+                            fields: {
+                              joblines(existingJobLines, { readField }) {
+                                return existingJobLines.filter((jlRef) => record.id !== readField("id", jlRef));
                               }
-                            });
-                          }
-                        });
-                        await axios.post("/job/totalsssu", {
-                          id: job.id
-                        });
-                        refetch && refetch();
-                      }}
-                    >
-                      <DeleteFilled />
-                    </Button>
-                  </>
+                            }
+                          });
+                        }
+                      });
+                      await axios.post("/job/totalsssu", {
+                        id: job.id
+                      });
+                      if (refetch) refetch();
+                    }}
+                  >
+                    <DeleteFilled />
+                  </Button>
                 )}
               </Space>
             )
diff --git a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
index a42e6734e..255832d44 100644
--- a/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
+++ b/client/src/components/job-line-convert-to-labor/job-line-convert-to-labor.component.jsx
@@ -14,16 +14,26 @@ import { insertAuditTrail } from "../../redux/application/application.actions";
 import { selectTechnician } from "../../redux/tech/tech.selectors";
 import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import { useNotification } from "../../contexts/Notifications/notificationContext.jsx";
+import { selectIsPartsEntry } from "../../redux/application/application.selectors.js";
 
 const mapStateToProps = createStructuredSelector({
-  technician: selectTechnician
+  technician: selectTechnician,
+  isPartsEntry: selectIsPartsEntry
 });
 const mapDispatchToProps = (dispatch) => ({
   insertAuditTrail: ({ jobid, operation, type }) => dispatch(insertAuditTrail({ jobid, operation, type }))
 });
 export default connect(mapStateToProps, mapDispatchToProps)(JobLineConvertToLabor);
 
-export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail, technician, ...otherBtnProps }) {
+export function JobLineConvertToLabor({
+  children,
+  jobline,
+  job,
+  insertAuditTrail,
+  technician,
+  isPartsEntry,
+  ...otherBtnProps
+}) {
   const { t } = useTranslation();
 
   const [loading, setLoading] = useState(false);
@@ -168,7 +178,7 @@ export function JobLineConvertToLabor({ children, jobline, job, insertAuditTrail
   return (
     <>
       {children}
-      {jobline.act_price !== 0 && !technician && (
+      {!isPartsEntry && jobline.act_price !== 0 && !technician && (
         <Popover disabled={jobline.convertedtolbr} content={overlay} open={visibility} placement="bottom">
           <Tooltip title={t("joblines.actions.converttolabor")}>
             <Button