diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index e014c096bd5a961e40db0b8f38e6fd74e664adaf..a73ca00b9c32c9f85d1bca137c8b7f3ee1e041f0 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -23,10 +23,12 @@
</entityField>
<entityField>
<name>OBJECT_ROWID</name>
+ <mandatory v="true" />
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>OBJECT_TYPE</name>
+ <mandatory v="true" />
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/object_type/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -34,6 +36,7 @@
<title>Value</title>
<contentTypeProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/contentTypeProcess.js</contentTypeProcess>
<resolution>DAY</resolution>
+ <mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/attributerelation_value/displayValueProcess.js</displayValueProcess>
@@ -41,6 +44,7 @@
</entityField>
<entityField>
<name>CHAR_VALUE</name>
+ <mandatory v="false" />
</entityField>
<entityProvider>
<name>RelationsForSpecificObject</name>
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js b/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js
index 0058ef20abd57e882fdbfe33bb1e874e7a16a958..eabe5d10fc826c776508103bbf7c4bddc466a516 100644
--- a/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/attributerelation_value/onValueChange.js
@@ -6,4 +6,5 @@ var attrValue = vars.exists("$field.ATTRIBUTERELATION_VALUE") ? vars.get("$field
attrValue = ProcessHandlingUtils.getOnValidationValue(attrValue);
var attribute = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID"));
-attribute.setAttributeValue(attrValue);
\ No newline at end of file
+if(attrValue != null)
+ attribute.setAttributeValue(attrValue);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js b/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
index 737c6e3a51228fc8f0e69135a0c87bd2e46cdbfe..835bccd1abacf84c1f3587dc2b3c588d94309b3a 100644
--- a/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/attributerelation_value/valueProcess.js
@@ -1,28 +1,37 @@
+import("system.neon");
import("system.result");
import("system.vars");
import("Attribute_lib");
+import("system.logging");
-var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeType();
-
-if (attrType != null) //load the value from the correct field for the type
+logging.log("recordstate: " + vars.get("$sys.recordstate"));
+if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
{
- switch (attrType)
+ var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeType();
+ var value = null;
+ if (attrType != null) //load the value from the correct field for the type
{
- case $AttributeTypes.TEXT.toString():
- result.string(vars.get("$field.CHAR_VALUE"));
- break;
- case $AttributeTypes.DATE.toString():
- result.string(vars.get("$field.DATE_VALUE"));
- break;
- case $AttributeTypes.NUMBER.toString():
- result.string(vars.get("$field.NUMBER_VALUE"));
- break;
- case $AttributeTypes.BOOLEAN.toString():
- result.string(vars.get("$field.BOOL_VALUE"));
- break;
- case $AttributeTypes.COMBO.toString():
- result.string(vars.get("$field.ID_VALUE"));
- break;
- }
+ switch (attrType)
+ {
+ case $AttributeTypes.TEXT.toString():
+ value = vars.get("$field.CHAR_VALUE");
+ break;
+ case $AttributeTypes.DATE.toString():
+ value = vars.get("$field.DATE_VALUE");
+ break;
+ case $AttributeTypes.NUMBER.toString():
+ value = vars.get("$field.NUMBER_VALUE");
+ break;
+ case $AttributeTypes.BOOLEAN.toString():
+ value = vars.get("$field.BOOL_VALUE");
+ break;
+ case $AttributeTypes.COMBO.toString():
+ value = vars.get("$field.ID_VALUE");
+ break;
+ }
+
+ }
+ if(value != null && value != "")
+ result.string(value);
+}
-}
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 1f56574a85fd76c85db8ded5994ad08568122e88..b875495284faa7721af9568f4d183de4f82b8427 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/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 46d23fc40a27f172cb4b396f1679fde6f5a4b789..7ff04b18aabc3d337da88b7f8b9681f23fd35b37 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -84,11 +84,12 @@
<name>UNIT</name>
<title>Unit</title>
<consumer>KeywordQuantityUnits</consumer>
+ <state>READONLY</state>
</entityField>
<entityField>
<name>VAT</name>
<title>VAT</title>
- <state>AUTO</state>
+ <state>READONLY</state>
</entityField>
<entityParameter>
<name>OfferId_param</name>
diff --git a/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod b/entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
index c576024ce1ce7a626fbe9d26bb7efb6420713168..9b126ea6305cdbada13b45ea087ab4a5f0850c47 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>
@@ -304,6 +319,10 @@
<name>PHASE.displayValue</name>
<expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
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..6fd72c57517ba7f8233c18359e34bee7dd962f08
--- /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.salesprojectCompetitionState());
\ 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/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
index 09107aba69570d4b7cdc97c6e6eee0b76c93c11a..37acff54f1f087b8466c73fd57cc063cb586b587 100644
--- a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/phase.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECT.PHASE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "SALESPROJECT_COMPETITION.PHASE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2461e0e69ccb33edd16d0eaec38b789cbce99bae
--- /dev/null
+++ b/entity/SalesprojectCompetition_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectCompetitionState(), "SALESPROJECT_COMPETITION.STATUS");
+result.string(sql);
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..d536780462a9d9e5e1ba88aa83b6f508f7f602f1
--- /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="a.voegl" id="4064414a-6af3-4d85-82e8-f9b28f8cc2c1">
+ <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/SalesProjectCompetitionPhase.xml b/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionPhase.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cc89e529520708a75f46292dfca8af2841f86e1a
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionPhase.xml
@@ -0,0 +1,146 @@
+<?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="d3255092-9908-46da-aa7f-923f58cf5d68">
+ <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" tableName="SALESPROJECT_COMPETITION"/>
+ <addColumn tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" type="CHAR(36)"/>
+ </addColumn>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+ <where>PHASE_OLD = 1</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+ <where>PHASE_OLD = 2</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <where>PHASE_OLD = 3</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <where>PHASE_OLD = 4</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+ <where>PHASE_OLD = 5</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+ <where>PHASE_OLD = 6</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+ <where>PHASE_OLD = 7</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="4eb20149-3a76-4f5d-b8b7-9b529d8d564d"/>
+ <where>PHASE_OLD = 8</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="00a104d7-3af4-4250-bad3-1288b9df8152"/>
+ <where>PHASE_OLD = 9</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="ae5ecf72-3146-4d75-a7ff-7b628868672f"/>
+ <where>PHASE_OLD = 10</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="2f2afad4-6f1f-47f9-9830-4cbae67f9dc1"/>
+ <where>PHASE_OLD = 11</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="a6f57de3-02c2-44a8-9821-975b3a807b46"/>
+ <where>PHASE_OLD = 12</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="a6205bc6-e80f-41fb-9686-2940703eac96"/>
+ <where>PHASE_OLD = 13</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="8ae1d693-667f-4412-aa1b-eb45c5437aa6"/>
+ <where>PHASE_OLD = 14</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="874efae4-aae1-467f-896c-09d8ffe1e7af"/>
+ <where>PHASE_OLD = 15</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" value="11a3e3d1-aad0-4673-982d-e2533b0b4de6"/>
+ <where>PHASE_OLD = 16</where>
+ </update>
+ <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="PHASE_OLD"/>
+
+ <rollback>
+ <renameColumn newColumnName="PHASE_OLD" oldColumnName="PHASE" tableName="SALESPROJECT_COMPETITION"/>
+ <addColumn tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" type="INTEGER"/>
+ </addColumn>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="1"/>
+ <where>PHASE_OLD = '9f7d1fa9-7c09-4037-8f7c-8458def14d89'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="2"/>
+ <where>PHASE_OLD = '292628f1-d9a5-432d-8130-f6690c14a5d4'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="3"/>
+ <where>PHASE_OLD = '4467b33c-3a68-4c8b-ba4a-1eb666a6c774'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="4"/>
+ <where>PHASE_OLD = '1e42f183-fb97-415f-9917-b43ca159fde4'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="5"/>
+ <where>PHASE_OLD = '972a41dc-a8ae-43cd-a03b-522ea84efbfb'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="6"/>
+ <where>PHASE_OLD = '60d09bb1-7e02-4003-99bf-18b739a577ad'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="7"/>
+ <where>PHASE_OLD = '213c8184-f930-457e-8605-703baaf21d4a'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="8"/>
+ <where>PHASE_OLD = '4eb20149-3a76-4f5d-b8b7-9b529d8d564d'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="9"/>
+ <where>PHASE_OLD = '00a104d7-3af4-4250-bad3-1288b9df8152'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="10"/>
+ <where>PHASE_OLD = 'ae5ecf72-3146-4d75-a7ff-7b628868672f'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="11"/>
+ <where>PHASE_OLD = '2f2afad4-6f1f-47f9-9830-4cbae67f9dc1'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="12"/>
+ <where>PHASE_OLD = 'a6f57de3-02c2-44a8-9821-975b3a807b46'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="13"/>
+ <where>PHASE_OLD = 'a6205bc6-e80f-41fb-9686-2940703eac96'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="14"/>
+ <where>PHASE_OLD = '8ae1d693-667f-4412-aa1b-eb45c5437aa6'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="15"/>
+ <where>PHASE_OLD = '874efae4-aae1-467f-896c-09d8ffe1e7af'</where>
+ </update>
+ <update tableName="SALESPROJECT_COMPETITION">
+ <column name="PHASE" valueNumeric="16"/>
+ <where>PHASE_OLD = '11a3e3d1-aad0-4673-982d-e2533b0b4de6'</where>
+ </update>
+ <dropColumn tableName="SALESPROJECT_COMPETITION" columnName="PHASE_OLD"/>
+ </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
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 b3f5fd8fce1bf5824d454922e5340f16d9f7eec5..ecd34c9b28f302338cb6bab482ba50ae35cace42 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -65,6 +65,7 @@
<include relativeToChangelogFile="true" file="SalesProjectWeakness.xml"/>
<include relativeToChangelogFile="true" file="SalesProjectPricePolitics.xml"/>
<include relativeToChangelogFile="true" file="TaskPriority.xml"/>
+ <include relativeToChangelogFile="true" file="SalesprojectCompetitionState.xml"/>
<!--References to the reference files-->
<include relativeToChangelogFile="true" file="AditoBasic/init_OfferProbability.xml"/>
@@ -74,4 +75,6 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesProjectState.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesProjectPhase.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_TaskPriority.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectCompetitionState.xml"/>
+ <include relativeToChangelogFile="true" file="SalesProjectCompetitionPhase.xml"/>
</databaseChangeLog>
diff --git a/others/db_changes/system_alias/struct/create_asys_notifications.xml b/others/db_changes/system_alias/struct/create_asys_notifications.xml
index ffce2d8f6f2649390041137134de262a9d51da06..bd57a5ed46701167d402287e06ab56571e0a213c 100644
--- a/others/db_changes/system_alias/struct/create_asys_notifications.xml
+++ b/others/db_changes/system_alias/struct/create_asys_notifications.xml
@@ -7,7 +7,7 @@
</column>
<column name="BACKPACK" type="CLOB"/>
<column name="CAPTION" type="VARCHAR(512)"/>
- <column name="CONTENTID" type="VARCHAR(63)"/>
+ <column name="CONTENTID" type="VARCHAR(512)"/>
<column name="CREATIONDATE" type="BIGINT"/>
<column name="DESCRIPTION" type="VARCHAR(1023)"/>
<column name="FORCEDPRIORITY" type="INTEGER"/>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 8eebd273b16dbd3d55a1d322eb3cfba4472d2433..581c9d3a6896bb001678073f2ebc276b89dd4112 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -2,7 +2,7 @@
<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.0.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.0.3">
<name>_____PREFERENCES_PROJECT</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <projectName>xRM-Basic 2019</projectName>
+ <projectName>xRM-Basic2019</projectName>
<jditoMaxContentSize v="57671680" />
<calendarCategoriesEvent>
<entry>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index b5839ad2b5d1ef2b967eb3d003aa668327983e63..b57b5acc67c6766ede94b1b657d829464a0edc1f 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -55,4 +55,5 @@ $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"
$KeywordRegistry.salesprojectState = function(){return "SalesprojectState"};
$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"};
$KeywordRegistry.taskPriority = function(){return "TaskPriority"};
+$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState"};
$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType"};
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index a40a3dd0d3c78acd350c07fc400b3c812cb75abd..b938e83c265a80b1c9eb9920e94561bb24d64a14 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -166,7 +166,7 @@ function KeywordAttribute(pContainerName, pAttributeName)
var keywordAttrData = db.array(db.ROW, sql);
if (keywordAttrData.length == 0)
- throw new Error(translate.withArguments("no keyword attribute \"%0\" found in keyword container \"%1\"", this.attribute, this.container));
+ throw new Error(translate.withArguments("no keyword attribute \"%0\" found in keyword container \"%1\"", [this.attribute, this.container]));
this.id = keywordAttrData[0];
this.type = keywordAttrData[1];