diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx index 81101e22d..b52739788 100644 --- a/client/src/components/vendors-form/vendors-form.component.jsx +++ b/client/src/components/vendors-form/vendors-form.component.jsx @@ -158,7 +158,7 @@ export default function VendorsFormComponent({ - + { // { TxnDate: moment(bill.date) .tz(bill.job.bodyshop.timezone) .format("YYYY-MM-DD"), - DueDate: - bill.due_date && - moment(bill.due_date) + ...(bill.vendor.due_date && { + DueDate: moment(bill.date) .tz(bill.job.bodyshop.timezone) + .add(bill.vendor.due_date, "days") .format("YYYY-MM-DD"), + }), RefNumber: bill.invoice_number, Memo: `RO ${bill.job.ro_number || ""}`, ExpenseLineAdd: bill.billlines.map((il) => diff --git a/server/graphql-client/queries.js b/server/graphql-client/queries.js index d5bb2a3f8..aa8823623 100644 --- a/server/graphql-client/queries.js +++ b/server/graphql-client/queries.js @@ -404,6 +404,7 @@ query QUERY_BILLS_FOR_PAYABLES_EXPORT($bills: [uuid!]!) { vendor{ id name + due_date } } }