From 4461ab840fd5b160642b2881c6f17b016e579135 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Tue, 29 Jun 2021 11:16:33 +0200
Subject: [PATCH] =?UTF-8?q?Revert=20Fix=20[Projekt:=20xRM-Sales][TicketNr.?=
=?UTF-8?q?:=201081505][Mehrw=C3=A4hrungsf=C3=A4higkeit]=20and=20Fix=20Off?=
=?UTF-8?q?er=20ITem?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Data_alias/basic/2021.1.1/changelog.xml | 1 -
.../entityfields/currency/stateProcess.js | 25 +++++++++++--------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/.liquibase/Data_alias/basic/2021.1.1/changelog.xml b/.liquibase/Data_alias/basic/2021.1.1/changelog.xml
index 565ef22d4f..1a0a00ce6e 100644
--- a/.liquibase/Data_alias/basic/2021.1.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.1.1/changelog.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include relativeToChangelogFile="true" file="CurrencyRate/changelog.xml"/>
<include relativeToChangelogFile="true" file="alter_Mst_Team.xml"/>
<include relativeToChangelogFile="true" file="EmailFilter/alter_emailFilterHandling.xml"/>
<include relativeToChangelogFile="true" file="EmailFilter/insert_recipientStatusBounced.xml"/>
diff --git a/entity/Offer_entity/entityfields/currency/stateProcess.js b/entity/Offer_entity/entityfields/currency/stateProcess.js
index b6e87e7004..c3923b8d39 100644
--- a/entity/Offer_entity/entityfields/currency/stateProcess.js
+++ b/entity/Offer_entity/entityfields/currency/stateProcess.js
@@ -4,16 +4,19 @@ import("system.neon");
import("Offer_lib");
import("system.entities");
-var loadConfig = entities.createConfigForLoadingRows()
- .entity("Offeritem_entity")
- .addParameter("OfferId_param", vars.get("$field.OFFERID"));
-var offerItemCount = entities.getRowCount(loadConfig);
-
-if(offerItemCount > 0)
-{
- result.string(neon.COMPONENTSTATE_DISABLED);
-}
-else
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
+ var loadConfig = entities.createConfigForLoadingRows()
+ .entity("Offeritem_entity")
+ .addParameter("OfferId_param", vars.get("$field.OFFERID"));
+ var offerItemCount = entities.getRowCount(loadConfig);
+
+ if(offerItemCount > 0)
+ {
+ result.string(neon.COMPONENTSTATE_DISABLED);
+ }
+ else
+ {
+ result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
+ }
}
--
GitLab