diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index adb09f7075ebb0a12c7a89f7ee6808487ac126a7..be2b4bf16ff2630ec600a817b237e5af0c09e796 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -342,6 +342,12 @@
<fieldName>KeywordPriority</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
+ <entityName>SalesprojectCompetition_entity</entityName>
+ <fieldName>KeywordState</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index 5499baa022634247984a2941246147ae77183d41..7ce49450124f09b62a1bbc231f47bcdf76b80c31 100644
--- a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+++ b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
@@ -35,8 +35,8 @@
<entityField>
<name>STATUS</name>
<title>State</title>
+ <consumer>KeywordState</consumer>
<mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/status/possibleItemsProcess.js</possibleItemsProcess>
</entityField>
<entityParameter>
<name>SalesprojectId_param</name>
@@ -204,6 +204,21 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>KeywordState</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/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/code.js b/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/code.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f303d15893545d0aefc824ab893aa94e22146ee
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/entityfields/keywordstate/children/containername_param/code.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.salesprojectState());
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/entityfields/status/possibleItemsProcess.js b/entity/SalesprojectCompetition_entity/entityfields/status/possibleItemsProcess.js
deleted file mode 100644
index 71e5ae0f7ba209331e370a4fa4099571f6c35667..0000000000000000000000000000000000000000
--- a/entity/SalesprojectCompetition_entity/entityfields/status/possibleItemsProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-result.object(LegacyKeywordUtils.getStandardArray("SALESPROJECT.STATE"));
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
new file mode 100644
index 0000000000000000000000000000000000000000..95bc103e1138fcb969552eadf445011db764949d
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_SalesprojectCompetitionState.xml
@@ -0,0 +1,103 @@
+<?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.goderbauer" id="dfc48656-e666-4877-be17-d9832846bcfd">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6a26d9c5-bc21-455e-828a-26e1b9b278da"/>
+
+ <column name="KEYID" value="90dabaf6-b62a-4a5b-a9ff-449e5a898a24"/>
+ <column name="TITLE" value="Open"/>
+ <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+ <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="946b9f7d-c667-47a2-90f4-57935347aac5"/>
+
+ <column name="KEYID" value="2709acc9-df9c-470b-840c-6ff89fe0bf4e"/>
+ <column name="TITLE" value="Postponed"/>
+ <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+ <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="81a8a308-46e1-4cf6-8383-15736e45219c"/>
+
+ <column name="KEYID" value="fb9d270b-a62d-4a78-a3b8-a49dc5afe36d"/>
+ <column name="TITLE" value="Aborted"/>
+ <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+ <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="f4bcb779-ea53-4ad6-bbcd-8681a3813a4c"/>
+
+ <column name="KEYID" value="bae61bdf-ef67-4074-9db6-99a292dc8a6d"/>
+ <column name="TITLE" value="Partial order"/>
+ <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+ <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="47272e85-ae18-4bd6-950f-449bc531c5c5"/>
+
+ <column name="KEYID" value="aa4aff7e-3c1a-4a48-95f6-297e341cb7aa"/>
+ <column name="TITLE" value="Order"/>
+ <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+ <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="c046313e-d7af-4440-a3c1-0cdf2b6220ca"/>
+
+ <column name="KEYID" value="ff73172c-8517-4b6e-98cb-43aebacd9af1"/>
+ <column name="TITLE" value="Lost"/>
+ <column name="CONTAINER" value="SalesprojectCompetitionState"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <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="6a26d9c5-bc21-455e-828a-26e1b9b278da" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="946b9f7d-c667-47a2-90f4-57935347aac5" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="81a8a308-46e1-4cf6-8383-15736e45219c" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="f4bcb779-ea53-4ad6-bbcd-8681a3813a4c" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="47272e85-ae18-4bd6-950f-449bc531c5c5" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="c046313e-d7af-4440-a3c1-0cdf2b6220ca" />
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionState.xml b/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionState.xml
new file mode 100644
index 0000000000000000000000000000000000000000..829092c2bf9d1cdf06ad148777ae0139a308c275
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionState.xml
@@ -0,0 +1,66 @@
+<?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.voegl" id="2991ebff-fbc5-4862-ac79-4b8217e71e68">
+ <renameColumn newColumnName="STATUS_OLD" oldColumnName="STATUS" tableName="SALESPROJECT_COMPETITION"/>
+ <addColumn tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" type="CHAR(36)"/>
+ </addColumn>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" value="90dabaf6-b62a-4a5b-a9ff-449e5a898a24"/>
+ <where>STATUS_OLD = 1</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" value="2709acc9-df9c-470b-840c-6ff89fe0bf4e"/>
+ <where>STATUS_OLD = 2</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" value="fb9d270b-a62d-4a78-a3b8-a49dc5afe36d"/>
+ <where>STATUS_OLD = 3</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" value="bae61bdf-ef67-4074-9db6-99a292dc8a6d"/>
+ <where>STATUS_OLD = 4</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" value="aa4aff7e-3c1a-4a48-95f6-297e341cb7aa"/>
+ <where>STATUS_OLD = 5</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" value="ff73172c-8517-4b6e-98cb-43aebacd9af1"/>
+ <where>STATUS_OLD = 6</where>
+ </update>
+ <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="STATUS_OLD"/>
+
+ <rollback>
+ <renameColumn newColumnName="STATUS_OLD" oldColumnName="STATUS" tableName="SALESPROJECT_COMPETITION"/>
+ <addColumn tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" type="INTEGER"/>
+ </addColumn>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" valueNumeric="1"/>
+ <where>STATUS_OLD = '90dabaf6-b62a-4a5b-a9ff-449e5a898a24'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" valueNumeric="2"/>
+ <where>STATUS_OLD = '2709acc9-df9c-470b-840c-6ff89fe0bf4e'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" valueNumeric="3"/>
+ <where>STATUS_OLD = 'fb9d270b-a62d-4a78-a3b8-a49dc5afe36d'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" valueNumeric="4"/>
+ <where>STATUS_OLD = 'bae61bdf-ef67-4074-9db6-99a292dc8a6d'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" valueNumeric="5"/>
+ <where>STATUS_OLD = 'aa4aff7e-3c1a-4a48-95f6-297e341cb7aa'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="STATUS" valueNumeric="6"/>
+ <where>STATUS_OLD = 'ff73172c-8517-4b6e-98cb-43aebacd9af1'</where>
+ </update>
+ <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="STATUS_OLD"/>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file