From 735bf3f8306bedcbfb6c3bb0e88ee6b3bfd70b5d Mon Sep 17 00:00:00 2001 From: 18alantom <2.alan.tom@gmail.com> Date: Wed, 10 Nov 2021 19:09:21 +0530 Subject: [PATCH] fix: prevent NaN in the invoices --- models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js | 5 +++-- models/doctype/SalesInvoiceItem/SalesInvoiceItem.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js index e0a0ddc2..be63e467 100644 --- a/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js +++ b/models/doctype/PurchaseInvoiceItem/PurchaseInvoiceItem.js @@ -40,8 +40,9 @@ export default { fieldtype: 'Currency', required: 1, formula: async (row, doc) => { - let baseRate = await doc.getFrom('Item', row.item, 'rate'); - return baseRate / doc.exchangeRate; + const baseRate = (await doc.getFrom('Item', row.item, 'rate')) || 0; + const exchangeRate = doc.exchangeRate ?? 1; + return baseRate / exchangeRate; }, getCurrency: (row, doc) => doc.currency }, diff --git a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js index b1109bdc..1623ae7d 100644 --- a/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js +++ b/models/doctype/SalesInvoiceItem/SalesInvoiceItem.js @@ -41,8 +41,9 @@ export default { fieldtype: 'Currency', required: 1, formula: async (row, doc) => { - let baseRate = await doc.getFrom('Item', row.item, 'rate'); - return baseRate / doc.exchangeRate; + const baseRate = (await doc.getFrom('Item', row.item, 'rate')) || 0; + const exchangeRate = doc.exchangeRate ?? 1; + return baseRate / exchangeRate; }, getCurrency: (row, doc) => doc.currency, formulaDependsOn: ['item']