diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index be2b4bf16ff2630ec600a817b237e5af0c09e796..6a97f49a16e37302b21d28b67e17f66c4f3b8e03 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -312,12 +312,6 @@
<fieldName>KeywordStrenght</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>35298a2b-6d6a-4af8-817d-1647068fe1fa</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordEstimation</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
<entityName>Salesproject_entity</entityName>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 9934cf67ed200aad94830784991f5c727273a016..ba6d97987914c6244f166356290f2e8fa2986075 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -378,21 +378,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>KeywordEstimation</name>
- <fieldType>DEPENDENCY_OUT</fieldType>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>containerName_param</name>
- <code>%aditoprj%/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js</code>
- </entityParameter>
- </children>
- </entityConsumer>
<entityConsumer>
<name>KeywordState</name>
<fieldType>DEPENDENCY_OUT</fieldType>
@@ -538,10 +523,6 @@
<name>PROBABILITY.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ESTIMATIONVALUE.displayValue</name>
- <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATE.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
@@ -550,10 +531,6 @@
<name>PHASE.displayValue</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ESTIMATION.displayValue</name>
- <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js b/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
deleted file mode 100644
index 148aaa91247ddc35cef8d361cb890735366d75b6..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/entityfields/keywordestimation/children/containername_param/code.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.salesprojectEstimation());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js
deleted file mode 100644
index c2afa409b42fdc0e4a3cac10d1ef6e7645829dea..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimation.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectEstimation(), "SALESPROJECT.ESTIMATIONVALUE");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
deleted file mode 100644
index eb8f932fddcd182a6256f4e7eb337a3f44884718..0000000000000000000000000000000000000000
--- a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/estimationvalue.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectEstimation(), "SALESPROJECT.ESTIMATIONVALUE");
-result.string(sql);
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectEstimation.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectEstimation.xml
deleted file mode 100644
index fdea48061581d8c89f4d23827541ddb44d868c70..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectEstimation.xml
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="a.veogl" id="616f99aa-2067-43a4-b2cf-a642fe00e84d">
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="0a1dd1ed-800b-4b1d-a253-7936dac95a9d"/>
-
- <column name="KEYID" value="c6c49da4-80dc-4c32-b5b0-c33eac27de7f"/>
- <column name="TITLE" value="Project_volume sufficient"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="1d670df0-ab0e-45b6-85b8-d1ae4439da70"/>
-
- <column name="KEYID" value="9237ee74-bb91-4333-8114-4485b35cf8d7"/>
- <column name="TITLE" value="Project_budget available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="0c7250da-a8ec-4509-98f4-660ad671837a"/>
-
- <column name="KEYID" value="e3e16d06-1390-4d84-81bd-c495a401cc70"/>
- <column name="TITLE" value="Project_specifications available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="3"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="a5fb241b-0818-41b7-ae4f-939c2aa0b112"/>
-
- <column name="KEYID" value="2ef3ac7d-72b8-43b3-9cc1-64ffdf43fe2f"/>
- <column name="TITLE" value="Project_timeframe critical"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="4"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="6c932def-573d-409c-94b7-3e8640f2bdc6"/>
-
- <column name="KEYID" value="4b322f3f-815e-442e-ac63-a983f3efca6b"/>
- <column name="TITLE" value="Project_payment default/penalty critical"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="5"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="9f00cf54-d28b-4d77-a828-791c6d336d41"/>
-
- <column name="KEYID" value="3179371b-b647-4141-b575-3c26ce9f9213"/>
- <column name="TITLE" value="Project_references available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="6"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="f7d55e39-1600-4a74-bfac-c6298e527e2d"/>
-
- <column name="KEYID" value="3088256a-f247-40cb-ad4e-33892cbf5ca3"/>
- <column name="TITLE" value="Product_requirements suitable"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="7"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="819d7bf1-1248-435d-9131-8faaae0a4a37"/>
-
- <column name="KEYID" value="a2faa45e-bc7a-41f6-8130-7c7a636ddc9f"/>
- <column name="TITLE" value="Product_philosophy fitting"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="8"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="74828345-edb0-47b4-aa80-1bc956021f43"/>
-
- <column name="KEYID" value="d2e97e88-77fd-4fdb-8d5e-30807e2a40e2"/>
- <column name="TITLE" value="Product_industry template available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="9"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="57defed0-4545-40c9-bbd0-3014511332fc"/>
-
- <column name="KEYID" value="87fd87af-1cb6-40fb-843e-aee612862362"/>
- <column name="TITLE" value="Other_sympathy available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="10"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="9d6739d7-9f76-4f8e-a641-a141d087fc1c"/>
-
- <column name="KEYID" value="5de71df0-5086-49b8-bd72-a2c0a698e134"/>
- <column name="TITLE" value="Other_advocate available"/>
- <column name="CONTAINER" value="SalesprojectEstimation"/>
- <column name="SORTING" valueNumeric="11"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="0"/>
- </insert>
- <rollback>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="0a1dd1ed-800b-4b1d-a253-7936dac95a9d" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="1d670df0-ab0e-45b6-85b8-d1ae4439da70" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="0c7250da-a8ec-4509-98f4-660ad671837a" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="a5fb241b-0818-41b7-ae4f-939c2aa0b112" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="6c932def-573d-409c-94b7-3e8640f2bdc6" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="9f00cf54-d28b-4d77-a828-791c6d336d41" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="f7d55e39-1600-4a74-bfac-c6298e527e2d" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="819d7bf1-1248-435d-9131-8faaae0a4a37" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="74828345-edb0-47b4-aa80-1bc956021f43" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="57defed0-4545-40c9-bbd0-3014511332fc" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="9d6739d7-9f76-4f8e-a641-a141d087fc1c" />
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ 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 223cc1acc83c715801c3c9429ce6e9220f2c3a9a..bed47533e17a4515bd4ae1e7a8c20cbbab8b7e75 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -55,7 +55,6 @@
<include relativeToChangelogFile="true" file="ActivityCategory.xml"/>
<include relativeToChangelogFile="true" file="CommunicationMedium.xml"/>
<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"/>
@@ -70,6 +69,5 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_AddressType.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesProjectState.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesProjectPhase.xml"/>
- <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectEstimation.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_TaskPriority.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml b/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml
deleted file mode 100644
index ab045eecb61425666f5f5a69642cb138dc77cbb5..0000000000000000000000000000000000000000
--- a/others/db_changes/data_alias/basic/2019.2/drop_estimation_salesproject.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="0601eb26-fc5e-4b57-ad18-2b6a064f383f">
- <dropColumn tableName="SALESPROJECT" columnName="ESTIMATION"/>
- <dropColumn tableName="SALESPROJECT" columnName="ESTIMATIONVALUE"/>
-
- <rollback>
- <addColumn tableName="SALESPROJECT">
- <column name="ESTIMATION" type="NVARCHAR(50)"/>
- <column name="ESTIMATIONVALUE" type="INTEGER"/>
- </addColumn>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 6d8a44d2954a8733e03de4ad59b7da5bf78d3929..c7677621cd70d4364d725c3f02f3ae341d0ce115 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -52,7 +52,6 @@ $KeywordRegistry.communicationMedium = function(){return "CommunicationMedium"};
$KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPricePolitics"};
$KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness"};
$KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"};
-$KeywordRegistry.salesprojectEstimation = function(){return "SalesprojectEstimation"};
$KeywordRegistry.salesprojectState = function(){return "SalesprojectState"};
$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"};
$KeywordRegistry.taskPriority = function(){return "TaskPriority"};
\ No newline at end of file