- The Great merge

Signed-off-by: Dave Richer <dave@imexsystems.ca>

client/src/components/bill-form/bill-form.component.jsx

@@ -74,7 +74,7 @@ export function BillFormComponent({
     //   // Gate bill lines
     //   if (!values?.billlines?.length) return;
 
-    //   const billlines = values.billlines.map((b) => {
+        //   const billlines = values.billlines.map((b) => {
     //     b.applicable_taxes.federal = false;
     //     return b;
     //   });
@@ -393,11 +393,11 @@ export function BillFormComponent({
                 {/*</Form.Item>*/}
                 {/*  {bodyshop.pbs_serialnumber || bodyshop.cdk_dealerid ? (*/}
                 {/*      <Form.Item*/}
-                {/*          span={2}*/}
-                {/*          label={t("bills.labels.federal_tax_exempt")}*/}
-                {/*          name="federal_tax_exempt"*/}
+                      {/*          span={2}*/}
+                      {/*          label={t("bills.labels.federal_tax_exempt")}*/}
+                      {/*          name="federal_tax_exempt"*/}
                 {/*      >*/}
-                {/*          <Switch onChange={handleFederalTaxExemptSwitchToggle} />*/}
+                      {/*          <Switch onChange={handleFederalTaxExemptSwitchToggle} />*/}
                 {/*      </Form.Item>*/}
                 {/*  ) : null}*/}
                 <Form.Item shouldUpdate span={13}>

client/src/components/bill-form/bill-form.lines.component.jsx

@@ -540,7 +540,7 @@ export function BillEnterModalLinesComponent({
             //       key: `${field.index}fedtax`,
             //       valuePropName: "checked",
             //       //  initialValue: true,
-            //       name: [field.name, "applicable_taxes", "federal"],
+                        //       name: [field.name, "applicable_taxes", "federal"],
             //     };
             //   },
             //   formInput: (record, index) => <Switch disabled={disabled} />,