Merged in release/2022-01-28 (pull request #361)

release/2022-01-28

Approved-by: Patrick Fic

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,7 +66,11 @@ export function BillEnterModalLinesComponent({
             }
           >
             {() => {
-              return (
+              return props.children;
+            }}
+          </Form.Item>
+        ),
+        formInput: (record, index) => (
           <BillLineSearchSelect
             disabled={disabled}
             options={lineData}
@@ -83,8 +87,7 @@ export function BillEnterModalLinesComponent({
                         quantity: opt.part_qty || 1,
                         actual_price: opt.cost,
                         cost_center: opt.part_type
-                                ? bodyshop.pbs_serialnumber ||
+                          ? bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid
-                                  bodyshop.cdk_dealerid
                             ? opt.part_type !== "PAE"
                               ? opt.part_type
                               : null
@@ -102,9 +105,6 @@ export function BillEnterModalLinesComponent({
               });
             }}
           />
-              );
-            }}
-          </Form.Item>
         ),
       },
       {
@@ -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

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)}`
                   : ``}

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>

client/src/components/parts-order-modal/parts-order-modal.component.jsx

@@ -91,7 +91,8 @@ export function PartsOrderModalComponent({
             <div>
               {fields.map((field, index) => (
                 <Form.Item required={false} key={field.key}>
-                  <LayoutFormRow grow noDivider>
+                  <div style={{ display: "flex" }}>
+                    <LayoutFormRow grow noDivider style={{ flex: 1 }}>
                       <Form.Item
                         //span={8}
                         label={t("parts_orders.fields.line_desc")}
@@ -113,6 +114,13 @@ export function PartsOrderModalComponent({
                       >
                         <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")}
@@ -151,8 +159,8 @@ export function PartsOrderModalComponent({
                           <CurrencyInput />
                         </Form.Item>
                       )}
-
+                    </LayoutFormRow>
-                    <Space wrap align="center">
+                    <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>

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

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,