From 967cc2932aa36820be43921f01f13d0590bbb782 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 12 May 2021 14:24:32 -0700 Subject: [PATCH] IO-1089 IO-1083 --- .../vendor-search-select.component.jsx | 8 +++++--- server/accounting/qbxml/qbxml-payables.js | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/client/src/components/vendor-search-select/vendor-search-select.component.jsx b/client/src/components/vendor-search-select/vendor-search-select.component.jsx index 526cc710a..465007841 100644 --- a/client/src/components/vendor-search-select/vendor-search-select.component.jsx +++ b/client/src/components/vendor-search-select/vendor-search-select.component.jsx @@ -51,7 +51,9 @@ const VendorSearchSelect = (
{o.name}
- {`${o.discount * 100}%`} + {o.discount && o.discount !== 0 ? ( + {`${o.discount * 100}%`} + ) : null}
)) @@ -62,9 +64,9 @@ const VendorSearchSelect = (
{o.name}
- {o.discount && ( + {o.discount && o.discount !== 0 ? ( {`${o.discount * 100}%`} - )} + ) : null}
)) diff --git a/server/accounting/qbxml/qbxml-payables.js b/server/accounting/qbxml/qbxml-payables.js index 1c5571403..d1685ffeb 100644 --- a/server/accounting/qbxml/qbxml-payables.js +++ b/server/accounting/qbxml/qbxml-payables.js @@ -103,7 +103,9 @@ const generateBillLine = (billLine, responsibilityCenters, jobClass) => { }, Amount: Dinero({ amount: Math.round(billLine.actual_cost * 100), - }).toFormat(DineroQbFormat), + }) + .multiply(billLine.quantity || 1) + .toFormat(DineroQbFormat), ...(jobClass ? { ClassRef: { FullName: jobClass } } : {}), SalesTaxCodeRef: { FullName: findTaxCode(billLine, responsibilityCenters.sales_tax_codes),