From 4cd4f52cae2a158e6155e37f8890ef2677e3b71a Mon Sep 17 00:00:00 2001
From: Pascal Neub <p.neub@adito.de>
Date: Wed, 21 Jul 2021 13:54:58 +0000
Subject: [PATCH] =?UTF-8?q?[Projekt:=20xRM-Sales][TicketNr.:=201083936][Em?=
=?UTF-8?q?pf=C3=A4ngerauswahl=20von=20Angebot=20fehlerhaft]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../children/contactids_param/valueProcess.js | 7 +++++--
.../entityfields/contact_id/onValueChange.js | 11 +++--------
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js b/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js
index b705ec11cf..8d43d1a3ae 100644
--- a/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js
@@ -8,10 +8,13 @@ if(vars.exists("$param.ContactIds_param") && vars.get("$param.ContactIds_param")
contactIds = vars.get("$param.ContactIds_param");
}
-if(!contactIds && vars.get("$field.CONTACT_ORG_ID"))
+if(!contactIds && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
{
var sql = newSelect("CONTACTID").from("CONTACT")
- .where("CONTACT.ORGANISATION_ID", vars.get("$field.CONTACT_ORG_ID"));
+ .where("CONTACT.ORGANISATION_ID",
+ newSelect("CONTACT.ORGANISATION_ID").from("CONTACT")
+ .where("CONTACT.CONTACTID", vars.get("$param.ContactId_param"))
+ );
contactIds = JSON.stringify(sql.arrayColumn());
}
diff --git a/entity/Offer_entity/entityfields/contact_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
index 8d9524327c..6b749a60af 100644
--- a/entity/Offer_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
@@ -54,14 +54,9 @@ if(contactId != "")
.and("CONTACT.PERSON_ID is null")
.cell();
}
- var salesProjectId = newSelect("SALESPROJECT.SALESPROJECTID")
- .from("SALESPROJECT")
- .where("SALESPROJECT.CONTACT_ID", contactId)
- .cell();
- if(salesProjectId)
- {
- neon.setFieldValue("$field.OBJECT_ROWID", salesProjectId);
- }
+ var salesProjectId = newSelect("SALESPROJECT.SALESPROJECTID").from("SALESPROJECT")
+ .where("SALESPROJECT.CONTACT_ID", contactId).cell();
+ neon.setFieldValue("$field.OBJECT_ROWID", salesProjectId);
}
}
--
GitLab