From 901902c1d1b006d20cd25d46df8c05df4cd46bbb Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Mon, 4 Apr 2022 14:06:47 -0700
Subject: [PATCH 1/2] Missing translations for QBO in shop setup.

---
 bodyshop_translations.babel               | 44 ++++++++++++++++++++++-
 client/src/translations/en_us/common.json |  2 ++
 client/src/translations/es/common.json    |  2 ++
 client/src/translations/fr/common.json    |  2 ++
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index dad471c53..ff279e491 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project be_version="2.7.1" version="1.2">
+<babeledit_project version="1.2" be_version="2.7.1">
     <!--
 
     BabelEdit project file
@@ -8843,6 +8843,48 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <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>
                                     <concept_node>
                                         <name>rbac</name>
                                         <definition_loaded>false</definition_loaded>
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index c7fb079a5..e6f49071f 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -540,6 +540,8 @@
 				"partslocations": "Parts Locations",
 				"printlater": "Print Later",
 				"qbo": "Use QuickBooks Online?",
+				"qbo_departmentid": "QBO Department ID",
+				"qbo_usa": "QBO USA Compatibility",
 				"rbac": "Role Based Access Control",
 				"responsibilitycenters": {
 					"costs": "Cost Centers",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 7d0a41c8b..b42cc800b 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -540,6 +540,8 @@
 				"partslocations": "",
 				"printlater": "",
 				"qbo": "",
+				"qbo_departmentid": "",
+				"qbo_usa": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 1bc4c5501..d5646f9a4 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -540,6 +540,8 @@
 				"partslocations": "",
 				"printlater": "",
 				"qbo": "",
+				"qbo_departmentid": "",
+				"qbo_usa": "",
 				"rbac": "",
 				"responsibilitycenters": {
 					"costs": "",

From da9ddfc419b7ddbd843df6527a42cd25e4a79715 Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Wed, 6 Apr 2022 15:13:23 -0700
Subject: [PATCH 2/2] Autohouse update.

---
 server/data/autohouse.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/server/data/autohouse.js b/server/data/autohouse.js
index 417e4caaa..13b58e76b 100644
--- a/server/data/autohouse.js
+++ b/server/data/autohouse.js
@@ -168,7 +168,6 @@ exports.default = async (req, res) => {
     sendServerEmail({
       subject: `Autohouse Report ${moment().format("MM-DD-YY")}`,
       text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
-      
       Uploaded: ${JSON.stringify(
         allxmlsToUpload.map((x) => x.filename),
         null,
@@ -755,9 +754,13 @@ const CreateCosts = (job) => {
 
   return {
     PartsTotalCost: Object.keys(billTotalsByCostCenters).reduce((acc, key) => {
-      if (key !== defaultCosts.PAS && key !== defaultCosts.PASL)
+      if (
+        key !== defaultCosts.PAS &&
+        key !== defaultCosts.PASL &&
+        key !== defaultCosts.MAPA &&
+        key !== defaultCosts.MASH
+      )
         return acc.add(billTotalsByCostCenters[key]);
-
       return acc;
     }, Dinero()),
     PartsOemCost: (billTotalsByCostCenters[defaultCosts.PAN] || Dinero()).add(