diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 828a597ae73aeafbac92a6672f086282ec65d4be..4794363e2cf49a51c59edb419c4f0a501875e8c9 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -37,7 +37,6 @@
<name>CATEGORY</name>
<title>Category</title>
<mandatory v="false" />
- <possibleItemsProcess>%aditoprj%/entity/Activity_entity/entityfields/category/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
</entityField>
<entityField>
diff --git a/entity/Activity_entity/entityfields/category/possibleItemsProcess.js b/entity/Activity_entity/entityfields/category/possibleItemsProcess.js
deleted file mode 100644
index 921a43cb3947bb30cb50efd44320d7418e0200d7..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/entityfields/category/possibleItemsProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items = LegacyKeywordUtils.getStandardArray("ACTIVITY.CATEGORY");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 2bbdb1138f4cd0aa58e369b2f30a77cf44ef4314..70147ab16385af1ff096798770a766087406a3a6 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -26,7 +26,6 @@
<name>ADDR_TYPE</name>
<documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
<title>Addresstype</title>
- <possibleItemsProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>BUILDINGNO</name>
diff --git a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js b/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
deleted file mode 100644
index f65e4812fc2a1ea6e3d3c46d4cf3deeba893134e..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/addr_type/possibleItemsProcess.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-import("system.neon");
-import("Keyword_lib");
-import("Contact_lib");
-
-if (vars.exists("$param.ContactType_param") && parseInt(vars.get("$param.ContactType_param"))) {
- var type = parseInt(vars.get("$param.ContactType_param"));
- var fields = [];
- //logging.log(type)
- switch (type) {
- case 1:
- fields = ["org"];
- break;
- case 2:
- fields = ["person"];
- case 3:
- fields = ["person"];
- break;
- }
-
- var resultKeywords = [];
- LegacyKeywordUtils.getStandardArrayProps("ADDRESS.TYPE").forEach(function(pKeyword) {
- for (let i = 0; i < fields.length; i++) {
- if (pKeyword[2][fields[i]]) {
- resultKeywords.push([pKeyword[0], pKeyword[1]]);
- break;
- }
- }
- });
-
- result.object(resultKeywords);
-}
-
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index ec2b11927e9b4149fb5880510eea31658e9f534f..9f02ddbc74d761c3f0b0208d113869eacd5ce6dd 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -22,7 +22,6 @@
<name>MEDIUM_ID</name>
<title>Medium</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js b/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
deleted file mode 100644
index c92cbb2549430a0337918745657dc796bb21c2ff..0000000000000000000000000000000000000000
--- a/entity/Communication_entity/entityfields/medium_id/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.text");
-import("system.vars");
-import("system.result");
-import("Keyword_lib");
-
-var items = LegacyKeywordUtils.getStandardArray("COMMUNICATION.MEDIUM");
-result.object(items);
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 253537e5a0a76f854936e7acc7c5d5674cad9819..ed4ee9cf145a8d4f19fc617726366ff28ee60527 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -42,7 +42,6 @@
<entityField>
<name>PROBABILITY</name>
<title>Probability</title>
- <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>CONTACT_ID</name>
diff --git a/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js b/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
deleted file mode 100644
index 55d36f4786075593f83630cf383ec487af234902..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/probability/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("OFFER.PROBABILITY"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 1408247f3f4c2fd6cc24bc389873f52c49691d4c..2d057cb987b93610f1d5ca09b2069a45d7a86617 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -305,19 +305,16 @@
<entityField>
<name>PRICE_POLITICS</name>
<title>Price politics</title>
- <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
<name>STRENGTH</name>
<title>Strength</title>
- <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
<name>WEAKNESS</name>
<title>Weakness</title>
- <possibleItemsProcess>%aditoprj%/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js</possibleItemsProcess>
<searchable v="false" />
</entityField>
<entityField>
diff --git a/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js
deleted file mode 100644
index 0a795d357bbf1bcc88dbfebb8d15491e6ee68f65..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/price_politics/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.PRICE_POLITICS"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js
deleted file mode 100644
index 75aef701340c5393390f3978613a76c95c72ee54..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/strength/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.STRENGTH"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js b/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js
deleted file mode 100644
index cf8185dc33c44e8994ef345b06ca0c76cd5606dc..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/weakness/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.WEAKNESS"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index fbdf0e7d1ea7ae1dc90946261af2c776eb4884c4..cf7568a176cc4b937eb61f7718f73c384cdd1d4f 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -34,7 +34,6 @@
<entityField>
<name>ESTIMATION</name>
<title>Estimation</title>
- <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js</possibleItemsProcess>
<selectionMode>MULTI</selectionMode>
</entityField>
<entityField>
@@ -49,7 +48,6 @@
<name>PHASE</name>
<title>Phase</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>PROJECTCODE</name>
@@ -87,7 +85,6 @@
<name>STATE</name>
<title>Status</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityField>
<name>VOLUME</name>
diff --git a/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
deleted file mode 100644
index f527f159dc20b1e2bf4dc0bb00bd2a028195169e..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = LegacyKeywordUtils.getStandardArray("SALESPROJECT.ESTIMATION");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js
deleted file mode 100644
index b539741cfe61bd1df9f3a8de8496fe4d1b38ca76..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/phase/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.PHASE"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js
deleted file mode 100644
index 904fa16280fd9e6516caf2915c795214425359f6..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/state/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = LegacyKeywordUtils.getStandardArray("SALESPROJECT.STATE");
-result.object(items);
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 57761954d1b121d5ebc7ff19d677347f0e11939d..8ebd30b7110f05c5be2370b21cb45517ea505b34 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -38,7 +38,6 @@
<name>PRIORITY</name>
<title>priority</title>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Task_entity/entityfields/priority/possibleItemsProcess.js</possibleItemsProcess>
<groupable v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/priority/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Task_entity/entityfields/priority/possibleItemsProcess.js b/entity/Task_entity/entityfields/priority/possibleItemsProcess.js
deleted file mode 100644
index 83efeb09de4c609ecb59a10dc06c464bc380a859..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/priority/possibleItemsProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var items;
-
-items = LegacyKeywordUtils.getStandardArray("TASK.PRIORITY");
-result.object(items);
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index c120f58de5d31886881a600ce98b942a1262420a..47c3a82e4046813670d1170688a161460f36ae9c 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -43,6 +43,7 @@
<include relativeToChangelogFile="true" file="AddressType.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectEstimation.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectStrength.xml"/>
+ <include relativeToChangelogFile="true" file="SalesProjectPhase.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectState.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectWeakness.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectPricePolitics.xml"/>
diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/RPTJ_OFFER/reportData.jrxml
index cc52933641c4cd1a47ce046eb76845e4862a400d..5ec99598ff792d80e04f6bf6c47bbeaa33708d1a 100644
--- a/report/RPTJ_OFFER/reportData.jrxml
+++ b/report/RPTJ_OFFER/reportData.jrxml
@@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
<property name="ireport.zoom" value="1.771561000000001"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="113"/>
+ <property name="ireport.y" value="0"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Pos" class="java.lang.String"/>
<parameter name="Artikelbezeichnung" class="java.lang.String"/>
@@ -24,7 +24,7 @@
<parameter name="OFFERDel" class="java.lang.String"/>
<parameter name="AD_Name" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\Users\\a.voegl\\Documents\\AditoProjects\\xRM-Basic 2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>