Merged in release/2023-07-07 (pull request #873)

Release/2023 07 07

client/src/translations/en_us/common.json

@@ -2568,6 +2568,7 @@
 				"job_costing_ro_ins_co": "Job Costing by RO Source",
 				"jobs_completed_not_invoiced": "Jobs Completed not Invoiced",
 				"jobs_invoiced_not_exported": "Jobs Invoiced not Exported",
+				"jobs_scheduled_completion": "Jobs Scheduled Completion",
 				"jobs_reconcile": "Parts/Sublet/Labor Reconciliation",
 				"lag_time": "Lag Time",
 				"open_orders": "Open Orders by Date",

client/src/translations/es/common.json

@@ -2565,6 +2565,7 @@
 				"job_costing_ro_ins_co": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
+				"jobs_scheduled_completion": "",
 				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",

client/src/translations/fr/common.json

@@ -2565,6 +2565,7 @@
 				"job_costing_ro_ins_co": "",
 				"jobs_completed_not_invoiced": "",
 				"jobs_invoiced_not_exported": "",
+				"jobs_scheduled_completion": "",
 				"jobs_reconcile": "",
 				"lag_time": "",
 				"open_orders": "",

client/src/utils/TemplateConstants.js

@@ -1897,6 +1897,18 @@ export const TemplateList = (type, context) => {
             },
             group: "sales",
           },
+          jobs_scheduled_completion: {
+            title: i18n.t("reportcenter.templates.jobs_scheduled_completion"),
+            subject: i18n.t("reportcenter.templates.jobs_scheduled_completion"),
+            key: "jobs_scheduled_completion",
+            //idtype: "vendor",
+            disabled: false,
+            rangeFilter: {
+              object: i18n.t("reportcenter.labels.objects.jobs"),
+              field: i18n.t("jobs.fields.scheduled_completion"),
+            },
+            group: "jobs",
+          },
         }
       : {}),
     ...(!type || type === "courtesycarcontract"

server/accounting/qbxml/qbxml-receivables.js

@@ -263,9 +263,9 @@ const generateInvoiceQbxml = (
             BillAddress: {
               Addr1: jobs_by_pk.ownr_co_nm
                 ? jobs_by_pk.ownr_co_nm.substring(0, 30)
-                : `${`${jobs_by_pk.ownr_ln || ""} ${
+                : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-                    jobs_by_pk.ownr_fn || ""
+                    .substring(0, 30)
-                  }`.substring(0, 30)}`,
+                    .trim()}`,
               Addr2: jobs_by_pk.ownr_addr1,
               Addr3: jobs_by_pk.ownr_addr2,
               City: jobs_by_pk.ownr_city,
@@ -275,9 +275,9 @@ const generateInvoiceQbxml = (
             ShipAddress: {
               Addr1: jobs_by_pk.ownr_co_nm
                 ? jobs_by_pk.ownr_co_nm.substring(0, 30)
-                : `${`${jobs_by_pk.ownr_ln || ""} ${
+                : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-                    jobs_by_pk.ownr_fn || ""
+                    .substring(0, 30)
-                  }`.substring(0, 30)}`,
+                    .trim()}`,
               Addr2: jobs_by_pk.ownr_addr1,
               Addr3: jobs_by_pk.ownr_addr2,
               City: jobs_by_pk.ownr_city,

server/accounting/qbxml/qbxml-utils.js

@@ -21,9 +21,9 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
         ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
             jobs_by_pk.owner.accountingid || ""
           }`
-        : `${`${jobs_by_pk.ownr_ln || ""} ${
+        : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-            jobs_by_pk.ownr_fn || ""
+            .substring(0, 30)
-          }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
+            .trim()} #${jobs_by_pk.owner.accountingid || ""}`
     )
       .trim()
       .replace(":", " ");
@@ -39,9 +39,9 @@ exports.generateOwnerTier = (jobs_by_pk, isThreeTier, twotierpref) => {
           ? `${jobs_by_pk.ownr_co_nm.substring(0, 30)} #${
               jobs_by_pk.owner.accountingid || ""
             }`
-          : `${`${jobs_by_pk.ownr_ln || ""} ${
+          : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}`
-              jobs_by_pk.ownr_fn || ""
+              .substring(0, 30)
-            }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}`
+              .trim()} #${jobs_by_pk.owner.accountingid || ""}`
       )
         .trim()
         .replace(":", " ");