From 78660887599c1e59ba3edc482c84202afa6f1b91 Mon Sep 17 00:00:00 2001
From: Markus Escher <m.escher@adito.de>
Date: Tue, 19 Mar 2019 11:12:19 +0100
Subject: [PATCH] set Offer LANGUAGE from contact
---
.../Offer_entity/entityfields/contact_id/onValueChange.js | 5 ++++-
.../Offer_entity/entityfields/contact_id/valueProcess.js | 7 +++++++
.../entityfields/language/displayValueProcess.js | 4 ++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/entity/Offer_entity/entityfields/contact_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
index 5ce78e6a90..efaa01ac73 100644
--- a/entity/Offer_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
@@ -1,3 +1,5 @@
+import("system.logging");
+import("system.neon");
import("system.vars");
import("system.db");
import("Util_lib");
@@ -8,5 +10,6 @@ if(contactid != "")
{
var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
- if(relData[0] != "") vars.set("$field.LANGUAGE", relData[0]);
+ if(relData[0] != "")
+ neon.setFieldValue("field.LANGUAGE", relData[0]);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/contact_id/valueProcess.js b/entity/Offer_entity/entityfields/contact_id/valueProcess.js
index 744f481243..de8555de92 100644
--- a/entity/Offer_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/Offer_entity/entityfields/contact_id/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.neon");
import("system.db");
import("system.result");
import("system.vars");
@@ -5,6 +6,12 @@ import("Sql_lib");
if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
{
+ var contactid = vars.get("$param.ContactId_param");
+ var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
+
+ if(relData[0] != "")
+ neon.setFieldValue("field.LANGUAGE", relData[0]);
+
result.string(vars.get("$param.ContactId_param"));
}
else if (vars.exists("$param.SalesprojectId_param") && vars.get("$param.SalesprojectId_param"))
diff --git a/entity/Offer_entity/entityfields/language/displayValueProcess.js b/entity/Offer_entity/entityfields/language/displayValueProcess.js
index 987df7556f..ac73db4489 100644
--- a/entity/Offer_entity/entityfields/language/displayValueProcess.js
+++ b/entity/Offer_entity/entityfields/language/displayValueProcess.js
@@ -4,9 +4,9 @@ import("system.result");
import("system.vars");
import("Sql_lib");
-if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param"))
+//if (vars.exists("$param.OfferLanguage_param") && vars.get("$param.OfferLanguage_param"))
{
- var iso3 = vars.get("$param.OfferLanguage_param");
+ var iso3 = vars.get("$field.LANGUAGE");
var latinName = db.cell(SqlCondition.begin()
.andPrepare("AB_LANGUAGE.ISO3", iso3)
.buildSql("select NAME_LATIN from AB_LANGUAGE", "1=0"));
--
GitLab