From 67f77f9768fc903529a4e3b0f6aa7cdd9421840b Mon Sep 17 00:00:00 2001
From: Maria Hofmann <m.hofmann@adito.de>
Date: Fri, 22 Feb 2019 15:23:49 +0100
Subject: [PATCH] =?UTF-8?q?[Projekt:=20Entwicklung=20-=20Neon][TicketNr.:?=
=?UTF-8?q?=201035100][Vertriebsprojekt=20-=20Anpassungen=20bei=20Meilenst?=
=?UTF-8?q?einen,=20Herknunft=20und=20Einsch=C3=A4tzung]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Salesproject_entity.aod | 18 ------------------
.../estimation/possibleItemsProcess.js | 7 -------
.../_____LANGUAGE_EXTRA.aod | 4 +++-
.../SalesprojectEdit_view.aod | 4 ----
.../SalesprojectPreview_view.aod | 4 ----
.../data_alias/struct/create_salesproject.xml | 2 --
6 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644 entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 582e6402cc..4c9d02d7b1 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -31,16 +31,6 @@
<resolution>DAY</resolution>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/enddate/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>ESTIMATION</name>
- <title>Estimation</title>
- <possibleItemsProcess>%aditoprj%/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js</possibleItemsProcess>
- <selectionMode>MULTI</selectionMode>
- </entityField>
- <entityField>
- <name>ESTIMATIONVALUE</name>
- <searchable v="false" />
- </entityField>
<entityField>
<name>INFO</name>
<title>Information</title>
@@ -430,10 +420,6 @@
<name>ENDDATE.value</name>
<recordfield>SALESPROJECT.ENDDATE</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ESTIMATION.value</name>
- <recordfield>SALESPROJECT.ESTIMATION</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INFO.value</name>
<recordfield>SALESPROJECT.INFO</recordfield>
@@ -470,10 +456,6 @@
<name>VOLUME.value</name>
<recordfield>SALESPROJECT.VOLUME</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ESTIMATIONVALUE.value</name>
- <recordfield>SALESPROJECT.ESTIMATIONVALUE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ID.value</name>
<recordfield>SALESPROJECT.CONTACT_ID</recordfield>
diff --git a/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/estimation/possibleItemsProcess.js
deleted file mode 100644
index f527f159dc..0000000000
--- 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/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 9e2338a3ce..7b3e2ab613 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2348,7 +2348,6 @@
</entry>
<entry>
<key>Print Offer</key>
- <key>Touchpoint</key>
</entry>
<entry>
<key>Touchpoints</key>
@@ -2362,6 +2361,9 @@
<entry>
<key>Days inactive</key>
</entry>
+ <entry>
+ <key>Touchpoint</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index f621091521..5e0a05ce09 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -52,10 +52,6 @@
<name>5b3c3dc2-4ca5-45c5-96e5-7196a99dcdce</name>
<entityField>VOLUME</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>f9332d9d-184b-4044-afaf-5d377fe59072</name>
- <entityField>ESTIMATION</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>3836ef6b-64c4-4e0e-8cd6-88f784275b2f</name>
<entityField>PROBABILITY</entityField>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index b36c8a2373..e75219d501 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -49,10 +49,6 @@
<name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
<entityField>VOLUME</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>774ab565-a5e0-4b31-a77a-39143534f9a8</name>
- <entityField>ESTIMATION</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
<entityField>TIMETRACKINGSUM</entityField>
diff --git a/others/db_changes/data_alias/struct/create_salesproject.xml b/others/db_changes/data_alias/struct/create_salesproject.xml
index 1a18e81400..76660a3847 100644
--- a/others/db_changes/data_alias/struct/create_salesproject.xml
+++ b/others/db_changes/data_alias/struct/create_salesproject.xml
@@ -16,8 +16,6 @@
<column name="VOLUME" type="NUMERIC(14,2)"/>
<column name="STARTDATE" type="DATETIME"/>
<column name="ENDDATE" type="DATETIME"/>
- <column name="ESTIMATION" type="NVARCHAR(50)"/>
- <column name="ESTIMATIONVALUE" type="INTEGER"/>
<column name="PROBABILITY" type="CHAR(36)"/>
<column name="SALESPROJECTID" type="CHAR(36)">
--
GitLab