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 index 95bc103e1138fcb969552eadf445011db764949d..d536780462a9d9e5e1ba88aa83b6f508f7f602f1 100644 --- 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 @@ -1,6 +1,6 @@ <?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"> + <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"/> diff --git a/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionState.xml b/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionState.xml deleted file mode 100644 index 829092c2bf9d1cdf06ad148777ae0139a308c275..0000000000000000000000000000000000000000 --- a/others/db_changes/data_alias/basic/2019.2/SalesProjectCompetitionState.xml +++ /dev/null @@ -1,66 +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.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 66061becde949d7d1f7e4a0ab28b7f4b50b15f4c..97e48770aa016f777a20e2c1621ecfd5109d21f6 100644 --- a/others/db_changes/data_alias/basic/2019.2/changelog.xml +++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml @@ -61,6 +61,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"/> @@ -70,5 +71,5 @@ <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="AditoBasic/init_SalesprojectCompetitionState.xml"/> </databaseChangeLog> diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js index c7677621cd70d4364d725c3f02f3ae341d0ce115..66839362014f43b357aaf7957387bd057440eabb 100644 --- a/process/KeywordRegistry_basic/process.js +++ b/process/KeywordRegistry_basic/process.js @@ -54,4 +54,5 @@ $KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness" $KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght"}; $KeywordRegistry.salesprojectState = function(){return "SalesprojectState"}; $KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase"}; -$KeywordRegistry.taskPriority = function(){return "TaskPriority"}; \ No newline at end of file +$KeywordRegistry.taskPriority = function(){return "TaskPriority"}; +$KeywordRegistry.taskPriority = function(){return "SalesprojectCompetitionState"}; \ No newline at end of file