From 4dd868130c70dbfe40ef8a1e33b33a07738b8378 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Wed, 21 Jun 2023 08:31:30 -0700 Subject: [PATCH 1/2] IO-2341 Jobs Schedule Completion Report --- client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + client/src/utils/TemplateConstants.js | 12 ++++++++++++ 4 files changed, 15 insertions(+) diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 9a1f09d9c..5a057c73e 100644 --- a/client/src/translations/en_us/common.json +++ b/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", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 52857b75f..244ccc21f 100644 --- a/client/src/translations/es/common.json +++ b/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": "", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 9105279ef..98d10ef58 100644 --- a/client/src/translations/fr/common.json +++ b/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": "", diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index debbfc57e..c07e375fa 100644 --- a/client/src/utils/TemplateConstants.js +++ b/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" From 6de06e084bdab7383e0d51bbcac519652a8a036a Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Fri, 23 Jun 2023 08:53:14 -0700 Subject: [PATCH 2/2] IO-2342 QBD Owner Name with just LN Trim Removes extra space if there is just a OWNR_LN before the ACCT # --- server/accounting/qbxml/qbxml-receivables.js | 12 ++++++------ server/accounting/qbxml/qbxml-utils.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/server/accounting/qbxml/qbxml-receivables.js b/server/accounting/qbxml/qbxml-receivables.js index e697e0985..629bb4dca 100644 --- a/server/accounting/qbxml/qbxml-receivables.js +++ b/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_fn || "" - }`.substring(0, 30)}`, + : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}` + .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_fn || "" - }`.substring(0, 30)}`, + : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}` + .substring(0, 30) + .trim()}`, Addr2: jobs_by_pk.ownr_addr1, Addr3: jobs_by_pk.ownr_addr2, City: jobs_by_pk.ownr_city, diff --git a/server/accounting/qbxml/qbxml-utils.js b/server/accounting/qbxml/qbxml-utils.js index af59b3cf7..8909cbb2a 100644 --- a/server/accounting/qbxml/qbxml-utils.js +++ b/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_fn || "" - }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}` + : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}` + .substring(0, 30) + .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_fn || "" - }`.substring(0, 30)} #${jobs_by_pk.owner.accountingid || ""}` + : `${`${jobs_by_pk.ownr_ln || ""} ${jobs_by_pk.ownr_fn || ""}` + .substring(0, 30) + .trim()} #${jobs_by_pk.owner.accountingid || ""}` ) .trim() .replace(":", " ");