From e6d13f4da29c9eb9d8d6134604e9d801dc026d9f Mon Sep 17 00:00:00 2001 From: Ricargame Date: Fri, 15 Nov 2024 10:09:36 -0400 Subject: [PATCH 1/3] Fix: Receiving Order Display Logic --- src/utils/ADempiere/contextUtils/evaluator.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/utils/ADempiere/contextUtils/evaluator.js b/src/utils/ADempiere/contextUtils/evaluator.js index 439e8b54ae..5cf8d0d5cc 100644 --- a/src/utils/ADempiere/contextUtils/evaluator.js +++ b/src/utils/ADempiere/contextUtils/evaluator.js @@ -258,12 +258,17 @@ export class evaluator { // parse to number to evaluate "0" with "0.00" if (!Number.isNaN(value1)) { - value1 = Number(value1) + const convertedNumber1 = Number(value1) + if (!isEmptyValue(convertedNumber1)) { + value1 = convertedNumber1 + } } if (!Number.isNaN(value2)) { - value2 = Number(value2) + const convertedNumber2 = Number(value2) + if (!isEmptyValue(convertedNumber2)) { + value2 = convertedNumber2 + } } - let isValueLogic switch (operand) { case '=': From 2dec49e57900f0434b52d23bdfdbb4df95a4ff06 Mon Sep 17 00:00:00 2001 From: Ricargame Date: Fri, 15 Nov 2024 10:11:25 -0400 Subject: [PATCH 2/3] Fix: Receiving Order Display Logic --- src/utils/ADempiere/contextUtils/evaluator.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/utils/ADempiere/contextUtils/evaluator.js b/src/utils/ADempiere/contextUtils/evaluator.js index 5cf8d0d5cc..524733935a 100644 --- a/src/utils/ADempiere/contextUtils/evaluator.js +++ b/src/utils/ADempiere/contextUtils/evaluator.js @@ -259,15 +259,11 @@ export class evaluator { // parse to number to evaluate "0" with "0.00" if (!Number.isNaN(value1)) { const convertedNumber1 = Number(value1) - if (!isEmptyValue(convertedNumber1)) { - value1 = convertedNumber1 - } + if (!isEmptyValue(convertedNumber1)) value1 = convertedNumber1 } if (!Number.isNaN(value2)) { const convertedNumber2 = Number(value2) - if (!isEmptyValue(convertedNumber2)) { - value2 = convertedNumber2 - } + if (!isEmptyValue(convertedNumber2)) value2 = convertedNumber2 } let isValueLogic switch (operand) { From 7ac479990550a05d32baa12bb21cc764fe729e6a Mon Sep 17 00:00:00 2001 From: Edwin Betancourt Date: Fri, 15 Nov 2024 11:04:59 -0400 Subject: [PATCH 3/3] Update evaluator.js --- src/utils/ADempiere/contextUtils/evaluator.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/utils/ADempiere/contextUtils/evaluator.js b/src/utils/ADempiere/contextUtils/evaluator.js index 524733935a..2618b3b1e6 100644 --- a/src/utils/ADempiere/contextUtils/evaluator.js +++ b/src/utils/ADempiere/contextUtils/evaluator.js @@ -256,14 +256,18 @@ export class evaluator { // if both values are empty, but not equal (" ", NaN, null, undefined) const isBothEmptyValues = isEmptyValue(value1) && isEmptyValue(value2) - // parse to number to evaluate "0" with "0.00" + // parse to number to evaluate `0` number with `"0.00"` string if (!Number.isNaN(value1)) { const convertedNumber1 = Number(value1) - if (!isEmptyValue(convertedNumber1)) value1 = convertedNumber1 + if (!isEmptyValue(convertedNumber1)) { + value1 = convertedNumber1 + } } if (!Number.isNaN(value2)) { const convertedNumber2 = Number(value2) - if (!isEmptyValue(convertedNumber2)) value2 = convertedNumber2 + if (!isEmptyValue(convertedNumber2)) { + value2 = convertedNumber2 + } } let isValueLogic switch (operand) {