From b05c7a3912f9f1715ad42ad0aaa89a4acde6cd28 Mon Sep 17 00:00:00 2001
From: Pascal Neub <p.neub@adito.de>
Date: Tue, 6 Apr 2021 13:52:46 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Sales][TicketNr.:=201076358][An?=
=?UTF-8?q?gebotserstellung=20aus=20360=C2=B0=20Ansicht=20nimmt=20zuf?=
=?UTF-8?q?=C3=A4lligen=20Kontakt=20zur=20Verkn=C3=BCpfung]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Offer_entity/entityfields/contact_id/stateProcess.js | 9 ++++++---
.../children/objectrowid_param/valueProcess.js | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/entity/Offer_entity/entityfields/contact_id/stateProcess.js b/entity/Offer_entity/entityfields/contact_id/stateProcess.js
index e64c4d20ac..0dcccb84c7 100644
--- a/entity/Offer_entity/entityfields/contact_id/stateProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/stateProcess.js
@@ -3,8 +3,11 @@ import("system.result");
import("system.neon");
import("system.vars");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
- (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param")))
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
result.string(neon.COMPONENTSTATE_READONLY);
+}
else
- result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
+{
+ result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
+}
diff --git a/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
index 3080fcea47..aee05ab473 100644
--- a/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/360degreeobjects/children/objectrowid_param/valueProcess.js
@@ -5,6 +5,6 @@ import("system.result");
var contactids = newSelect( "CONTACTID" )
.from("CONTACT")
.where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
- .arrayColumn();
+ .orderBy("CONTACT.PERSON_ID DESC").arrayColumn();
result.string( JSON.stringify(contactids) );
\ No newline at end of file
--
GitLab