IO-1805 QBO Modifications for No 1 group.

bodyshop_translations.babel

@@ -36581,6 +36581,58 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <folder_node>
+                                        <name>bodyshop</name>
+                                        <children>
+                                            <folder_node>
+                                                <name>labels</name>
+                                                <children>
+                                                    <concept_node>
+                                                        <name>qbo_departmentid</name>
+                                                        <definition_loaded>false</definition_loaded>
+                                                        <description></description>
+                                                        <comment></comment>
+                                                        <default_text></default_text>
+                                                        <translations>
+                                                            <translation>
+                                                                <language>en-US</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>es-MX</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>fr-CA</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                        </translations>
+                                                    </concept_node>
+                                                    <concept_node>
+                                                        <name>qbo_usa</name>
+                                                        <definition_loaded>false</definition_loaded>
+                                                        <description></description>
+                                                        <comment></comment>
+                                                        <default_text></default_text>
+                                                        <translations>
+                                                            <translation>
+                                                                <language>en-US</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>es-MX</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>fr-CA</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                        </translations>
+                                                    </concept_node>
+                                                </children>
+                                            </folder_node>
+                                        </children>
+                                    </folder_node>
                                     <concept_node>
                                         <name>cardsettings</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/shop-info/shop-info.general.component.jsx

@@ -163,6 +163,27 @@ export default function ShopInfoGeneral({ form }) {
         >
           <Switch />
         </Form.Item>
+
+        <Form.Item shouldUpdate noStyle>
+          {() => (
+            <Form.Item
+              label={t("bodyshop.labels.qbo_usa")}
+              shouldUpdate
+              valuePropName="checked"
+              name={["accountingconfig", "qbo_usa"]}
+            >
+              <Switch
+                disabled={!form.getFieldValue(["accountingconfig", "qbo"])}
+              />
+            </Form.Item>
+          )}
+        </Form.Item>
+        <Form.Item
+          label={t("bodyshop.labels.qbo_departmentid")}
+          name={["accountingconfig", "qbo_departmentid"]}
+        >
+          <Input />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.labels.accountingtiers")}
           rules={[

client/src/translations/en_us/common.json

@@ -2178,6 +2178,12 @@
 				"ats": "Alternative Transportation",
 				"bodyhours": "B",
 				"bodypriority": "B/P",
+				"bodyshop": {
+					"labels": {
+						"qbo_departmentid": "QBO Department ID",
+						"qbo_usa": "QBO USA"
+					}
+				},
 				"cardsettings": "Card Settings",
 				"clm_no": "Claim Number",
 				"comment": "Comment",

client/src/translations/es/common.json

@@ -2178,6 +2178,12 @@
 				"ats": "",
 				"bodyhours": "",
 				"bodypriority": "",
+				"bodyshop": {
+					"labels": {
+						"qbo_departmentid": "",
+						"qbo_usa": ""
+					}
+				},
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",

client/src/translations/fr/common.json

@@ -2178,6 +2178,12 @@
 				"ats": "",
 				"bodyhours": "",
 				"bodypriority": "",
+				"bodyshop": {
+					"labels": {
+						"qbo_departmentid": "",
+						"qbo_usa": ""
+					}
+				},
 				"cardsettings": "",
 				"clm_no": "",
 				"comment": "",

server/accounting/qb-receivables-lines.js

@@ -611,6 +611,32 @@ exports.default = function ({
     }
   }
 
+  //QB USA with GST
+  //This was required for the No. 1 Collision Group.
+  if (
+    bodyshop.accountingconfig &&
+    bodyshop.accountingconfig.qbo &&
+    bodyshop.accountingconfig.qbo_usa &&
+    bodyshop.region_config.includes("CA_")
+  ) {
+    InvoiceLineAdd.push({
+      DetailType: "SalesItemLineDetail",
+      Amount: Dinero(jobs_by_pk.job_totals.totals.federal_tax).toFormat(
+        DineroQbFormat
+      ),
+      SalesItemLineDetail: {
+        ...(jobs_by_pk.class
+          ? { ClassRef: { value: classes[jobs_by_pk.class] } }
+          : {}),
+        ItemRef: {
+          value:
+            items[bodyshop.md_responsibility_centers.taxes.federal.accountitem],
+        },
+        Qty: 1,
+      },
+    });
+  }
+
   return InvoiceLineAdd;
 };
 
@@ -626,7 +652,7 @@ const findTaxCode = ({ local, state, federal }, taxcode) => {
   } else if (t.length > 1) {
     return "Multiple Tax Codes Match";
   } else {
-    return "No Tax Code Matches";
+    return "";
   }
 };
 exports.findTaxCode = findTaxCode;

server/accounting/qbo/qbo-payables.js

@@ -174,6 +174,55 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor) {
     req
   );
 
+  const lines = bill.billlines.map((il) =>
+    generateBillLine(
+      il,
+      accounts,
+      bill.job.class,
+      bill.job.bodyshop.md_responsibility_centers.sales_tax_codes,
+      classes,
+      taxCodes,
+      bill.job.bodyshop.md_responsibility_centers.costs
+    )
+  );
+
+  //QB USA with GST
+  //This was required for the No. 1 Collision Group.
+  if (
+    bill.job.bodyshop.accountingconfig &&
+    bill.job.bodyshop.accountingconfig.qbo &&
+    bill.job.bodyshop.accountingconfig.qbo_usa &&
+    bill.job.bodyshop.region_config.includes("CA_")
+  ) {
+    lines.push({
+      DetailType: "AccountBasedExpenseLineDetail",
+
+      AccountBasedExpenseLineDetail: {
+        ...(bill.job.class
+          ? { ClassRef: { value: classes[bill.job.class] } }
+          : {}),
+        AccountRef: {
+          value:
+            accounts[
+              bill.job.bodyshop.md_responsibility_centers.taxes.federal
+                .accountdesc
+            ],
+        },
+      },
+
+      Amount: Dinero({
+        amount: Math.round(
+          bill.billlines.reduce((acc, val) => {
+            return acc + val.actual_cost * val.quantity;
+          }, 0) * 100
+        ),
+      })
+        .percentage(bill.federal_tax_rate)
+
+        .toFormat(DineroQbFormat),
+    });
+  }
+
   const billQbo = {
     VendorRef: {
       value: vendor.Id,
@@ -192,17 +241,7 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor) {
     //...(bill.job.class ? { ClassRef: { Id: classes[bill.job.class] } } : {}),
 
     PrivateNote: `RO ${bill.job.ro_number || ""}`,
-    Line: bill.billlines.map((il) =>
+    Line: lines,
-      generateBillLine(
-        il,
-        accounts,
-        bill.job.class,
-        bill.job.bodyshop.md_responsibility_centers.sales_tax_codes,
-        classes,
-        taxCodes,
-        bill.job.bodyshop.md_responsibility_centers.costs
-      )
-    ),
   };
   logger.log("qbo-payable-objectlog", "DEBUG", req.user.email, bill.id, {
     billQbo,
@@ -282,7 +321,7 @@ async function QueryMetaData(oauthClient, qbo_realmId, req) {
     url: urlBuilder(
       qbo_realmId,
       "query",
-      `select * From Account where AccountType = 'Cost of Goods Sold'`
+      `select * From Account where AccountType in ('Cost of Goods Sold', 'Other Current Liability')`
     ),
     method: "POST",
     headers: {

server/accounting/qbo/qbo-receivables.js

@@ -455,6 +455,25 @@ async function InsertInvoice(
     CustomerRef: {
       value: parentTierRef.Id,
     },
+    ...(bodyshop.accountingconfig.qbo_departmentid &&
+      bodyshop.accountingconfig.qbo_departmentid.trim() !== "" && {
+        DepartmentRef: { value: bodyshop.accountingconfig.qbo_departmentid },
+      }),
+
+    ...(bodyshop.accountingconfig &&
+      bodyshop.accountingconfig.qbo &&
+      bodyshop.accountingconfig.qbo_usa &&
+      bodyshop.region_config.includes("CA_") && {
+        TxnTaxDetail: {
+          TxnTaxCodeRef: {
+            value:
+              taxCodes[
+                bodyshop.md_responsibility_centers.taxes.state.accountitem
+              ],
+          },
+        },
+      }),
+
     ...(bodyshop.accountingconfig.printlater
       ? { PrintStatus: "NeedToPrint" }
       : {}),

server/graphql-client/queries.js

@@ -111,6 +111,11 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
     ro_number
     clm_total
     clm_no
+    v_model_yr
+    v_model_desc
+    v_make_desc
+    v_vin
+    plate_no
     ownerid
     ownr_ln
     ownr_fn
@@ -176,6 +181,7 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
   bodyshops(where: {associations: {active: {_eq: true}}}) {
     id
     md_responsibility_centers
+    region_config
     accountingconfig
     md_ins_cos
     timezone
@@ -389,6 +395,8 @@ query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) {
       bodyshop{
         md_responsibility_centers
         timezone
+        region_config
+        accountingconfig
       }
     }
     billlines{
@@ -550,7 +558,7 @@ exports.QUERY_EMPLOYEE_PIN = `query QUERY_EMPLOYEE_PIN($shopId: uuid!, $employee
   }
 }`;
 
-exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshopid: uuid!) {
+exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshopid: uuid!, $end: timestamptz) {
   bodyshops_by_pk(id: $bodyshopid){
 
       id
@@ -568,7 +576,7 @@ exports.AUTOHOUSE_QUERY = `query AUTOHOUSE_EXPORT($start: timestamptz, $bodyshop
       jc_hourly_rates
     timezone
   }
-  jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {shopid: {_eq: $bodyshopid}}]}) {
+  jobs(where: {_and: [{converted: {_eq: true}}, {updated_at: {_gt: $start}}, {updated_at: {_lte: $end}}, {shopid: {_eq: $bodyshopid}}]}) {
     id
     ro_number
     status