Skip to content
Snippets Groups Projects
Commit 01d47326 authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '1050796_validityPeriod' into '2020.0'

[Projekt: Entwicklung - Neon][TicketNr.: 1050796][Vertrieb: Preisliste:...

See merge request xrm/basic!126
parents 6596a39e c2092f4c
No related branches found
No related tags found
No related merge requests found
...@@ -191,7 +191,7 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc ...@@ -191,7 +191,7 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
.and(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency) .and(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
.and(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), SqlBuilder.LESS_OR_EQUAL()) .and(["PRODUCTPRICE", "VALID_FROM", "validPP"], datetime.date().toString(), SqlBuilder.LESS_OR_EQUAL())
.and(newWhere() .and(newWhere()
.or(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.date().toString(), SqlBuilder.GREATER_OR_EQUAL()) .or(["PRODUCTPRICE", "VALID_TO", "validPP"], datetime.today().toString(), SqlBuilder.GREATER_OR_EQUAL())
.or("validPP.VALID_TO is null")) .or("validPP.VALID_TO is null"))
.and(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, SqlBuilder.LESS_OR_EQUAL()) .and(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, SqlBuilder.LESS_OR_EQUAL())
.and(newWhere() .and(newWhere()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment