From 535e07d24d657b1b6ce6cca2421a12b40c43999a Mon Sep 17 00:00:00 2001
From: Sebastian Pongratz <s.pongratz@adito.de>
Date: Thu, 11 Nov 2021 14:37:01 +0100
Subject: [PATCH] Merge branch 'sales_1075183' into 'master'
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
[Projekt: xRM-Sales][TicketNr.: 1075183][Bei Beleg kann ein Vertriebsprojekt zu falschen Empfänger abgespeichert werden]
See merge request xrm/basic!1462
(cherry picked from commit 7f021e822ab5c8e954280c0f9af1d306f1882684)
de60e864 [Projekt: xRM-Sales][TicketNr.: 1075183][Bei Beleg kann ein Vertriebsprojekt...
ca5d8fe4 [Projekt: xRM-Sales][TicketNr.: 1077478][[Preise] Änderung in Multiedit -->...
2016d93e 1075183
dfb5c7dc [Projekt: xRM-Sales][TicketNr.: 1075183][Bei Beleg kann ein Vertriebsprojekt...
70536dda ---[Projekt: xRM-Sales][TicketNr.: 1077478][[Preise] Änderung in Multiedit -->...
60a43d79 [Projekt: xRM-Sales][TicketNr.: 1075183][Bei Beleg kann ein Vertriebsprojekt...
---
.../entityfields/contact_id/onValueChange.js | 12 ++++++++----
.../entityfields/object_rowid/displayValueProcess.js | 12 ++++++------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/entity/Order_entity/entityfields/contact_id/onValueChange.js b/entity/Order_entity/entityfields/contact_id/onValueChange.js
index f9eb528b6d..0b2d7b2143 100644
--- a/entity/Order_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Order_entity/entityfields/contact_id/onValueChange.js
@@ -47,12 +47,16 @@ if(contactId != "")
//Salesproject Preset
var today = datetime.today();
- var salesProjectId = newSelect("SALESPROJECT.SALESPROJECTID")
+ var salesProjectIds = newSelect("SALESPROJECT.SALESPROJECTID")
.from("SALESPROJECT")
.where("SALESPROJECT.CONTACT_ID", contactId)
- .cell();
- if(salesProjectId)
+ .arrayColumn();
+ if(salesProjectIds.length === 1)
{
- neon.setFieldValue("$field.OBJECT_ROWID", salesProjectId);
+ neon.setFieldValue("$field.OBJECT_ROWID", salesProjectIds[0]);
+ }
+ else
+ {
+ neon.setFieldValue("$field.OBJECT_ROWID", "");
}
}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js b/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js
index 097818829c..0d55b20141 100644
--- a/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/object_rowid/displayValueProcess.js
@@ -4,11 +4,11 @@ import("system.db");
import("system.result");
import("Context_lib");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$field.OBJECT_ROWID"))
+var res = "";
+
+if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
{
- result.string("");
+ res = ContextUtils.getTitleByContext(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID"));
}
-else if (vars.exists("$field.OBJECT_TYPE") && vars.get("$field.OBJECT_TYPE"))
-{
- result.string(ContextUtils.getTitleByContext(vars.get("$field.OBJECT_TYPE"), vars.get("$field.OBJECT_ROWID")));
-}
\ No newline at end of file
+
+result.string(res);
\ No newline at end of file
--
GitLab