admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in release/2022-04-08 (pull request #440)

Browse Source 
Release/2022 04 08
This commit is contained in:
Patrick Fic
2022-04-06 22:13:56 +00:00
parent 79bfb12063 da9ddfc419
commit ae3226efb8
5 changed files with 55 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
bodyshop_translations.babel
View File

@@ -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 BabelEdit project file
@@ -8843,6 +8843,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </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> <concept_node>
<name>rbac</name> <name>rbac</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

2
client/src/translations/en_us/common.json
View File

@@ -540,6 +540,8 @@
"partslocations": "Parts Locations", "partslocations": "Parts Locations",
"printlater": "Print Later", "printlater": "Print Later",
"qbo": "Use QuickBooks Online?", "qbo": "Use QuickBooks Online?",
"qbo_departmentid": "QBO Department ID",
"qbo_usa": "QBO USA Compatibility",
"rbac": "Role Based Access Control", "rbac": "Role Based Access Control",
"responsibilitycenters": { "responsibilitycenters": {
"costs": "Cost Centers", "costs": "Cost Centers",

2
client/src/translations/es/common.json
View File

@@ -540,6 +540,8 @@
"partslocations": "", "partslocations": "",
"printlater": "", "printlater": "",
"qbo": "", "qbo": "",
"qbo_departmentid": "",
"qbo_usa": "",
"rbac": "", "rbac": "",
"responsibilitycenters": { "responsibilitycenters": {
"costs": "", "costs": "",

2
client/src/translations/fr/common.json
View File

@@ -540,6 +540,8 @@
"partslocations": "", "partslocations": "",
"printlater": "", "printlater": "",
"qbo": "", "qbo": "",
"qbo_departmentid": "",
"qbo_usa": "",
"rbac": "", "rbac": "",
"responsibilitycenters": { "responsibilitycenters": {
"costs": "", "costs": "",

9
server/data/autohouse.js
View File

@@ -168,7 +168,6 @@ exports.default = async (req, res) => {
sendServerEmail({ sendServerEmail({
subject: `Autohouse Report ${moment().format("MM-DD-YY")}`, subject: `Autohouse Report ${moment().format("MM-DD-YY")}`,
text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))} text: `Errors: ${allErrors.map((e) => JSON.stringify(e, null, 2))}
Uploaded: ${JSON.stringify( Uploaded: ${JSON.stringify(
allxmlsToUpload.map((x) => x.filename), allxmlsToUpload.map((x) => x.filename),
null, null,
@@ -755,9 +754,13 @@ const CreateCosts = (job) => {
return { return {
PartsTotalCost: Object.keys(billTotalsByCostCenters).reduce((acc, key) => { 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.add(billTotalsByCostCenters[key]);
return acc; return acc;
}, Dinero()), }, Dinero()),
PartsOemCost: (billTotalsByCostCenters[defaultCosts.PAN] || Dinero()).add( PartsOemCost: (billTotalsByCostCenters[defaultCosts.PAN] || Dinero()).add(