diff --git a/client/src/components/bill-form/bill-form.lines.component.jsx b/client/src/components/bill-form/bill-form.lines.component.jsx
index 4aa19ac31..dd8866d63 100644
--- a/client/src/components/bill-form/bill-form.lines.component.jsx
+++ b/client/src/components/bill-form/bill-form.lines.component.jsx
@@ -58,7 +58,7 @@ export function BillEnterModalLinesComponent({
             ],
           };
         },
-        formInput: (record, index) => (
+        wrapper: (props) => (
           <Form.Item
             noStyle
             shouldUpdate={(prev, cur) =>
@@ -66,46 +66,46 @@ export function BillEnterModalLinesComponent({
             }
           >
             {() => {
-              return (
-                <BillLineSearchSelect
-                  disabled={disabled}
-                  options={lineData}
-                  style={{ width: "100%", minWidth: "10rem" }}
-                  allowRemoved={form.getFieldValue("is_credit_memo") || false}
-                  onSelect={(value, opt) => {
-                    setFieldsValue({
-                      billlines: getFieldsValue(["billlines"]).billlines.map(
-                        (item, idx) => {
-                          if (idx === index) {
-                            return {
-                              ...item,
-                              line_desc: opt.line_desc,
-                              quantity: opt.part_qty || 1,
-                              actual_price: opt.cost,
-                              cost_center: opt.part_type
-                                ? bodyshop.pbs_serialnumber ||
-                                  bodyshop.cdk_dealerid
-                                  ? opt.part_type !== "PAE"
-                                    ? opt.part_type
-                                    : null
-                                  : responsibilityCenters.defaults &&
-                                    (responsibilityCenters.defaults.costs[
-                                      opt.part_type
-                                    ] ||
-                                      null)
-                                : null,
-                            };
-                          }
-                          return item;
-                        }
-                      ),
-                    });
-                  }}
-                />
-              );
+              return props.children;
             }}
           </Form.Item>
         ),
+        formInput: (record, index) => (
+          <BillLineSearchSelect
+            disabled={disabled}
+            options={lineData}
+            style={{ width: "100%", minWidth: "10rem" }}
+            allowRemoved={form.getFieldValue("is_credit_memo") || false}
+            onSelect={(value, opt) => {
+              setFieldsValue({
+                billlines: getFieldsValue(["billlines"]).billlines.map(
+                  (item, idx) => {
+                    if (idx === index) {
+                      return {
+                        ...item,
+                        line_desc: opt.line_desc,
+                        quantity: opt.part_qty || 1,
+                        actual_price: opt.cost,
+                        cost_center: opt.part_type
+                          ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
+                            ? opt.part_type !== "PAE"
+                              ? opt.part_type
+                              : null
+                            : responsibilityCenters.defaults &&
+                              (responsibilityCenters.defaults.costs[
+                                opt.part_type
+                              ] ||
+                                null)
+                          : null,
+                      };
+                    }
+                    return item;
+                  }
+                ),
+              });
+            }}
+          />
+        ),
       },
       {
         title: t("billlines.fields.line_desc"),
@@ -537,6 +537,7 @@ const EditableCell = ({
   formInput,
   formItemProps,
   additional,
+  wrapper,
   ...restProps
 }) => {
   if (additional)
@@ -554,7 +555,20 @@ const EditableCell = ({
         </Space>
       </td>
     );
-
+  if (wrapper)
+    return (
+      <wrapper>
+        <td {...restProps}>
+          <Form.Item
+            labelCol={{ span: 0 }}
+            name={dataIndex}
+            {...(formItemProps && formItemProps(record))}
+          >
+            {(formInput && formInput(record, record.name)) || children}
+          </Form.Item>
+        </td>
+      </wrapper>
+    );
   return (
     <td {...restProps}>
       <Form.Item
diff --git a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
index a0d19f408..96eec6cdc 100644
--- a/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
+++ b/client/src/components/bill-line-search-select/bill-line-search-select.component.jsx
@@ -9,7 +9,7 @@ const BillLineSearchSelect = (
   ref
 ) => {
   const { t } = useTranslation();
-  console.log(allowRemoved);
+
   return (
     <Select
       disabled={disabled}
@@ -56,7 +56,7 @@ const BillLineSearchSelect = (
               <span>{`${item.removed ? `(REMOVED) ` : ""}${item.line_desc}${
                 item.oem_partno ? ` - ${item.oem_partno}` : ""
               }`}</span>
-              <span style={{ float: "right" }}>
+              <span style={{ float: "right", paddingleft: "1rem" }}>
                 {item.act_price
                   ? `$${item.act_price && item.act_price.toFixed(2)}`
                   : ``}
diff --git a/client/src/components/bills-list-table/bills-list-table.component.jsx b/client/src/components/bills-list-table/bills-list-table.component.jsx
index 0f53e0e6b..1f1e3d3fc 100644
--- a/client/src/components/bills-list-table/bills-list-table.component.jsx
+++ b/client/src/components/bills-list-table/bills-list-table.component.jsx
@@ -58,7 +58,8 @@ export function BillsListTableComponent({
         disabled={
           record.is_credit_memo || record.vendorid === bodyshop.inhousevendorid
         }
-        onClick={() =>
+        onClick={() => {
+          console.log(record);
           setPartsOrderContext({
             actions: {},
             context: {
@@ -74,12 +75,13 @@ export function BillsListTableComponent({
                   cost: i.actual_cost,
                   quantity: i.quantity,
                   joblineid: i.joblineid,
+                  oem_partno: i.jobline && i.jobline.oem_partno,
                 };
               }),
               isReturn: true,
             },
-          })
-        }
+          });
+        }}
       >
         {t("bills.actions.return")}
       </Button>
diff --git a/client/src/components/parts-order-modal/parts-order-modal.component.jsx b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
index cd79fe81f..98e3e5008 100644
--- a/client/src/components/parts-order-modal/parts-order-modal.component.jsx
+++ b/client/src/components/parts-order-modal/parts-order-modal.component.jsx
@@ -91,68 +91,76 @@ export function PartsOrderModalComponent({
             <div>
               {fields.map((field, index) => (
                 <Form.Item required={false} key={field.key}>
-                  <LayoutFormRow grow noDivider>
-                    <Form.Item
-                      //span={8}
-                      label={t("parts_orders.fields.line_desc")}
-                      key={`${index}line_desc`}
-                      name={[field.name, "line_desc"]}
-                      rules={[
-                        {
-                          required: true,
-                          //message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("parts_orders.fields.line_remarks")}
-                      key={`${index}line_remarks`}
-                      name={[field.name, "line_remarks"]}
-                    >
-                      <Input />
-                    </Form.Item>
-                    {
-                      // <Form.Item
-                      //   label={t("parts_orders.fields.db_price")}
-                      //   key={`${index}db_price`}
-                      //   name={[field.name, "db_price"]}
-                      // >
-                      //   <CurrencyInput />
-                      // </Form.Item>
-                    }
-                    <Form.Item
-                      label={t("parts_orders.fields.quantity")}
-                      key={`${index}quantity`}
-                      name={[field.name, "quantity"]}
-                      rules={[
-                        {
-                          required: true,
-                          //message: t("general.validation.required"),
-                        },
-                      ]}
-                    >
-                      <InputNumber />
-                    </Form.Item>
-                    <Form.Item
-                      label={t("parts_orders.fields.act_price")}
-                      key={`${index}act_price`}
-                      name={[field.name, "act_price"]}
-                    >
-                      <CurrencyInput />
-                    </Form.Item>
-                    {isReturn && (
+                  <div style={{ display: "flex" }}>
+                    <LayoutFormRow grow noDivider style={{ flex: 1 }}>
                       <Form.Item
-                        label={t("parts_orders.fields.cost")}
-                        key={`${index}cost`}
-                        name={[field.name, "cost"]}
+                        //span={8}
+                        label={t("parts_orders.fields.line_desc")}
+                        key={`${index}line_desc`}
+                        name={[field.name, "line_desc"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("parts_orders.fields.line_remarks")}
+                        key={`${index}line_remarks`}
+                        name={[field.name, "line_remarks"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("parts_orders.fields.oem_partno")}
+                        key={`${index}oem_partno`}
+                        name={[field.name, "oem_partno"]}
+                      >
+                        <Input />
+                      </Form.Item>
+                      {
+                        // <Form.Item
+                        //   label={t("parts_orders.fields.db_price")}
+                        //   key={`${index}db_price`}
+                        //   name={[field.name, "db_price"]}
+                        // >
+                        //   <CurrencyInput />
+                        // </Form.Item>
+                      }
+                      <Form.Item
+                        label={t("parts_orders.fields.quantity")}
+                        key={`${index}quantity`}
+                        name={[field.name, "quantity"]}
+                        rules={[
+                          {
+                            required: true,
+                            //message: t("general.validation.required"),
+                          },
+                        ]}
+                      >
+                        <InputNumber />
+                      </Form.Item>
+                      <Form.Item
+                        label={t("parts_orders.fields.act_price")}
+                        key={`${index}act_price`}
+                        name={[field.name, "act_price"]}
                       >
                         <CurrencyInput />
                       </Form.Item>
-                    )}
-
-                    <Space wrap align="center">
+                      {isReturn && (
+                        <Form.Item
+                          label={t("parts_orders.fields.cost")}
+                          key={`${index}cost`}
+                          name={[field.name, "cost"]}
+                        >
+                          <CurrencyInput />
+                        </Form.Item>
+                      )}
+                    </LayoutFormRow>
+                    <Space wrap size="small" align="center">
                       <div>
                         <DeleteFilled
                           style={{ margin: "1rem" }}
@@ -167,7 +175,7 @@ export function PartsOrderModalComponent({
                         total={fields.length}
                       />
                     </Space>
-                  </LayoutFormRow>
+                  </div>
                 </Form.Item>
               ))}
             </div>
diff --git a/client/src/graphql/jobs-lines.queries.js b/client/src/graphql/jobs-lines.queries.js
index 6759c82fb..cc4b59c04 100644
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -181,7 +181,10 @@ export const UPDATE_JOB_LINE = gql`
 
 export const GET_JOB_LINES_TO_ENTER_BILL = gql`
   query GET_JOB_LINES_TO_ENTER_BILL($id: uuid!) {
-    joblines(where: { jobid: { _eq: $id } }, order_by: { act_price: desc }) {
+    joblines(
+      where: { jobid: { _eq: $id } }
+      order_by: { act_price: desc_nulls_last }
+    ) {
       removed
       id
       line_desc
diff --git a/server/accounting/qbxml/qbxml-payments.js b/server/accounting/qbxml/qbxml-payments.js
index ceb07ae99..7820f9a7e 100644
--- a/server/accounting/qbxml/qbxml-payments.js
+++ b/server/accounting/qbxml/qbxml-payments.js
@@ -136,7 +136,9 @@ const generatePayment = (payment, isThreeTier, twoTierPref) => {
               PaymentMethodRef: {
                 FullName: payment.type,
               },
-              Memo: `RO ${payment.job.ro_number || ""} ${
+              Memo: `RO ${payment.job.ro_number || ""} OWNER ${
+                payment.job.ownr_fn || ""
+              } ${payment.job.ownr_ln || ""} ${payment.job.ownr_co_nm || ""} ${
                 payment.stripeid || ""
               } ${payment.payer ? ` PAID BY ${payment.payer}` : ""}`,
               IsAutoApply: true,