From 1868560bb68c9002ee5c94fcfdb4895bbd604f5c Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Fri, 26 Jul 2019 16:25:33 +0200
Subject: [PATCH] rename in database: AB_KEYWORD_ATTRIBUTE & ORGANISATION &
TASK: TYPE -> KIND
---
...ActivityDirectionKeyword_add_icon_attr.xml | 2 +-
.../AditoBasic/init_ActivityCategory.xml | 2 +-
.../2019.1.4/AditoBasic/init_AddressType.xml | 4 +--
.../AditoBasic/init_AttributeType.xml | 2 +-
.../AditoBasic/init_CommunicationMedium.xml | 4 +--
.../init_CommunicationMediumCampaign.xml | 4 +--
.../init_DocumentTemplateTypeCategory.xml | 8 +++---
.../AditoBasic/init_OfferProbability.xml | 2 +-
.../2019.1.4/AditoBasic/init_TaskPriority.xml | 2 +-
.../salesprojectsource_add_icon_attr.xml | 2 +-
.../2019.1.4/BulkMail/bulkMail_keywords.xml | 2 +-
.../basic/2019.1.4/ORGANISATION_private.xml | 2 +-
.../2019.1.4/Salesproject_Phase_LongNames.xml | 2 +-
.../2019.1.4/Salesproject_Phase_icons.xml | 2 +-
.../Ticketmanagement/insertTaskStatus.xml | 2 +-
.../Ticketmanagement/insert_TicketTypes.xml | 6 ++--
.../update_Memberrole_InternExtern.xml | 2 +-
.../_demoData/generatedData/ORGANISATION.xml | 26 ++++++++---------
.../basic/_demoData/generatedData/TASK.xml | 28 +++++++++----------
...t_SalesprojectProbability_percentValue.xml | 2 +-
.../create_ab_keyword_attribute.xml | 2 +-
.../basic/init/struct/create_organisation.xml | 2 +-
.../basic/init/struct/create_task.xml | 2 +-
aliasDefinition/Data_alias/Data_alias.aod | 6 ++--
.../entityfields/addr_type/documentation.adoc | 2 +-
.../displayValueProcess.js | 2 +-
.../attributetype/valueProcess.js | 2 +-
.../KeywordAttribute_entity.aod | 2 +-
.../type.displayvalue/expression.js | 2 +-
.../recordcontainers/jdito/contentProcess.js | 4 +--
.../Organisation_entity.aod | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
.../type.displayvalue/expression.js | 2 +-
.../SupportTicket_entity.aod | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
entity/Task_entity/Task_entity.aod | 2 +-
.../recordcontainers/db/conditionProcess.js | 2 +-
process/KeywordData_lib/process.js | 2 +-
process/Keyword_lib/process.js | 2 +-
39 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml
index eb2fe92e77c..1980fd97295 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/ActivityDirectionKeyword_add_icon_attr.xml
@@ -6,7 +6,7 @@
<column name="NAME" value="icon"/>
<column name="CONTAINER" value="ActivityDirection"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7770bafa-22f0-4a74-a2cf-5001b620a4b2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
index 74c2587a8fc..f31849e8ea0 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
@@ -6,7 +6,7 @@
<column name="NAME" value="defaultAvatarRepresentation"/>
<column name="CONTAINER" value="ActivityCategory"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="94529505-1913-4827-9812-026053bfcb51"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
index 38fae576ae0..85edbfdc45c 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
@@ -6,14 +6,14 @@
<column name="NAME" value="organisation"/>
<column name="CONTAINER" value="AddressType"/>
- <column name="TYPE" value="BOOL_VALUE"/>
+ <column name="KIND" value="BOOL_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="c4c5352b-ff72-4323-80b9-631a24dd7245"/>
<column name="NAME" value="contact"/>
<column name="CONTAINER" value="AddressType"/>
- <column name="TYPE" value="BOOL_VALUE"/>
+ <column name="KIND" value="BOOL_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="49bb6904-dd20-4ede-aaff-ae80131ed274"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeType.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeType.xml
index a168eafe5bf..6e0ff735549 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AttributeType.xml
@@ -48,7 +48,7 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="307ecfc6-15c8-4ab9-8afa-e97b90a00c5f"/>
<column name="NAME" value="defaultAvatarRepresentation"/>
<column name="CONTAINER" value="AttributeType"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="0c537ea0-6ba2-4d9a-a27c-7c6a6920e303"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
index 137e041d594..4284472481b 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
@@ -6,14 +6,14 @@
<column name="NAME" value="category"/>
<column name="CONTAINER" value="CommunicationMedium"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
<column name="NAME" value="contentType"/>
<column name="CONTAINER" value="CommunicationMedium"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cc16d938-b95f-4e07-a3b4-73f8524bb664"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
index c9f6397ead2..ff16d322be8 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
@@ -6,14 +6,14 @@
<column name="NAME" value="AdvertisingBan"/>
<column name="CONTAINER" value="CommunicationMediumCampaign"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="d6c0fd72-ded2-4e4d-adf5-f8832d7b24f2"/>
<column name="NAME" value="AdvertisingBanIcon"/>
<column name="CONTAINER" value="CommunicationMediumCampaign"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2acd3694-ccef-4d0b-ae7a-b3d31f8d9cc0"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
index 6d75abdd21c..ff6007cc918 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
@@ -5,25 +5,25 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2001"/>
<column name="NAME" value="LET"/>
<column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
- <column name="TYPE" value="BOOL_VALUE"/>
+ <column name="KIND" value="BOOL_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2002"/>
<column name="NAME" value="MAI"/>
<column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
- <column name="TYPE" value="BOOL_VALUE"/>
+ <column name="KIND" value="BOOL_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2003"/>
<column name="NAME" value="ATT"/>
<column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
- <column name="TYPE" value="BOOL_VALUE"/>
+ <column name="KIND" value="BOOL_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="14c2d515-a42f-4618-b534-7a23369d2004"/>
<column name="NAME" value="TEX"/>
<column name="CONTAINER" value="DocumentTemplateTypeCategory"/>
- <column name="TYPE" value="BOOL_VALUE"/>
+ <column name="KIND" value="BOOL_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-423e-b130-dp88b2b51123"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
index 9887c9db191..3abd6233333 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
@@ -6,7 +6,7 @@
<column name="NAME" value="percentValue"/>
<column name="CONTAINER" value="OfferProbability"/>
- <column name="TYPE" value="NUMBER_VALUE"/>
+ <column name="KIND" value="NUMBER_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="e14fab55-4a85-48c2-a109-125eaed9dc3f"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
index 30192dcbe9d..9d827ad4ea8 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
@@ -6,7 +6,7 @@
<column name="NAME" value="defaultAvatarRepresentation"/>
<column name="CONTAINER" value="TaskPriority"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="97ec9a7e-a1dd-4167-bf7d-57ee3d79d46f"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/salesprojectsource_add_icon_attr.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/salesprojectsource_add_icon_attr.xml
index a8099715835..7a6b7e2acbf 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/salesprojectsource_add_icon_attr.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/salesprojectsource_add_icon_attr.xml
@@ -6,7 +6,7 @@
<column name="NAME" value="defaultAvatarRepresentation"/>
<column name="CONTAINER" value="SalesprojectSource"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
diff --git a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
index 8e54b9eef3b..26262bd6e78 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
@@ -55,7 +55,7 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
<column name="NAME" value="bulkMailIcon"/>
<column name="CONTAINER" value="BulkMailStatus"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
<column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="801268a9-e93e-4481-b98d-1e37ca308e10"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml b/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
index 77e650768a1..fef6b1c525e 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
@@ -5,7 +5,7 @@
<column name="ORGANISATIONID" value="0"/>
<column name="NAME" value="privat"/>
<column name="CUSTOMERCODE" value=""/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
</insert>
<insert tableName="CONTACT">
<column name="CONTACTID" value="0"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml
index 2f5fae70ad3..c7864cd24f1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_LongNames.xml
@@ -5,7 +5,7 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="f1413a2f-6631-4255-9dc9-a28e6eb30497"/>
<column name="NAME" value="longName"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml
index 9d3be8b53fd..271e18769b1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml
@@ -5,7 +5,7 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
<column name="NAME" value="icon"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTaskStatus.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTaskStatus.xml
index 21258fe56ab..b17b28d0ce1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTaskStatus.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTaskStatus.xml
@@ -5,7 +5,7 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="NAME" value="icon"/>
<column name="CONTAINER" value="TaskStatus"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<!-- new -->
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TicketTypes.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TicketTypes.xml
index 5f2ac9ffa2a..c489501a6da 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TicketTypes.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TicketTypes.xml
@@ -5,19 +5,19 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
<column name="NAME" value="attributes"/>
<column name="CONTAINER" value="TicketType"/>
- <column name="TYPE" value="LONG_CHAR_VALUE"/>
+ <column name="KIND" value="LONG_CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
<column name="NAME" value="availableStatus"/>
<column name="CONTAINER" value="TicketType"/>
- <column name="TYPE" value="LONG_CHAR_VALUE"/>
+ <column name="KIND" value="LONG_CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
<column name="NAME" value="defaultStatus"/>
<column name="CONTAINER" value="TicketType"/>
- <column name="TYPE" value="CHAR_VALUE"/>
+ <column name="KIND" value="CHAR_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Memberrole_InternExtern.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Memberrole_InternExtern.xml
index 40aafe37e60..abf87e86bbc 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Memberrole_InternExtern.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_Memberrole_InternExtern.xml
@@ -5,7 +5,7 @@
<column name="AB_KEYWORD_ATTRIBUTEID" value="0bdeb691-f90a-4d7e-a99a-08c60816232c"/>
<column name="NAME" value="Intern"/>
<column name="CONTAINER" value="MemberRole"/>
- <column name="TYPE" value="BOOL_VALUE"/>
+ <column name="KIND" value="BOOL_VALUE"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
index c8e0ccf77f2..8cbcf443b3b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
@@ -8,7 +8,7 @@
<column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
<column name="NAME" value="Industrial Steel AG"/>
<column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -19,7 +19,7 @@
<column name="INFO" value="Die Transatlantik Logistic Gruppe ist ein Zusammenschluss aus mehreren Logistik Unternehmen. Über 3.000 Mitarbeiter sind bei dem europäischen Logistikriesen beschäftigt. "/>
<column name="NAME" value="Transatlantik Logistics GmbH"/>
<column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -29,7 +29,7 @@
<column name="INFO" value="Die Skyscraper Bau GmbH zählt zu den führenden Unternehmen in der Baubranche. Mit ihrem breiten Portfolio überzeugen sie regelmäßig und diversifizieren sich von ihren Mitbewerbern. "/>
<column name="NAME" value="Skyscraper Bau GmbH"/>
<column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ORGANISATION">
@@ -46,7 +46,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="NAME" value="JPM Touristik GmbH"/>
<column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ORGANISATION">
@@ -56,7 +56,7 @@
<column name="INFO" value="Automobilvermietung"/>
<column name="NAME" value="Sevent SE"/>
<column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -75,7 +75,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="NAME" value="SuperBauer AG"/>
<column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -85,7 +85,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="NAME" value="Grobbe-Werk GmbH"/>
<column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -103,7 +103,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="NAME" value="Firmengruppe Matthias Bogen"/>
<column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ORGANISATION">
@@ -112,7 +112,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="NAME" value="Aquire GmbH"/>
<column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
- <column name="TYPE" value="ORGMANUF"/>
+ <column name="KIND" value="ORGMANUF"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -122,7 +122,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="NAME" value="Netro AG"/>
<column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
- <column name="TYPE" value="ORGMANUF"/>
+ <column name="KIND" value="ORGMANUF"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -132,7 +132,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="NAME" value="Glob Group"/>
<column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -142,7 +142,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="NAME" value="Schild AG"/>
<column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
- <column name="TYPE" value="ORGPARTNER"/>
+ <column name="KIND" value="ORGPARTNER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -152,7 +152,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="meine Firma"/>
<column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="TYPE" value="ORGCUTOMER"/>
+ <column name="KIND" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
index f90edd2e0c2..b81beaf2db1 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
@@ -12,7 +12,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Forecast anpassen"/>
<column name="TASKID" value="7d404da2-78bf-427b-8abb-4c7e953220ca"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kunde wollte ein Angebot, hierzu die offenen Posten klären"/>
@@ -25,7 +25,7 @@
<column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="Nachfassen bei Kunden"/>
<column name="TASKID" value="783f38b6-db71-42b5-9117-848553905c93"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
@@ -38,7 +38,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Besuch vorbereiten"/>
<column name="TASKID" value="d6217dc5-5585-4919-a545-9cdc64a1ca58"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kampagnenplanung für dieses Jahr beenden."/>
@@ -51,7 +51,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Kampagne zu Akquise planen"/>
<column name="TASKID" value="380c1ae1-c7d4-49b7-87e1-4fe2e16c4c52"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -64,7 +64,7 @@
<column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="Skyscraper VP für nächste Schritte"/>
<column name="TASKID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -77,7 +77,7 @@
<column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="Vorbereitung Präsentation"/>
<column name="TASKID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kunde ist sehr interessiert an unserem Produkten, weitere Produktabstimmung intern."/>
@@ -91,7 +91,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Lead nachfassen"/>
<column name="TASKID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-06-21T06:03:00"/>
@@ -103,7 +103,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Produkt Präsentation vorbereiten und mit Lisa Sommer abstimmen"/>
<column name="TASKID" value="cf99cace-a6e1-46a6-ad83-c634e373f320"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Strategieevent 2-Tage"/>
@@ -116,7 +116,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Event im Hause"/>
<column name="TASKID" value="d8f35764-2c56-45be-93c7-f1e0695e2417"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Winterreifen draufmachen lassen"/>
@@ -129,7 +129,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Autoreifen wechseln"/>
<column name="TASKID" value="0d126a7e-4308-4857-9245-5a40f3e2b36e"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Preisabstimmung."/>
@@ -142,7 +142,7 @@
<column name="STATUS" value="WAITING"/>
<column name="SUBJECT" value="Mit der Vertriebsleitung abstimmen wie viel Prozent Rabatt gegeben werden kann."/>
<column name="TASKID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-05-30T09:21:00"/>
@@ -154,7 +154,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Präsentation vor Ort vorbereiten"/>
<column name="TASKID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-05-30T11:50:00"/>
@@ -166,7 +166,7 @@
<column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Test"/>
<column name="TASKID" value="81a4d411-f317-4080-84b6-55ed91d26d34"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Es sollen die effizienten Wertschöpfungsketten der Prozessdefinitionseinheiten im primären Schritt gebündelt und sekundär analysiert und verifiziert werden."/>
@@ -179,7 +179,7 @@
<column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
<column name="TASKID" value="e9cb198d-c420-4192-9c29-b23682457d8e"/>
- <column name="TYPE" value="TASK"/>
+ <column name="KIND" value="TASK"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
index e7425b24dcd..1bbc33e4975 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_attribute/init_SalesprojectProbability_percentValue.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="2fabbd9a-89d2-49e3-b3aa-1dcbc77252c7"/>
<column name="NAME" value="percentValue"/>
- <column name="TYPE" value="NUMBER_VALUE"/>
+ <column name="KIND" value="NUMBER_VALUE"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
</insert>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
diff --git a/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
index a39bf989d42..47b8c016a72 100644
--- a/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
+++ b/.liquibase/Data_alias/basic/init/struct/AditoBasic/create_ab_keyword_attribute.xml
@@ -9,7 +9,7 @@
<column name="NAME" type="VARCHAR(100)">
<constraints nullable="false"/>
</column>
- <column name="TYPE" type="CHAR(36)">
+ <column name="KIND" type="CHAR(36)">
<constraints nullable="false"/>
</column>
<column name="CONTAINER" type="VARCHAR(80)">
diff --git a/.liquibase/Data_alias/basic/init/struct/create_organisation.xml b/.liquibase/Data_alias/basic/init/struct/create_organisation.xml
index a0940204288..0bc211b5820 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_organisation.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_organisation.xml
@@ -6,7 +6,7 @@
<constraints nullable="false"/>
</column>
<column name="INFO" type="NCLOB"/>
- <column name="TYPE" type="CHAR(36)"/>
+ <column name="KIND" type="CHAR(36)"/>
<column name="CUSTOMERCODE" type="NVARCHAR(30)"/>
<column name="ORGANISATIONID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_ORG_ORGID"/>
diff --git a/.liquibase/Data_alias/basic/init/struct/create_task.xml b/.liquibase/Data_alias/basic/init/struct/create_task.xml
index 89727f63dfe..cf34a7d0075 100644
--- a/.liquibase/Data_alias/basic/init/struct/create_task.xml
+++ b/.liquibase/Data_alias/basic/init/struct/create_task.xml
@@ -16,7 +16,7 @@
<column name="EDITOR_CONTACT_ID" type="CHAR(36)"/>
<column name="START_DATE" type="DATETIME"/>
<column name="MATURITY_DATE" type="DATETIME"/>
- <column name="TYPE" type="CHAR(36)"/>
+ <column name="KIND" type="CHAR(36)"/>
<column name="DESCRIPTION" type="NCLOB"/>
<column name="PROTECTIONLEVEL" type="SMALLINT"/>
</createTable>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 0987b9d7461..ebb0037d2eb 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -86,7 +86,7 @@
</customProperties>
</entityFieldDb>
<entityFieldDb>
- <name>TYPE</name>
+ <name>KIND</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -5013,7 +5013,7 @@
</customProperties>
</entityFieldDb>
<entityFieldDb>
- <name>TYPE</name>
+ <name>KIND</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -6281,7 +6281,7 @@
</customProperties>
</entityFieldDb>
<entityFieldDb>
- <name>TYPE</name>
+ <name>KIND</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
diff --git a/entity/Address_entity/entityfields/addr_type/documentation.adoc b/entity/Address_entity/entityfields/addr_type/documentation.adoc
index ba58622a4b0..a374543b872 100644
--- a/entity/Address_entity/entityfields/addr_type/documentation.adoc
+++ b/entity/Address_entity/entityfields/addr_type/documentation.adoc
@@ -5,5 +5,5 @@ The `ADDR_TYPE` field represents the type of address (like "shipping address", "
Possible values depend on the type of object it's connect to since a contactperson has different types than a company (organisation).
-The Keyword ADDRESS.TYPE contains the following custom properties: {org: true, person: false}
+The Keyword ADDRESS.KIND contains the following custom properties: {org: true, person: false}
The types are filtered by the current contact type in the possibleItemsProcess.
\ No newline at end of file
diff --git a/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js
index 3e385da47ff..2f5a5971a65 100644
--- a/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js
+++ b/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js
@@ -9,7 +9,7 @@ if (keywordAttributeId)
{
var sql = SqlCondition.begin()
.andPrepare("AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID", keywordAttributeId)
- .buildSql("select AB_KEYWORD_ATTRIBUTE.NAME, AB_KEYWORD_ATTRIBUTE.TYPE from AB_KEYWORD_ATTRIBUTE");
+ .buildSql("select AB_KEYWORD_ATTRIBUTE.NAME, AB_KEYWORD_ATTRIBUTE.KIND from AB_KEYWORD_ATTRIBUTE");
res = db.cell(sql);
}
result.string(res);
\ No newline at end of file
diff --git a/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js
index 17b5f6abe25..cbac8d6452c 100644
--- a/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js
+++ b/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js
@@ -12,7 +12,7 @@ if (id)
{
type = db.cell(SqlCondition.begin()
.andPrepare("AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID", id)
- .buildSql("select AB_KEYWORD_ATTRIBUTE.TYPE from AB_KEYWORD_ATTRIBUTE"));
+ .buildSql("select AB_KEYWORD_ATTRIBUTE.KIND from AB_KEYWORD_ATTRIBUTE"));
type = type.trim();
}
result.string(type);
\ No newline at end of file
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index a3a8ac69e28..eb6e94c6621 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -115,7 +115,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTE.TYPE</recordfield>
+ <recordfield>AB_KEYWORD_ATTRIBUTE.KIND</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index a08460ea208..d1d58b99ba1 100644
--- a/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/KeywordAttribute_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.keywordAttributeType(), "AB_KEYWORD_ATTRIBUTE.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.keywordAttributeType(), "AB_KEYWORD_ATTRIBUTE.KIND");
result.string(sql);
diff --git a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
index 73393d631a5..5f23c2b5393 100644
--- a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -40,7 +40,7 @@ function queryChildrenElements (pContextName, pID) {
var taskResult = db.table(SqlCondition.begin()
.andPrepare("TASK.PARENT_ID", pID)
.andPrepare("TASK.PARENT_CONTEXT", pContextName)
- .andPrepare("TASK.TYPE", $KeywordRegistry.taskType$task())
+ .andPrepare("TASK.KIND", $KeywordRegistry.taskType$task())
.buildSql("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK"));
@@ -150,7 +150,7 @@ function queryRootElement (pContextName, pID, pGetFirst) {
* UID, PARENT_ID, PARENT_CONTEXT, TITLE, DESCRIPTION
* @param pType The type of the row which needs adjustment.
* @return Returns the following format:
- * UID, TYPE, PARENT_ID, PARENT_CONTEX, TITL, DESCRIPTION, ICON
+ * UID, KIND, PARENT_ID, PARENT_CONTEX, TITL, DESCRIPTION, ICON
*
*/
function augmentData (pDataRow, pType) {
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 77c28108b05..720356e5d8c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -972,7 +972,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
- <recordfield>ORGANISATION.TYPE</recordfield>
+ <recordfield>ORGANISATION.KIND</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 5257861cd29..ddde730d661 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -39,7 +39,7 @@ if (vars.exists("$param.ExcludedContactIds_param") && vars.get("$param.ExcludedC
cond.andSqlCondition(excludedCond, "1=1");
}
-cond.andPrepareVars("ORGANISATION.TYPE", "$param.OrganisationType_param");
+cond.andPrepareVars("ORGANISATION.KIND", "$param.OrganisationType_param");
//TODO: use a preparedCondition when available #1030812 #1034026
result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
index 2265271d80a..7ab8eb06526 100644
--- a/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/Organisation_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.organisationType(), "ORGANISATION.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.organisationType(), "ORGANISATION.KIND");
result.string(sql);
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index b3a7749a98b..1142784be4e 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -478,7 +478,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TASK_TYPE.value</name>
- <recordfield>TASK.TYPE</recordfield>
+ <recordfield>TASK.KIND</recordfield>
<isFilterable v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
diff --git a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
index ee924d8bf89..fe0848af0b2 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
@@ -6,7 +6,7 @@ import("Sql_lib");
import("KeywordRegistry_basic");
var cond = new SqlCondition();
-cond.andPrepare("TASK.TYPE", $KeywordRegistry.taskType$ticket())
+cond.andPrepare("TASK.KIND", $KeywordRegistry.taskType$ticket())
.andPrepareVars("TICKET.TICKETTYPE", "$param.TicketType_param")
var loadNothing = false;
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 5c650303546..34f0c91d29c 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -530,7 +530,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TYPE.value</name>
- <recordfield>TASK.TYPE</recordfield>
+ <recordfield>TASK.KIND</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Task_entity/recordcontainers/db/conditionProcess.js b/entity/Task_entity/recordcontainers/db/conditionProcess.js
index 8169552d13e..7b2cb50176c 100644
--- a/entity/Task_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Task_entity/recordcontainers/db/conditionProcess.js
@@ -6,7 +6,7 @@ import("Sql_lib");
import("KeywordRegistry_basic");
var cond = new SqlCondition();
-cond.andPrepare("TASK.TYPE", $KeywordRegistry.taskType$task())
+cond.andPrepare("TASK.KIND", $KeywordRegistry.taskType$task())
var loadNothing = false;
diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index 1b256b9fd50..930d056393a 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -58,7 +58,7 @@ KeywordData.getKeywordAttributeRelations = function (pKeywordContainer)
var cond = SqlCondition.begin()
.andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pKeywordContainer);
- var sql = cond.buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ATTRIBUTE.NAME, AB_KEYWORD_ATTRIBUTE.TYPE, \n\
+ var sql = cond.buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ATTRIBUTE.NAME, AB_KEYWORD_ATTRIBUTE.KIND, \n\
AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE, AB_KEYWORD_ATTRIBUTERELATION.LONG_CHAR_VALUE, AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE, AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE \n\
from AB_KEYWORD_ENTRY \n\
join AB_KEYWORD_ATTRIBUTE on (AB_KEYWORD_ATTRIBUTE.CONTAINER = AB_KEYWORD_ENTRY.CONTAINER) \n\
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 71b96a3cf78..f0fd2438cb0 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -228,7 +228,7 @@ function KeywordAttribute(pContainerName, pAttributeName, pDefault)
var sql = SqlCondition.begin()
.andPrepare("AB_KEYWORD_ATTRIBUTE.CONTAINER", pContainerName)
.andPrepare("AB_KEYWORD_ATTRIBUTE.NAME", pAttributeName)
- .buildSql("select AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID, AB_KEYWORD_ATTRIBUTE.TYPE from AB_KEYWORD_ATTRIBUTE");
+ .buildSql("select AB_KEYWORD_ATTRIBUTE.AB_KEYWORD_ATTRIBUTEID, AB_KEYWORD_ATTRIBUTE.KIND from AB_KEYWORD_ATTRIBUTE");
var keywordAttrData = db.array(db.ROW, sql);
--
GitLab