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

Payables bug fixes for class & bill number IO-742

Browse Source
This commit is contained in:
Patrick Fic
2021-03-04 16:47:45 -08:00
parent e1e85214cc
commit c0403b6ea9
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,12 +63,16 @@ const generateBill = (bill) => {
TxnDate: moment(bill.date).format("YYYY-MM-DD"), TxnDate: moment(bill.date).format("YYYY-MM-DD"),
DueDate: DueDate:
bill.due_date && moment(bill.due_date).format("YYYY-MM-DD"), bill.due_date && moment(bill.due_date).format("YYYY-MM-DD"),
RefNumber: bill.bill_number, RefNumber: bill.invoice_number,
Memo: `RO ${bill.job.ro_number || ""} OWNER ${ Memo: `RO ${bill.job.ro_number || ""} OWNER ${
bill.job.ownr_fn || "" bill.job.ownr_fn || ""
} ${bill.job.ownr_ln || ""} ${bill.job.ownr_co_nm || ""}`, } ${bill.job.ownr_ln || ""} ${bill.job.ownr_co_nm || ""}`,
ExpenseLineAdd: bill.billlines.map((il) => ExpenseLineAdd: bill.billlines.map((il) =>
generateBillLine(il, bill.job.bodyshop.md_responsibility_centers) generateBillLine(
il,
bill.job.bodyshop.md_responsibility_centers,
bill.job.class
)
), ),
}, },
}, },
@@ -90,11 +94,7 @@ const generateBill = (bill) => {
return billQbxml_Full; return billQbxml_Full;
}; };
const generateBillLine = (billLine, responsibilityCenters) => { const generateBillLine = (billLine, responsibilityCenters, jobClass) => {
console.log(
" findTaxCode(billLine, responsibilityCenters.sales_tax_codes)",
findTaxCode(billLine, responsibilityCenters.sales_tax_codes)
);
return { return {
AccountRef: { AccountRef: {
FullName: responsibilityCenters.costs.find( FullName: responsibilityCenters.costs.find(
@@ -104,6 +104,7 @@ const generateBillLine = (billLine, responsibilityCenters) => {
Amount: Dinero({ Amount: Dinero({
amount: Math.round(billLine.actual_cost * 100), amount: Math.round(billLine.actual_cost * 100),
}).toFormat(DineroQbFormat), }).toFormat(DineroQbFormat),
...(jobClass ? { ClassRef: { FullName: jobClass } } : {}),
SalesTaxCodeRef: { SalesTaxCodeRef: {
FullName: findTaxCode(billLine, responsibilityCenters.sales_tax_codes), FullName: findTaxCode(billLine, responsibilityCenters.sales_tax_codes),
}, },

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

@@ -118,6 +118,7 @@ query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) {
federal_tax_rate federal_tax_rate
invoice_number invoice_number
is_credit_memo is_credit_memo
invoice_number
job { job {
id id
ro_number ro_number
@@ -125,6 +126,7 @@ query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) {
ownr_fn ownr_fn
ownr_ln ownr_ln
ownr_co_nm ownr_co_nm
class
bodyshop{ bodyshop{
md_responsibility_centers md_responsibility_centers
} }