From 46db4c307c14cf647bf21ec2fbcc4e40f8fb3cf2 Mon Sep 17 00:00:00 2001
From: "p.neub" <p.neub@adito.de>
Date: Thu, 20 May 2021 13:07:08 +0200
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Sales][TicketNr.:=201080935][Pr?=
=?UTF-8?q?eisliste=20mit=20Fremdw=C3=A4hrung=20kann=20nicht=20angelegt=20?=
=?UTF-8?q?werden]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
entity/Productprice_entity/onValidation.js | 4 +++-
language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod | 6 ++++++
language/_____LANGUAGE_de/_____LANGUAGE_de.aod | 2 +-
language/_____LANGUAGE_en/_____LANGUAGE_en.aod | 6 ++++++
4 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/entity/Productprice_entity/onValidation.js b/entity/Productprice_entity/onValidation.js
index ce0a2761a6c..e1091b42457 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 b94ce935a38..9313ed244f3 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 3226194b7c7..3e5e6409781 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 1464a7d2e29..6d4fd56a99a 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>
--
GitLab