Skip to content
Snippets Groups Projects
Commit 8bc2b5eb authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

Merge branch 'sales_pn_1080935_pricelist_currency_cantbecreated' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1080935][Preisliste mit Fremdwährung kann nicht angelegt werden]

See merge request xrm/basic!968
parents ab08293a 46db4c30
No related branches found
No related tags found
No related merge requests found
...@@ -60,7 +60,9 @@ if(vars.getString("$param.IgnoreOnValidation_param") != "true") ...@@ -60,7 +60,9 @@ if(vars.getString("$param.IgnoreOnValidation_param") != "true")
for (var valPriceList in priceListsToPotentiallyReplace) for (var valPriceList in priceListsToPotentiallyReplace)
{ {
var currPriceList = priceListsToPotentiallyReplace[valPriceList]; 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 == "") || if(currPriceList["validFrom"] > validFrom && ((validTo == undefined || validTo == "") ||
(currPriceList["validTo"] != undefined && currPriceList["validTo"] != "" && currPriceList["validTo"] < validTo))) (currPriceList["validTo"] != undefined && currPriceList["validTo"] != "" && currPriceList["validTo"] < validTo)))
......
...@@ -8632,6 +8632,12 @@ ...@@ -8632,6 +8632,12 @@
<entry> <entry>
<key>Global Cases </key> <key>Global Cases </key>
</entry> </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> </keyValueMap>
<font name="Dialog" style="0" size="11" /> <font name="Dialog" style="0" size="11" />
<sqlModels> <sqlModels>
......
...@@ -11106,7 +11106,7 @@ Bitte Datumseingabe prüfen</value> ...@@ -11106,7 +11106,7 @@ Bitte Datumseingabe prüfen</value>
</entry> </entry>
<entry> <entry>
<key>There already exists a %0 price with the same type of pricelist, quantity and currency in the defined range.</key> <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>
<entry> <entry>
<key>change DSGVO Relevance</key> <key>change DSGVO Relevance</key>
......
...@@ -8717,6 +8717,12 @@ ...@@ -8717,6 +8717,12 @@
<entry> <entry>
<key>Global Cases </key> <key>Global Cases </key>
</entry> </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> </keyValueMap>
<font name="Dialog" style="0" size="11" /> <font name="Dialog" style="0" size="11" />
</language> </language>
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