diff --git a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx index 8029816e5..e03d1fa24 100644 --- a/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx +++ b/client/src/components/accounting-receivables-table/accounting-receivables-table.component.jsx @@ -110,13 +110,6 @@ export function AccountingReceivablesTableComponent({ sorter: (a, b) => alphaSort(a.clm_no, b.clm_no), sortOrder: state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order, - render: (text, record) => { - return record.clm_no ? ( - {record.clm_no} - ) : ( - t("general.labels.unknown") - ); - }, }, { title: t("jobs.fields.clm_total"), @@ -126,11 +119,7 @@ export function AccountingReceivablesTableComponent({ sortOrder: state.sortedInfo.columnKey === "clm_total" && state.sortedInfo.order, render: (text, record) => { - return record.clm_total ? ( - {record.clm_total} - ) : ( - t("general.labels.unknown") - ); + return {record.clm_total}; }, }, { diff --git a/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx b/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx index ccc43ed7f..76836a6a8 100644 --- a/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx +++ b/client/src/components/job-line-note-popup/job-line-note-popup.component.jsx @@ -1,10 +1,10 @@ -import React, { useState, useEffect } from "react"; -import { Input, notification, Space } from "antd"; import { FieldTimeOutlined } from "@ant-design/icons"; -import LoadingSpinner from "../loading-spinner/loading-spinner.component"; import { useMutation } from "@apollo/client"; -import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries"; +import { Input, notification } from "antd"; +import React, { useEffect, useState } from "react"; import { useTranslation } from "react-i18next"; +import { UPDATE_JOB_LINE } from "../../graphql/jobs-lines.queries"; +import LoadingSpinner from "../loading-spinner/loading-spinner.component"; export default function JobLineNotePopup({ jobline, disabled }) { const [editing, setEditing] = useState(false); @@ -57,21 +57,21 @@ export default function JobLineNotePopup({ jobline, disabled }) { ); return (
- {jobline.ioucreated && ( - - - {t("joblines.labels.ioucreated")} - - )}
!disabled && setEditing(true)} > - {jobline.notes} + {jobline.ioucreated && ( +
+ + {t("joblines.labels.ioucreated")} +
+ )} + {jobline.notes || null}
); diff --git a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js index 8220e00b4..fc5b9c0ca 100644 --- a/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js +++ b/client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js @@ -109,7 +109,7 @@ export async function CreateIouForJob( delete line.id; delete line.__typename; line.oem_partno = `${line.oem_partno ? `${line.oem_partno} - ` : ``}IOU $${ - line.act_price || 0 + (line.act_price && line.act_price.toFixed(2)) || 0 }/${line.mod_lb_hrs || 0}hrs`; line.act_price = 0; line.mod_lb_hrs = 0;