diff --git a/entity/Productprice_entity/onValidation.js b/entity/Productprice_entity/onValidation.js index ce0a2761a6c1f43911190e21255145b012f4bafe..e1091b4245789e8eae75adb06910c971b621b673 100644 --- a/entity/Productprice_entity/onValidation.js +++ b/entity/Productprice_entity/onValidation.js @@ -60,7 +60,9 @@ if(vars.getString("$param.IgnoreOnValidation_param") != "true") for (var valPriceList in priceListsToPotentiallyReplace) { var currPriceList = priceListsToPotentiallyReplace[valPriceList]; - if(currPriceList["priceList"] == priceList && currPriceList["buySell"] == buySell && Number.parseInt(currPriceList["fromQuantity"]) == Number.parseInt(quantity)) + if(currPriceList["priceList"] == priceList && currPriceList["buySell"] == buySell && + Number.parseInt(currPriceList["fromQuantity"]) == Number.parseInt(quantity) && + currPriceList["currency"] == currency) { if(currPriceList["validFrom"] > validFrom && ((validTo == undefined || validTo == "") || (currPriceList["validTo"] != undefined && currPriceList["validTo"] != "" && currPriceList["validTo"] < validTo))) diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index b94ce935a384816581e7aa2ff6347e019fd97d2b..9313ed244f3466ef89974be7013fe8065ae538ee 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -8632,6 +8632,12 @@ <entry> <key>Global Cases </key> </entry> + <entry> + <key>Attributes of attribute group \"%0\" have to be used at least %1.</key> + </entry> + <entry> + <key>Attributes of attribute group \"%0\" can't be used more than %1.</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 3226194b7c748c60ff7b268cef748a56d8abdf4e..3e5e64097815f6c7e934988ef159ebc03cd1b542 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -11106,7 +11106,7 @@ Bitte Datumseingabe prüfen</value> </entry> <entry> <key>There already exists a %0 price with the same type of pricelist, quantity and currency in the defined range.</key> - <value>Es gibt bereits einen %0 Preis mit der selben Preisliste, Menge und Einheit im festgeleten Bereich.</value> + <value>Es gibt bereits einen %0 Preis mit der selben Preisliste, Menge und Einheit im festgelegten Bereich.</value> </entry> <entry> <key>change DSGVO Relevance</key> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 1464a7d2e294dcbe1771ba44c0e878a2cc23415f..6d4fd56a99a06ccbb2bdd2a7b3a50e6cf78f4891 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -8717,6 +8717,12 @@ <entry> <key>Global Cases </key> </entry> + <entry> + <key>Attributes of attribute group \"%0\" have to be used at least %1.</key> + </entry> + <entry> + <key>Attributes of attribute group \"%0\" can't be used more than %1.</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language>