From 733f3752ab6e37901bc8d9a63549f581ce44b30c Mon Sep 17 00:00:00 2001
From: "a.schindlbeck" <a.schindlbeck@adito.de>
Date: Wed, 13 Mar 2019 16:22:00 +0100
Subject: [PATCH] #1035775 Angebot various fixes
---
entity/Offer_entity/Offer_entity.aod | 6 ++++++
.../Offer_entity/entityfields/chosenaddress/stateProcess.js | 6 ++++++
entity/Offer_entity/entityfields/contact_id/stateProcess.js | 6 ++++++
neonView/OfferEdit_view/OfferEdit_view.aod | 4 ----
neonView/OfferFilter_view/OfferFilter_view.aod | 4 ++++
5 files changed, 22 insertions(+), 4 deletions(-)
create mode 100644 entity/Offer_entity/entityfields/chosenaddress/stateProcess.js
create mode 100644 entity/Offer_entity/entityfields/contact_id/stateProcess.js
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index f610a2634c2..f1f4d1f9f06 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -52,6 +52,7 @@
<consumer>AnyContacts</consumer>
<linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValueChange.js</onValueChange>
@@ -332,6 +333,7 @@
<name>ChosenAddress</name>
<title>Choose address</title>
<possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/possibleItemsProcess.js</possibleItemsProcess>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js</stateProcess>
<onValueChange>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
@@ -444,6 +446,10 @@
<name>SalesprojectId_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OfferLanguage_param</name>
+ <expose v="true" />
+ </entityParameter>
</children>
</entityProvider>
<entityParameter>
diff --git a/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js b/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js
new file mode 100644
index 00000000000..5ef79888bb3
--- /dev/null
+++ b/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW)
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/contact_id/stateProcess.js b/entity/Offer_entity/entityfields/contact_id/stateProcess.js
new file mode 100644
index 00000000000..dc6fd1b10e0
--- /dev/null
+++ b/entity/Offer_entity/entityfields/contact_id/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+ result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index efa572f6220..03cec9f4c8b 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -16,10 +16,6 @@
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>839c51a5-f628-4feb-a267-967342e547ef</name>
- <entityField>OfferCode_VersNr_fieldgroup</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>1b323e80-820d-402a-98d2-f3649ec8e91f</name>
<entityField>CONTACT_ID</entityField>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index 53ba05900eb..1bb8a3b0583 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -57,6 +57,10 @@
<name>60b83daa-9349-4bef-94d8-5f1fc350da59</name>
<entityField>OFFERCODE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>36b035da-4a57-413e-a5dc-c8974ca3855b</name>
+ <entityField>VERSNR</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>780087e7-ff3c-4592-90be-607357168295</name>
<entityField>CONTACT_ID</entityField>
--
GitLab