From 112569ed07f65f0100d3df11a9425d6cb597887f Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 10 May 2019 13:05:39 +0200
Subject: [PATCH] Fix error in ProductPriceLists when no END-Date was given
---
process/Product_lib/process.js | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 462c4f7240..4d5c93b08c 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -187,8 +187,11 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
+ db.translateCondition(SqlCondition.begin()
.and("validPP.PRODUCT_ID = PRODUCTID")
.andPrepare(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
- .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
- .andPrepare(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.date().toString(), "# >= ?")
+ .andPrepare(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), "# <= ?")
+ .andSqlCondition(SqlCondition.begin()
+ .andPrepare(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.date().toString(), "# >= ?")
+ .or("validPP.VALID_TO is null")
+ )
.andPrepare(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, "# <= ?")
.andSqlCondition(SqlCondition.begin()
.orPrepare(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
@@ -251,7 +254,6 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
if (validPriceLists)
ProductDetails.PriceListToUse = _getPriceListToUse(ProductDetails.CurrentValidPriceLists, priceListFilter);
-
return ProductDetails;
function _getPriceListObject() {
--
GitLab