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

Merged in release/2022-02-11 (pull request #377)

Browse Source 
Release/2022 02 11
This commit is contained in:
Patrick Fic
2022-02-10 00:30:28 +00:00
parent bc504d2a78 f8695972a3
commit e0e2183d86
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/parts-order-modal/parts-order-modal.component.jsx
View File

@@ -240,7 +240,7 @@ export function PartsOrderModalComponent({
<Radio value={"none"}>{t("general.labels.none")}</Radio>
<Radio value={"e"}>{t("parts_orders.labels.email")}</Radio>
<Radio value={"p"}>{t("parts_orders.labels.print")}</Radio>
{OEConnection.treatment === "on" && (
{OEConnection.treatment === "on" && isReturn === false && (
<Radio value={"oec"}>{t("parts_orders.labels.oec")}</Radio>
)}
</Radio.Group>

4
server/accounting/qbo/qbo-payables.js
View File

@@ -179,11 +179,11 @@ async function InsertBill(oauthClient, qbo_realmId, req, bill, vendor) {
value: vendor.Id,
},
TxnDate: moment(bill.date)
.tz(bill.job.bodyshop.timezone)
//.tz(bill.job.bodyshop.timezone)
.format("YYYY-MM-DD"),
...(bill.vendor.due_date && {
DueDate: moment(bill.date)
.tz(bill.job.bodyshop.timezone)
//.tz(bill.job.bodyshop.timezone)
.add(bill.vendor.due_date, "days")
.format("YYYY-MM-DD"),
}),

7
server/accounting/qbo/qbo-payments.js
View File

@@ -207,7 +207,8 @@ async function InsertPayment(
CustomerRef: {
value: parentRef.Id,
},
TxnDate: moment(payment.date).tz(bodyshop.timezone).format("YYYY-MM-DD"),
TxnDate: moment(payment.date) //.tz(bodyshop.timezone)
.format("YYYY-MM-DD"),
//DueDate: bill.due_date && moment(bill.due_date).format("YYYY-MM-DD"),
DocNumber: payment.paymentnum,
TotalAmt: Dinero({
@@ -392,7 +393,9 @@ async function InsertCreditMemo(
CustomerRef: {
value: parentRef.Id,
},
TxnDate: moment(payment.date).tz(bodyshop.timezone).format("YYYY-MM-DD"),
TxnDate: moment(payment.date)
//.tz(bodyshop.timezone)
.format("YYYY-MM-DD"),
DocNumber: payment.paymentnum,
...(invoices && invoices[0]
? { InvoiceRef: { value: invoices[0].Id } }

4
server/accounting/qbxml/qbxml-payables.js
View File

@@ -73,11 +73,11 @@ const generateBill = (bill) => {
FullName: bill.vendor.name,
},
TxnDate: moment(bill.date)
.tz(bill.job.bodyshop.timezone)
//.tz(bill.job.bodyshop.timezone)
.format("YYYY-MM-DD"),
...(bill.vendor.due_date && {
DueDate: moment(bill.date)
.tz(bill.job.bodyshop.timezone)
// .tz(bill.job.bodyshop.timezone)
.add(bill.vendor.due_date, "days")
.format("YYYY-MM-DD"),
}),

4
server/accounting/qbxml/qbxml-payments.js
View File

@@ -129,7 +129,7 @@ const generatePayment = (payment, isThreeTier, twoTierPref, bodyshop) => {
payment.job.bodyshop.md_responsibility_centers.ar.accountname,
},
TxnDate: moment(payment.date)
.tz(bodyshop.timezone)
// .tz(bodyshop.timezone)
.format("YYYY-MM-DD"), //Trim String
RefNumber: payment.paymentnum || payment.transactionid,
TotalAmount: Dinero({
@@ -175,7 +175,7 @@ const generatePayment = (payment, isThreeTier, twoTierPref, bodyshop) => {
payment.job.bodyshop.md_responsibility_centers.ar.accountname,
},
TxnDate: moment(payment.date)
.tz(bodyshop.timezone)
//.tz(bodyshop.timezone)
.format("YYYY-MM-DD"), //Trim String
RefNumber:
payment.paymentnum || payment.stripeid || payment.transactionid,

8
server/cdk/cdk-job-export.js
View File

@@ -716,7 +716,7 @@ async function InsertDmsVehicle(socket) {
dealerNumber: socket.JobData.bodyshop.cdk_dealerid,
...(socket.txEnvelope.inservicedate && {
inServiceDate: moment(socket.txEnvelope.inservicedate)
.tz(socket.JobData.bodyshop.timezone)
//.tz(socket.JobData.bodyshop.timezone)
.startOf("day")
.toISOString(),
}),
@@ -725,7 +725,7 @@ async function InsertDmsVehicle(socket) {
manufacturer: {},
vehicle: {
deliveryDate: moment()
.tz(socket.JobData.bodyshop.timezone)
// .tz(socket.JobData.bodyshop.timezone)
.format("YYYYMMDD"),
licensePlateNo: socket.JobData.plate_no,
make: socket.txEnvelope.dms_make,
@@ -854,14 +854,14 @@ async function UpdateDmsVehicle(socket) {
socket.DMSVeh.dealer.inServiceDate ||
socket.txEnvelope.inservicedate
)
.tz(socket.JobData.bodyshop.timezone)
// .tz(socket.JobData.bodyshop.timezone)
.toISOString(),
}),
},
vehicle: {
...socket.DMSVeh.vehicle,
deliveryDate: moment(socket.DMSVeh.vehicle.deliveryDate)
.tz(socket.JobData.bodyshop.timezone)
//.tz(socket.JobData.bodyshop.timezone)
.toISOString(),
},
owners: ids,