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

IO-1330 Update QB Information

Browse Source
This commit is contained in:
Patrick Fic
2021-08-23 09:50:01 -07:00
parent 44c17bd7a2
commit 1c473c95a2
7 changed files with 107 additions and 8 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
@@ -7594,6 +7594,27 @@
</concept_node>
</children>
</folder_node>
<concept_node>
<name>emaillater</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>employees</name>
<definition_loaded>false</definition_loaded>
@@ -7825,6 +7846,27 @@
</translation>
</translations>
</concept_node>
<concept_node>
<name>printlater</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>

14
client/src/components/shop-info/shop-info.general.component.jsx
View File

@@ -165,6 +165,20 @@ export default function ShopInfoGeneral({ form }) {
);
}}
</Form.Item>
<Form.Item
label={t("bodyshop.labels.printlater")}
valuePropName="checked"
name={["accountingconfig", "printlater"]}
>
<Switch />
</Form.Item>
<Form.Item
label={t("bodyshop.labels.emaillater")}
valuePropName="checked"
name={["accountingconfig", "emaillater"]}
>
<Switch />
</Form.Item>
<Form.Item
label={t("bodyshop.fields.inhousevendorid")}
name={"inhousevendorid"}

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

@@ -477,6 +477,7 @@
"cdk_dealerid": "CDK Dealer ID",
"title": "DMS"
},
"emaillater": "Email Later",
"employees": "Employees",
"insurancecos": "Insurance Companies",
"intakechecklist": "Intake Checklist",
@@ -488,6 +489,7 @@
"notespresets": "Notes Presets",
"orderstatuses": "Order Statuses",
"partslocations": "Parts Locations",
"printlater": "Print Later",
"rbac": "Role Based Access Control",
"responsibilitycenters": {
"costs": "Cost Centers",

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

@@ -477,6 +477,7 @@
"cdk_dealerid": "",
"title": ""
},
"emaillater": "",
"employees": "",
"insurancecos": "",
"intakechecklist": "",
@@ -488,6 +489,7 @@
"notespresets": "",
"orderstatuses": "",
"partslocations": "",
"printlater": "",
"rbac": "",
"responsibilitycenters": {
"costs": "",

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

@@ -477,6 +477,7 @@
"cdk_dealerid": "",
"title": ""
},
"emaillater": "",
"employees": "",
"insurancecos": "",
"intakechecklist": "",
@@ -488,6 +489,7 @@
"notespresets": "",
"orderstatuses": "",
"partslocations": "",
"printlater": "",
"rbac": "",
"responsibilitycenters": {
"costs": "",

50
server/accounting/qbxml/qbxml-receivables.js
View File

@@ -122,13 +122,13 @@ const generateSourceCustomerQbxml = (jobs_by_pk, bodyshop) => {
CustomerAddRq: {
CustomerAdd: {
Name: jobs_by_pk.ins_co_nm,
BillAddress: {
Addr1: jobs_by_pk.ownr_addr1,
Addr2: jobs_by_pk.ownr_addr2,
City: jobs_by_pk.ownr_city,
State: jobs_by_pk.ownr_st,
PostalCode: jobs_by_pk.ownrzip,
},
// BillAddress: {
// Addr1: jobs_by_pk.ownr_addr1,
// Addr2: jobs_by_pk.ownr_addr2,
// City: jobs_by_pk.ownr_city,
// State: jobs_by_pk.ownr_st,
// PostalCode: jobs_by_pk.ownrzip,
// },
},
},
},
@@ -181,6 +181,25 @@ const generateJobQbxml = (
FullName: ParentRefName,
}
: null,
...(tierLevel === 3
? {
BillAddress: {
Addr1: jobs_by_pk.ownr_addr1,
Addr2: jobs_by_pk.ownr_addr2,
City: jobs_by_pk.ownr_city,
State: jobs_by_pk.ownr_st,
PostalCode: jobs_by_pk.ownrzip,
},
ShipAddress: {
Addr1: jobs_by_pk.ownr_addr1,
Addr2: jobs_by_pk.ownr_addr2,
City: jobs_by_pk.ownr_city,
State: jobs_by_pk.ownr_st,
PostalCode: jobs_by_pk.ownrzip,
},
Email: jobs_by_pk.ownr_ea,
}
: {}),
},
},
},
@@ -446,6 +465,18 @@ const generateInvoiceQbxml = (
TxnDate: moment(jobs_by_pk.date_invoiced).format("YYYY-MM-DD"),
RefNumber: jobs_by_pk.ro_number,
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)}`,
Addr2: jobs_by_pk.ownr_addr1,
Addr3: jobs_by_pk.ownr_addr2,
City: jobs_by_pk.ownr_city,
State: jobs_by_pk.ownr_st,
PostalCode: jobs_by_pk.ownrzip,
},
ShipAddress: {
Addr1: jobs_by_pk.ownr_co_nm
? jobs_by_pk.ownr_co_nm.substring(0, 30)
@@ -459,6 +490,11 @@ const generateInvoiceQbxml = (
PostalCode: jobs_by_pk.ownrzip,
},
PONumber: jobs_by_pk.clm_no,
IsToBePrinted: bodyshop.accountingconfig.printlater,
...(jobs_by_pk.ownr_ea
? { IsToBeEmailed: bodyshop.accountingconfig.emaillater }
: {}),
InvoiceLineAdd: InvoiceLineAdd,
},
},

1
server/graphql-client/queries.js
View File

@@ -63,6 +63,7 @@ query QUERY_JOBS_FOR_RECEIVABLES_EXPORT($ids: [uuid!]!) {
ownr_zip
ownr_city
ownr_st
ownr_ea
ins_co_nm
job_totals
rate_la1