From 87f68f184065d061f5cd42cedf8ffbf55e8fe108 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 30 May 2022 16:30:49 -0700
Subject: [PATCH 1/3] Add A/R Account to Receivables Export.
---
server/accounting/qbxml/qbxml-receivables.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/server/accounting/qbxml/qbxml-receivables.js b/server/accounting/qbxml/qbxml-receivables.js
index 0641c67c3..78c7389f7 100644
--- a/server/accounting/qbxml/qbxml-receivables.js
+++ b/server/accounting/qbxml/qbxml-receivables.js
@@ -249,7 +249,9 @@ const generateInvoiceQbxml = (
)}:${generateJobTier(jobs_by_pk)}`
).trim(),
},
-
+ ARAccountRef: {
+ FullName: bodyshop.md_responsibility_centers.ar.accountname,
+ },
...(jobs_by_pk.class
? { ClassRef: { FullName: jobs_by_pk.class } }
: {}),
From 534f75c9b1e8b60a8e274bd3da4cc1056e894457 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Fri, 3 Jun 2022 09:04:40 -0700
Subject: [PATCH 2/3] IO-1913 Add Rental Reservation key
---
bodyshop_translations.babel | 21 +++++++++++++++++++++
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 | 8 ++++++++
server/job/job-totals.js | 2 +-
6 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index 5f5bb62e5..ad5db59a6 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -36258,6 +36258,27 @@
+
+ rental_reservation
+ false
+
+
+
+
+
+ en-US
+ false
+
+
+ es-MX
+ false
+
+
+ fr-CA
+ false
+
+
+
ro_totals
false
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index c684228ce..e2d87fbe5 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -2145,6 +2145,7 @@
"purchases_by_ro_detail": "Purchases - Detail",
"purchases_by_ro_summary": "Purchases - Summary",
"qc_sheet": "Quality Control Sheet",
+ "rental_reservation": "Rental Reservation",
"ro_totals": "RO Totals",
"ro_with_description": "RO Summary with Descriptions",
"sgi_certificate_of_repairs": "SGI - Certificate of Repairs",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index af04f5bb1..9661a5e88 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -2145,6 +2145,7 @@
"purchases_by_ro_detail": "",
"purchases_by_ro_summary": "",
"qc_sheet": "",
+ "rental_reservation": "",
"ro_totals": "",
"ro_with_description": "",
"sgi_certificate_of_repairs": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index fbd28bd87..c4eee69ac 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -2145,6 +2145,7 @@
"purchases_by_ro_detail": "",
"purchases_by_ro_summary": "",
"qc_sheet": "",
+ "rental_reservation": "",
"ro_totals": "",
"ro_with_description": "",
"sgi_certificate_of_repairs": "",
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index 861a752ea..ee91dd02c 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -480,6 +480,14 @@ export const TemplateList = (type, context) => {
disabled: false,
group: "ro",
},
+ rental_reservation: {
+ title: i18n.t("printcenter.jobs.rental_reservation"),
+ description: "CASL Authorization",
+ subject: i18n.t("printcenter.jobs.rental_reservation"),
+ key: "rental_reservation",
+ disabled: false,
+ group: "pre",
+ },
}
: {}),
...(!type || type === "job_special"
diff --git a/server/job/job-totals.js b/server/job/job-totals.js
index b61259fe2..54b30a9d6 100644
--- a/server/job/job-totals.js
+++ b/server/job/job-totals.js
@@ -37,7 +37,7 @@ exports.totalsSsu = async function (req, res) {
clm_total: newTotals.totals.total_repairs.toFormat("0.00"),
owner_owing: newTotals.totals.custPayable.total.toFormat("0.00"),
job_totals: newTotals,
- queued_for_parts: true,
+ //queued_for_parts: true,
},
});
From bd6553f8e45795033a2c3fe5e3992b9ecf8697ce Mon Sep 17 00:00:00 2001
From: Patrick Fic
Date: Mon, 6 Jun 2022 10:59:17 -0700
Subject: [PATCH 3/3] Resolve AR Account Reference.
---
server/accounting/qbxml/qbxml-receivables.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/accounting/qbxml/qbxml-receivables.js b/server/accounting/qbxml/qbxml-receivables.js
index 78c7389f7..29af650da 100644
--- a/server/accounting/qbxml/qbxml-receivables.js
+++ b/server/accounting/qbxml/qbxml-receivables.js
@@ -249,13 +249,13 @@ const generateInvoiceQbxml = (
)}:${generateJobTier(jobs_by_pk)}`
).trim(),
},
- ARAccountRef: {
- FullName: bodyshop.md_responsibility_centers.ar.accountname,
- },
...(jobs_by_pk.class
? { ClassRef: { FullName: jobs_by_pk.class } }
: {}),
-
+
+ ARAccountRef: {
+ FullName: bodyshop.md_responsibility_centers.ar.accountname,
+ },
TxnDate: moment(jobs_by_pk.date_invoiced)
.tz(bodyshop.timezone)
.format("YYYY-MM-DD"),