diff --git a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
index 0603638910cfef98114adef301c6cffd487b4260..17f5ed88b30f6d1c35a03131d74fa5cbd6535874 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
<renameColumn
- columnDataType="CHAR(36)"
- newColumnName="ORGANISATION_CONTACT_ID"
+ columnDataType="CHAR"
oldColumnName="ORGANISATION_ID"
+ newColumnName="ORGANISATION_CONTACT_ID"
tableName="VISITPLANENTRY"/>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml b/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cb352481afaa45ad86684e169e4867f64e431cc4
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/add_Address_LatLon.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="2f2d806c-8aab-42f0-91c2-c7d15322d89f">
+ <addColumn tableName="ADDRESS">
+ <column name="LAT" type="DECIMAL(10,8)"/>
+ <column name="LON" type="DECIMAL(11,8)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
index d7d38c34c2317f5b7c1a3db66f53eb79d4e90741..2144ba2aa05757e48e229d77a6615145bdfde80c 100644
--- a/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -3,6 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
<include file="DeleteNotificationtypeKeywords.xml" relativeToChangelogFile="true" />
- <!-- disabled the following script since it is WIP-->
- <!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
+ <include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
+ <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index e6850dd5b6879f44ea9c7feba9b6bbefa4db5809..e0d3d5755882822c78f8a3609d6452a23a9d7749 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -50,5 +50,5 @@
<include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
<include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
<include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
- <include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>
+ <!--<include file="generatedData/visitplan.xml" relativeToChangelogFile="true"/>-->
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
index 517d9ed46670cb570739a7af571ee61307e1b92b..1a2d9eafc5085339edbd681cc496cd2a81c8be19 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_attributerelation.xml
@@ -7,7 +7,7 @@
<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:34"/>
<column name="ID_VALUE" value="DELIVERCIF"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -25,7 +25,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:09"/>
<column name="ID_VALUE" value="PRICELISTSPECIAL"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -34,7 +34,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
<column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
- <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -43,7 +43,7 @@
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:54"/>
<column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -61,7 +61,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:07"/>
<column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -79,7 +79,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:08"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -96,7 +96,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:39"/>
<column name="ID_VALUE" value="PRICELISTSPECIAL"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -105,7 +105,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:25"/>
<column name="ID_VALUE" value="PRICELISTSPECIAL"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -114,7 +114,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:46"/>
<column name="ID_VALUE" value="PAYTERM7"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -123,7 +123,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:37"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -132,7 +132,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:21:26"/>
<column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -141,7 +141,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -159,7 +159,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:58"/>
<column name="ID_VALUE" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -168,7 +168,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -186,7 +186,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:18:11"/>
<column name="ID_VALUE" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -195,7 +195,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -222,7 +222,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:27:08"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -231,7 +231,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:43:59"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -240,7 +240,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
<column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -249,7 +249,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -258,7 +258,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -267,7 +267,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -276,7 +276,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -303,7 +303,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:53"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -330,7 +330,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:44"/>
<column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -348,7 +348,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:08"/>
<column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -357,7 +357,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:27:34"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -366,7 +366,7 @@
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:46"/>
<column name="ID_VALUE" value="PRICELISTDEFAULT"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -375,7 +375,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:19:47"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -393,7 +393,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -402,7 +402,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:10"/>
<column name="ID_VALUE" value="PAYTERMDISCOUNT"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -411,7 +411,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:55"/>
<column name="ID_VALUE" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -420,7 +420,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -429,7 +429,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -438,7 +438,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -447,7 +447,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -456,7 +456,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:47"/>
<column name="ID_VALUE" value="SALPROJPOLABO"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -474,7 +474,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:18"/>
<column name="ID_VALUE" value="SALPROJPOLABO"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -483,7 +483,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -501,7 +501,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -510,7 +510,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
<column name="ID_VALUE" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -546,7 +546,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:36:47"/>
<column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -555,7 +555,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:41"/>
<column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -573,7 +573,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:50:03"/>
<column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -582,7 +582,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:26:46"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -591,7 +591,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:40"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -609,7 +609,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:20:55"/>
<column name="ID_VALUE" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="OBJECT_ROWID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -618,7 +618,7 @@
<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:25"/>
<column name="ID_VALUE" value="DELIVEREX"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -627,7 +627,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -645,7 +645,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:54"/>
<column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="OBJECT_ROWID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -663,7 +663,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -672,7 +672,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:17:34"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="OBJECT_ROWID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -681,7 +681,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -690,7 +690,7 @@
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:25"/>
<column name="ID_VALUE" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -699,7 +699,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:05"/>
<column name="ID_VALUE" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -708,7 +708,7 @@
<column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:50:59"/>
<column name="ID_VALUE" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="OBJECT_ROWID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -717,7 +717,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:18:12"/>
<column name="ID_VALUE" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -726,7 +726,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:30"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -735,7 +735,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:01:27"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="OBJECT_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -744,7 +744,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -762,7 +762,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:54:10"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="OBJECT_ROWID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -771,7 +771,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:28:14"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="OBJECT_ROWID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -780,7 +780,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -789,7 +789,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:24:42"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -798,7 +798,7 @@
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:55"/>
<column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="OBJECT_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -807,7 +807,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:25:12"/>
<column name="ID_VALUE" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -816,7 +816,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:22:05"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="OBJECT_ROWID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -825,7 +825,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:31"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="OBJECT_ROWID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -843,7 +843,7 @@
<column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
<column name="DATE_NEW" valueDate="2019-11-26T06:20:19"/>
<column name="ID_VALUE" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="OBJECT_ROWID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -852,7 +852,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:56:16"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="OBJECT_ROWID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -861,7 +861,7 @@
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
<column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="OBJECT_ROWID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -870,7 +870,7 @@
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:02"/>
<column name="ID_VALUE" value="SALPROJPOLLOW"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="OBJECT_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -879,7 +879,7 @@
<column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:10"/>
<column name="ID_VALUE" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -888,7 +888,7 @@
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:57"/>
<column name="ID_VALUE" value="PAYTERM30"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="OBJECT_ROWID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -897,7 +897,7 @@
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
<column name="ID_VALUE" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
index b9e7fed8e30fea667314752487316f64aa48f2f3..65cea7ecab918b754bd6311c0872f70c91e83b7d 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_loghistory.xml
@@ -220,7 +220,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
- <column name="DESCRIPTION" value="Activity Id: "e265a424-b343-4bc1-b1cd-d40b9405ca12", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "e265a424-b343-4bc1-b1cd-d40b9405ca12", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
@@ -660,7 +660,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
- <column name="DESCRIPTION" value="Activity Id: "d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b", Objekt: "fc465f2f-803b-4a1f-b79d-7b466d7ecff4", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b", Objekt: "f7b8f0c3-7702-4466-b502-d21fa4fa0010", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
@@ -804,7 +804,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
- <column name="DESCRIPTION" value="Activity Id: "9c22ba51-8a09-40f1-b6b8-9787fe43b141", Objekt: "6efb4fab-64f9-4d8e-aa6f-a158d13fc273", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "9c22ba51-8a09-40f1-b6b8-9787fe43b141", Objekt: "6a92df58-2b98-40da-ba6a-d0ddb1fde234", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
@@ -836,7 +836,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T11:01:59"/>
- <column name="DESCRIPTION" value="Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Task Id: "46164eac-62d1-4dbb-a252-93ac49429855", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Task Id: "46164eac-62d1-4dbb-a252-93ac49429855", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="TASKLINK"/>
<column name="TABLENAMEID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
@@ -876,7 +876,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
- <column name="DESCRIPTION" value="Activity Id: "b8067a42-d059-4d86-88b0-485a194faa36", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "b8067a42-d059-4d86-88b0-485a194faa36", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
@@ -934,7 +934,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-15T01:03:35"/>
- <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" eingefügt."/>
+ <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
@@ -1059,7 +1059,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1067,7 +1067,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="TABLENAMEID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1075,7 +1075,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Handel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1083,7 +1083,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "gross" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="TABLENAMEID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1091,7 +1091,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1099,7 +1099,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="TABLENAMEID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1107,7 +1107,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="TABLENAMEID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1115,7 +1115,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Service" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1123,7 +1123,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="TABLENAMEID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1131,7 +1131,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Logistik" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1139,7 +1139,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="TABLENAMEID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1147,7 +1147,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1155,7 +1155,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="TABLENAMEID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1163,7 +1163,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1171,7 +1171,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="TABLENAMEID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1179,7 +1179,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Maschinenbau" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1187,7 +1187,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="TABLENAMEID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1195,7 +1195,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1203,7 +1203,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Logistik" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="TABLENAMEID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1211,7 +1211,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="TABLENAMEID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1227,7 +1227,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "gross" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="TABLENAMEID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1235,7 +1235,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1243,7 +1243,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Loyalty: "mittel" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="TABLENAMEID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1251,7 +1251,7 @@
<column name="DESCRIPTION" value="Eigenschaft Assessment / Industry: "Bauwesen" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_ATTRIBUTERELATION"/>
- <column name="TABLENAMEID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="TABLENAMEID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ab_loghistory">
@@ -1312,7 +1312,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:17:08"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "8707accf-b1fd-4bde-97b1-ab44b75f66f9", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "3cee0474-504f-43cc-844a-715f1a0db271", Object relation type 2: "fa879afd-b2c5-4eee-9799-d63c6764b348" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "13e60843-5d6d-45ee-88c7-46db41874138", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "3cee0474-504f-43cc-844a-715f1a0db271", Object relation type 2: "fa879afd-b2c5-4eee-9799-d63c6764b348" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
@@ -1320,7 +1320,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:17:20"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "6efb4fab-64f9-4d8e-aa6f-a158d13fc273", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "b043cd42-058c-48bd-8326-4c92e0e74c48", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
@@ -1328,7 +1328,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:17:47"/>
- <column name="DESCRIPTION" value="Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362", Object 1 row Id: "6efb4fab-64f9-4d8e-aa6f-a158d13fc273", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f" gelöscht."/>
+ <column name="DESCRIPTION" value="Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362", Object 1 row Id: "b043cd42-058c-48bd-8326-4c92e0e74c48", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43" gelöscht."/>
<column name="LOGTYPE" value="D"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="8c09b724-5ff0-4869-add8-803097cd94aa"/>
@@ -1336,7 +1336,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:18:26"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "a3fd3c23-12e1-4820-b76e-2cd70103d94d", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "62175b31-b432-4ec6-932f-8e69033884c6", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "0795a3cd-295b-421b-aed1-decc09b05362", Object relation type 2: "0795a3cd-295b-421b-aed1-decc09b05362" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
@@ -1344,7 +1344,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T08:19:02"/>
- <column name="DESCRIPTION" value="Object 1 row Id: "019651a4-503e-4e06-aefd-e7e631bf3144", Object 2 row Id: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Object relation type 1: "c9b7ce6b-1100-46f6-8498-2da6ac24189e", Object relation type 2: "259babbd-7827-44d4-b9ec-8245d27b5f70" eingefügt."/>
+ <column name="DESCRIPTION" value="Object 1 row Id: "97b66b3c-a9f5-4dc4-902e-850d69973d1d", Object 2 row Id: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Object relation type 1: "c9b7ce6b-1100-46f6-8498-2da6ac24189e", Object relation type 2: "259babbd-7827-44d4-b9ec-8245d27b5f70" eingefügt."/>
<column name="LOGTYPE" value="I"/>
<column name="TABLENAME" value="AB_OBJECTRELATION"/>
<column name="TABLENAMEID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
@@ -1386,7 +1386,7 @@
</insert>
<insert tableName="ab_loghistory">
<column name="DATE_NEW" valueDate="2019-11-26T12:34:38"/>
- <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "dec94545-2487-46d5-978d-26ee0fcf0f5f", Art: "Organisation" gelöscht."/>
+ <column name="DESCRIPTION" value="Activity Id: "c7c29526-3138-4264-8eb4-c6876797f8fe", Objekt: "2c63e0de-f21c-474f-89d7-bff8ba1dbf43", Art: "Organisation" gelöscht."/>
<column name="LOGTYPE" value="D"/>
<column name="TABLENAME" value="ACTIVITYLINK"/>
<column name="TABLENAMEID" value="9770d2f3-409c-4fab-a3df-4fd3dcd14693"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
index 2bb4e963665200c4c8d9b8fe8b1eb2f04aa967b0..2daffba38d28510da3fe1d4cc1e3b6311a62797c 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelation.xml
@@ -6,8 +6,8 @@
<column name="AB_OBJECTRELATIONID" value="03c855e5-f236-4e39-b886-91832b3a53fb"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
- <column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT1_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
+ <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
@@ -20,43 +20,43 @@
<column name="AB_OBJECTRELATIONID" value="2bd8678c-e621-4e22-b203-2d5d967422c0"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
- <column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="390cd4d2-8231-4dbc-ac9d-0ea7aecc6ef6"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
- <column name="OBJECT1_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="47802bb5-7785-43ba-a860-6b494e8ef593"/>
<column name="AB_OBJECTRELATIONTYPE1" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
<column name="AB_OBJECTRELATIONTYPE2" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
- <column name="OBJECT1_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- <column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT1_ROWID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
+ <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
<column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
<column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
<column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT2_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="63ecd05d-f2e5-4957-a496-96a87451a78f"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
- <column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- <column name="OBJECT2_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+ <column name="OBJECT2_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
@@ -69,29 +69,29 @@
<column name="AB_OBJECTRELATIONID" value="c8aa4abb-a274-43d6-a067-ee935c443bfb"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- <column name="OBJECT1_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- <column name="OBJECT2_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT1_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
+ <column name="OBJECT2_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="cfbbce3e-1c0d-4d05-9ccf-8232f7eaaf02"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
<column name="AB_OBJECTRELATIONTYPE2" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
- <column name="OBJECT1_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
- <column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT1_ROWID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
+ <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="d4454686-8d4e-42d9-9df8-61f19c69ce93"/>
<column name="AB_OBJECTRELATIONTYPE1" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
<column name="AB_OBJECTRELATIONTYPE2" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
- <column name="OBJECT1_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- <column name="OBJECT2_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT1_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
+ <column name="OBJECT2_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
</insert>
<insert tableName="ab_objectrelation">
<column name="AB_OBJECTRELATIONID" value="e94240b7-4492-43f8-8913-cd7ff6ea2892"/>
<column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
<column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- <column name="OBJECT1_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
- <column name="OBJECT2_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT1_ROWID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
+ <column name="OBJECT2_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
index affcc88eb56887d1ebf2b23f21050b02c1363fda..4baba39a61134a4829273810fa5e5775a3b7c334 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/activitylink.xml
@@ -14,7 +14,7 @@
<column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
<column name="ACTIVITY_ID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -30,7 +30,7 @@
<column name="ACTIVITYLINKID" value="05ccef04-86cd-4b29-96b7-e106c015a82f"/>
<column name="ACTIVITY_ID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:57:11"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -38,7 +38,7 @@
<column name="ACTIVITYLINKID" value="0aaad19f-daa1-44d3-b7df-cba2a88b2745"/>
<column name="ACTIVITY_ID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:56:54"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -78,7 +78,7 @@
<column name="ACTIVITYLINKID" value="10aa8b38-509c-4385-bfe0-775ab92571a8"/>
<column name="ACTIVITY_ID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:45:07"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -86,7 +86,7 @@
<column name="ACTIVITYLINKID" value="10b9499b-2f14-4251-8001-ac9e838c59a8"/>
<column name="ACTIVITY_ID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:55:56"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -134,7 +134,7 @@
<column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
<column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -150,7 +150,7 @@
<column name="ACTIVITYLINKID" value="26b0f97e-30fc-4808-85a1-5d95cd5f6b34"/>
<column name="ACTIVITY_ID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:56:37"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -158,7 +158,7 @@
<column name="ACTIVITYLINKID" value="26f94d20-7f3a-4b3e-9655-fcf3e971ce1d"/>
<column name="ACTIVITY_ID" value="d3e2acf7-ee1c-4b17-9cb6-e8e720d0cc0b"/>
<column name="DATE_NEW" valueDate="2019-11-15T08:46:21"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -174,7 +174,7 @@
<column name="ACTIVITYLINKID" value="2de91976-7c5e-4676-87e6-1869381235b0"/>
<column name="ACTIVITY_ID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:51:56"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -182,7 +182,7 @@
<column name="ACTIVITYLINKID" value="2e4494d3-0160-4e9a-a78a-54884dd465f7"/>
<column name="ACTIVITY_ID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
<column name="DATE_NEW" valueDate="2019-06-11T02:41:00"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -208,7 +208,7 @@
<column name="ACTIVITYLINKID" value="3385ac40-6f0e-45eb-bb71-ca3027325133"/>
<column name="ACTIVITY_ID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:56:49"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -256,7 +256,7 @@
<column name="ACTIVITYLINKID" value="4247ff5e-db95-4114-a1e6-21bbea86098e"/>
<column name="ACTIVITY_ID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:14:49"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -264,7 +264,7 @@
<column name="ACTIVITYLINKID" value="44ae4bcc-ccec-493c-a0db-32b136c450bc"/>
<column name="ACTIVITY_ID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:07:31"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -280,7 +280,7 @@
<column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
<column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -312,7 +312,7 @@
<column name="ACTIVITYLINKID" value="4c526e91-a6b1-4d53-8ecc-a79418c81941"/>
<column name="ACTIVITY_ID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:03:18"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -392,7 +392,7 @@
<column name="ACTIVITYLINKID" value="565f3c19-3a81-4af6-b2ae-5b4fdccb87eb"/>
<column name="ACTIVITY_ID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:30:34"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -416,7 +416,7 @@
<column name="ACTIVITYLINKID" value="5a4672ac-99ff-4a2e-a4ca-aad217bef144"/>
<column name="ACTIVITY_ID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:22:44"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -424,7 +424,7 @@
<column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
<column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -432,7 +432,7 @@
<column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
<column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -448,7 +448,7 @@
<column name="ACTIVITYLINKID" value="60c58962-9b76-4d22-855d-b0cf9ef388dc"/>
<column name="ACTIVITY_ID" value="b8067a42-d059-4d86-88b0-485a194faa36"/>
<column name="DATE_NEW" valueDate="2019-11-15T11:05:25"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -496,7 +496,7 @@
<column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
<column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -536,7 +536,7 @@
<column name="ACTIVITYLINKID" value="75b42e7c-4748-41ca-9a23-3436b55cadf6"/>
<column name="ACTIVITY_ID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:00:40"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -544,7 +544,7 @@
<column name="ACTIVITYLINKID" value="769721cc-a526-4e61-989f-71296085e7df"/>
<column name="ACTIVITY_ID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:14:26"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -552,7 +552,7 @@
<column name="ACTIVITYLINKID" value="777ed544-bcb2-43b2-914f-31bfa684e5c3"/>
<column name="ACTIVITY_ID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:11:53"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -568,7 +568,7 @@
<column name="ACTIVITYLINKID" value="7a4b1e70-1773-4529-8506-3243c9349ebc"/>
<column name="ACTIVITY_ID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:54:52"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -576,7 +576,7 @@
<column name="ACTIVITYLINKID" value="7f9cbd45-7ff0-4d7d-9412-58db6245f400"/>
<column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:48:02"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -584,7 +584,7 @@
<column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
<column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -616,7 +616,7 @@
<column name="ACTIVITYLINKID" value="869c8987-7239-4f61-a0dc-b2f9e83ab2db"/>
<column name="ACTIVITY_ID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:47:38"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -640,7 +640,7 @@
<column name="ACTIVITYLINKID" value="8d136835-b822-49a2-a516-87d4af34e8e1"/>
<column name="ACTIVITY_ID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:58:03"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -648,7 +648,7 @@
<column name="ACTIVITYLINKID" value="8d2ff9ea-5416-47ac-839f-3f7c7b517129"/>
<column name="ACTIVITY_ID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:42:09"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -656,7 +656,7 @@
<column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
<column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -672,7 +672,7 @@
<column name="ACTIVITYLINKID" value="918ec650-9e5a-430b-b6a7-d0f5e9780935"/>
<column name="ACTIVITY_ID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:19:41"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -680,7 +680,7 @@
<column name="ACTIVITYLINKID" value="93c76b23-fc2c-4544-9e18-2422b2721860"/>
<column name="ACTIVITY_ID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:16:16"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -696,7 +696,7 @@
<column name="ACTIVITYLINKID" value="94ed9437-9050-4358-975b-c07988c36117"/>
<column name="ACTIVITY_ID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:50:27"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -704,7 +704,7 @@
<column name="ACTIVITYLINKID" value="9715d82b-5239-46c3-a651-fdc7ca4c1d0e"/>
<column name="ACTIVITY_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:51:50"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -736,7 +736,7 @@
<column name="ACTIVITYLINKID" value="9f20ee40-22b8-440a-93e3-749bc6d6e273"/>
<column name="ACTIVITY_ID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:54:23"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -744,7 +744,7 @@
<column name="ACTIVITYLINKID" value="9f2616fb-7d78-44f6-9f5e-94ef5268dad4"/>
<column name="ACTIVITY_ID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:57:56"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -776,7 +776,7 @@
<column name="ACTIVITYLINKID" value="a631ea8d-c09a-4bff-83ab-4573df6dbe4f"/>
<column name="ACTIVITY_ID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:52:12"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -792,7 +792,7 @@
<column name="ACTIVITYLINKID" value="aa944406-61f4-4044-9f69-51a42b270113"/>
<column name="ACTIVITY_ID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:46:52"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -816,7 +816,7 @@
<column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
<column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -856,7 +856,7 @@
<column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -872,7 +872,7 @@
<column name="ACTIVITYLINKID" value="bc86224f-8266-4c8a-950b-b8cb9e1a5569"/>
<column name="ACTIVITY_ID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:58:08"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -912,7 +912,7 @@
<column name="ACTIVITYLINKID" value="c3751fb7-ae77-402b-8716-3e3a477dc813"/>
<column name="ACTIVITY_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
<column name="DATE_NEW" valueDate="2019-05-15T04:58:50"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -928,7 +928,7 @@
<column name="ACTIVITYLINKID" value="c419929e-2b07-4cc4-9c7d-b0cf8b47b252"/>
<column name="ACTIVITY_ID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:52:55"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -944,7 +944,7 @@
<column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
<column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="OBJECT_ROWID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -960,7 +960,7 @@
<column name="ACTIVITYLINKID" value="cfb3f5f6-c148-42c9-b86c-14900e8d30c9"/>
<column name="ACTIVITY_ID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:54:10"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -976,7 +976,7 @@
<column name="ACTIVITYLINKID" value="d1cfe415-bf05-4ee0-98b6-56ba560a39b6"/>
<column name="ACTIVITY_ID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:00:39"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1040,7 +1040,7 @@
<column name="ACTIVITYLINKID" value="da68ccb2-09c8-4a63-9dc3-16bec0777ad6"/>
<column name="ACTIVITY_ID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:53:44"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1088,7 +1088,7 @@
<column name="ACTIVITYLINKID" value="e090084f-d2e4-42e5-b524-7e79dafcb78e"/>
<column name="ACTIVITY_ID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:49:00"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="OBJECT_ROWID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1128,7 +1128,7 @@
<column name="ACTIVITYLINKID" value="e80cdefe-ff46-49f9-84ce-393882730337"/>
<column name="ACTIVITY_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
<column name="DATE_NEW" valueDate="2019-06-11T02:30:33"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1136,7 +1136,7 @@
<column name="ACTIVITYLINKID" value="ef66f553-93f4-4df5-a97c-d7a93b57ae6a"/>
<column name="ACTIVITY_ID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:00:17"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1144,7 +1144,7 @@
<column name="ACTIVITYLINKID" value="f1b02cad-2a68-45fb-9313-1983b83bb310"/>
<column name="ACTIVITY_ID" value="e265a424-b343-4bc1-b1cd-d40b9405ca12"/>
<column name="DATE_NEW" valueDate="2019-11-13T11:06:51"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1152,7 +1152,7 @@
<column name="ACTIVITYLINKID" value="f20857e3-3191-4fdf-b803-9ffd1a0668d7"/>
<column name="ACTIVITY_ID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:43:15"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1168,7 +1168,7 @@
<column name="ACTIVITYLINKID" value="f37c2f14-27ce-4782-a7d4-c9f6d6fbcecd"/>
<column name="ACTIVITY_ID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:28:27"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1176,7 +1176,7 @@
<column name="ACTIVITYLINKID" value="f43ce26b-e728-41cd-9a93-745718b98972"/>
<column name="ACTIVITY_ID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:49:12"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1200,7 +1200,7 @@
<column name="ACTIVITYLINKID" value="f91f6e28-01f1-4b45-98f5-b0fb42ac3c38"/>
<column name="ACTIVITY_ID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:17:16"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="OBJECT_ROWID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1224,7 +1224,7 @@
<column name="ACTIVITYLINKID" value="fb08245a-d14b-4a41-bfb3-973aa560d079"/>
<column name="ACTIVITY_ID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:57:37"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1232,7 +1232,7 @@
<column name="ACTIVITYLINKID" value="fbd5ad75-92ac-48e2-ae11-d2f6e135123e"/>
<column name="ACTIVITY_ID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:07:02"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -1240,7 +1240,7 @@
<column name="ACTIVITYLINKID" value="fedb7c1b-0a41-4dba-8abb-2e4af7b4ee2d"/>
<column name="ACTIVITY_ID" value="9c22ba51-8a09-40f1-b6b8-9787fe43b141"/>
<column name="DATE_NEW" valueDate="2019-11-15T08:57:12"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
index 3df6fdd7675a56f77686c6e082445fa95142c0ea..55d609e113cfa43d2c4d013d5758a8e1f4cdd644 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/campaignparticipantlog.xml
@@ -14,7 +14,7 @@
<insert tableName="campaignparticipantlog">
<column name="CAMPAIGNPARTICIPANTLOGID" value="732cb81a-5971-488c-82ea-cf0f3c7c9587"/>
<column name="CAMPAIGNPARTICIPANT_ID" value="996b8af6-13f4-4606-a303-69f941cf6f13"/>
- <column name="CAMPAIGNSTEP_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="CAMPAIGNSTEP_ID" value="0168b2eb-048e-4308-9c3c-f7ad9dcc9647"/>
<column name="CAMPAIGN_ID" value="161e57aa-3ea6-46bc-a3eb-5a577b858c20"/>
<column name="DATE_NEW" valueDate="2019-11-15T10:45:26"/>
<column name="USER_NEW" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
index 0965fb8004c3544a45d40a3cb727eaf902b2191e..0646343dd382759bef111b0464dbfb7e0b393c35 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/contact.xml
@@ -16,7 +16,7 @@
<column name="CONTACTID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="ORGANISATION_ID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -25,7 +25,7 @@
<column name="CONTACTID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:43:42"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -37,7 +37,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:39:57"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -47,7 +47,7 @@
<column name="CONTACTID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -57,7 +57,7 @@
<column name="CONTACTID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:42:37"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -67,7 +67,7 @@
<column name="CONTACTID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
<column name="ISOLANGUAGE" value="eng"/>
- <column name="ORGANISATION_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="ORGANISATION_ID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -78,7 +78,7 @@
<column name="DATE_NEW" valueDate="2019-05-16T01:25:07"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -88,7 +88,7 @@
<column name="CONTACTID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="ORGANISATION_ID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -99,7 +99,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:03:16"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -109,7 +109,7 @@
<column name="CONTACTID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="ISOLANGUAGE" value="eng"/>
- <column name="ORGANISATION_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="ORGANISATION_ID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -120,7 +120,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T05:08:54"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -132,7 +132,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:41:40"/>
<column name="DEPARTMENT" value="Marketing"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -142,7 +142,7 @@
<column name="CONTACTID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -152,7 +152,7 @@
<column name="CONTACTID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="ORGANISATION_ID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -162,7 +162,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:02:26"/>
<column name="DEPARTMENT" value="Management"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -174,7 +174,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T03:54:25"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -184,7 +184,7 @@
<column name="CONTACTID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATION_ID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -213,7 +213,7 @@
<column name="CONTACTID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="ORGANISATION_ID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -224,7 +224,7 @@
<column name="DATE_NEW" valueDate="2019-11-25T01:52:05"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -236,7 +236,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:04:06"/>
<column name="DEPARTMENT" value="IT"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -246,7 +246,7 @@
<column name="CONTACTID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATION_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -255,7 +255,7 @@
<column name="CONTACTID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="ORGANISATION_ID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -264,7 +264,7 @@
<column name="CONTACTID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -274,7 +274,7 @@
<column name="CONTACTID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="ORGANISATION_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -285,7 +285,7 @@
<column name="DATE_NEW" valueDate="2019-05-16T01:23:15"/>
<column name="DEPARTMENT" value="Produktion"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -295,7 +295,7 @@
<column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -304,7 +304,7 @@
<column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -314,7 +314,7 @@
<column name="CONTACTID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="ORGANISATION_ID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -323,7 +323,7 @@
<column name="CONTACTID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -335,7 +335,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T05:11:10"/>
<column name="DEPARTMENT" value="IT"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -346,7 +346,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:06:15"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -356,7 +356,7 @@
<column name="CONTACTID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -368,7 +368,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:04:51"/>
<column name="DEPARTMENT" value="Vertrieb"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -378,7 +378,7 @@
<column name="CONTACTID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -387,7 +387,7 @@
<column name="CONTACTID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="ORGANISATION_ID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -396,7 +396,7 @@
<column name="CONTACTID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="ORGANISATION_ID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -405,7 +405,7 @@
<column name="CONTACTID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="ORGANISATION_ID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -414,7 +414,7 @@
<column name="CONTACTID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="ORGANISATION_ID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -423,7 +423,7 @@
<column name="CONTACTID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -433,7 +433,7 @@
<column name="CONTACTID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -445,7 +445,7 @@
<column name="DATE_NEW" valueDate="2019-11-26T08:27:11"/>
<column name="DEPARTMENT" value="Produktion"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
@@ -455,7 +455,7 @@
<column name="CONTACTID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="ISOLANGUAGE" value="eng"/>
- <column name="ORGANISATION_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="ORGANISATION_ID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -464,7 +464,7 @@
<column name="CONTACTID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -473,7 +473,7 @@
<column name="CONTACTID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="ISOLANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="ORGANISATION_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
index a025550ab5edd40b5d2edb0666f0a2a63248a554..3833595792a7081d91668f501d94935763a0814f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/dsgvoinfo.xml
@@ -4,7 +4,7 @@
<delete tableName="dsgvoinfo"/>
<insert tableName="dsgvoinfo">
<column name="CONTACT_ID" value="b3906c2d-7b2e-4f64-8c97-ae92e39f96b6"/>
- <column name="DATASOURCE" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="DATASOURCE" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="DSGVOINFOID" value="6b117aad-02f4-4746-985a-de931059b72e"/>
<column name="TRANSMISSION" value="DSGVONONE"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
index ef15452df78b7a61fe5b096a1ea87f7c1cbf17ed..631d6e9831c2fafe38303b9dc3bf00db1a669569 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/organisation.xml
@@ -14,7 +14,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:17:51"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
<column name="NAME" value="Bucher Unternehmensgruppe"/>
- <column name="ORGANISATIONID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
+ <column name="ORGANISATIONID" value="97b66b3c-a9f5-4dc4-902e-850d69973d1d"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -25,7 +25,7 @@
<column name="INFO" value="Automobilvermietung"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Sevent SE"/>
- <column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
+ <column name="ORGANISATIONID" value="8f4f43e0-669b-4e1f-b050-42193f8d2998"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -35,7 +35,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="KIND" value="ORGMANUF"/>
<column name="NAME" value="Netro AG"/>
- <column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
+ <column name="ORGANISATIONID" value="bd92680c-fb4b-4f9b-b434-da4fcee5b079"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -45,7 +45,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="KIND" value="ORGMANUF"/>
<column name="NAME" value="Aquire GmbH"/>
- <column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
+ <column name="ORGANISATIONID" value="756662b5-f5e4-479c-8d97-abd6a395bd79"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -54,7 +54,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:28:03"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
<column name="NAME" value="Waken Neuser SE"/>
- <column name="ORGANISATIONID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
+ <column name="ORGANISATIONID" value="b043cd42-058c-48bd-8326-4c92e0e74c48"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -65,7 +65,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="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Transatlantik Logistics GmbH"/>
- <column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="ORGANISATIONID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -75,7 +75,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="KIND" value="ORGPARTNER"/>
<column name="NAME" value="Schild AG"/>
- <column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
+ <column name="ORGANISATIONID" value="aed65442-06aa-4cdc-b924-1d9728b444d3"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -85,7 +85,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Firmengruppe Matthias Bogen"/>
- <column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATIONID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -95,7 +95,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="SuperBauer AG"/>
- <column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
+ <column name="ORGANISATIONID" value="a5d107ac-f796-430e-a686-5a132f96650b"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -104,7 +104,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:21:07"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
<column name="NAME" value="Kronen AG"/>
- <column name="ORGANISATIONID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="ORGANISATIONID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -114,7 +114,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="meine Firma"/>
- <column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATIONID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -124,7 +124,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="JPM Touristik GmbH"/>
- <column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
+ <column name="ORGANISATIONID" value="22f1ca45-e633-4080-9d5c-9a8c2e06d3f9"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -135,7 +135,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="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Industrial Steel AG"/>
- <column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATIONID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -145,7 +145,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Grobbe-Werk GmbH"/>
- <column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
+ <column name="ORGANISATIONID" value="09281be8-8cb5-4201-9758-8c86b3d2bb85"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -154,7 +154,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:24:53"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="MNF Versicherung"/>
- <column name="ORGANISATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
+ <column name="ORGANISATIONID" value="d3707591-5620-49a8-a63f-19e88ca7a21c"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -163,7 +163,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:21:44"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="Lichtenstein Document Solutions GmbH "/>
- <column name="ORGANISATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
+ <column name="ORGANISATIONID" value="03e09527-21cc-489a-b37f-0dd7df553c20"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -172,7 +172,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:20:08"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="International Kältetechnik AG "/>
- <column name="ORGANISATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
+ <column name="ORGANISATIONID" value="ea07af40-4918-4ea2-94ad-031d01aeaab4"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -182,7 +182,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Glob Group"/>
- <column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
+ <column name="ORGANISATIONID" value="692e1f81-9f05-4e22-b74d-56d34c671067"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -193,7 +193,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="KIND" value="ORGCUTOMER"/>
<column name="NAME" value="Skyscraper Bau GmbH"/>
- <column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATIONID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -202,7 +202,7 @@
<column name="DATE_EDIT" valueDate="2019-11-26T06:25:36"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="Pichelmaier Financial AG "/>
- <column name="ORGANISATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="ORGANISATIONID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
index 9b2fdd69c1ace8740fa0d86c8da091fd180e3a85..d63eb70db4ecdaf189b79da48b621c0906dc7b35 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/tasklink.xml
@@ -9,7 +9,7 @@
<column name="TASK_ID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="44c1f582-7681-4f6f-b592-6221ebbdee52"/>
<column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
@@ -21,7 +21,7 @@
<column name="TASK_ID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
+ <column name="OBJECT_ROWID" value="6a92df58-2b98-40da-ba6a-d0ddb1fde234"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="6c2f84af-ff2e-4b70-b4d0-607a2bd0d941"/>
<column name="TASK_ID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
@@ -33,13 +33,13 @@
<column name="TASK_ID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="b618fb87-d39d-41d8-be41-2b03bce29538"/>
<column name="TASK_ID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
</insert>
<insert tableName="tasklink">
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="OBJECT_ROWID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="TASKLINKID" value="eca5c8cb-bd10-4425-b4bc-a2e50f2518b9"/>
<column name="TASK_ID" value="46164eac-62d1-4dbb-a252-93ac49429855"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
index 76b2a507a6cc1d7a3a10c71d177fcffa55ad4d8d..88789b1a243c8597ec5c325cb989656794d7d19f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/visitplan.xml
@@ -15,7 +15,7 @@
<column name="ENTRYDATE" valueDate="2020-05-18"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name ="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
@@ -25,7 +25,7 @@
<column name="ENTRYDATE" valueDate="2020-05-19"/>
<column name="BEGIN_TIME" value="14:00"/>
<column name="END_TIME" value="17:00"/>
- <column name="ORGANISATION_CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="ORGANISATION_CONTACT_ID" value="2c63e0de-f21c-474f-89d7-bff8ba1dbf43"/>
<column name ="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
@@ -35,7 +35,7 @@
<column name="ENTRYDATE" valueDate="2020-05-19"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
+ <column name="ORGANISATION_CONTACT_ID" value="06006801-c6a1-4321-9fde-95f9d3f9b786"/>
<column name ="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
@@ -45,7 +45,7 @@
<column name="ENTRYDATE" valueDate="2020-05-20"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
+ <column name="ORGANISATION_CONTACT_ID" value="13e60843-5d6d-45ee-88c7-46db41874138"/>
<column name ="CONTACT_ID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="821b3424-b6d2-41f8-b0b2-6a7c2c050214"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
@@ -64,7 +64,7 @@
<column name="ENTRYDATE" valueDate="2020-05-25"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
+ <column name="ORGANISATION_CONTACT_ID" value="f7b8f0c3-7702-4466-b502-d21fa4fa0010"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
</insert>
@@ -73,7 +73,7 @@
<column name="ENTRYDATE" valueDate="2020-05-26"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
+ <column name="ORGANISATION_CONTACT_ID" value="82c7b72d-da4e-4fab-a6cc-31e1be07dd08"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
</insert>
@@ -82,7 +82,7 @@
<column name="ENTRYDATE" valueDate="2020-05-27"/>
<column name="BEGIN_TIME" value="10:00"/>
<column name="END_TIME" value="11:00"/>
- <column name="ORGANISATION_CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
+ <column name="ORGANISATION_CONTACT_ID" value="62175b31-b432-4ec6-932f-8e69033884c6"/>
<column name="VISITPLANEMPLOYEEWEEK_ID" value="73fbf25a-5668-411f-9ef5-42603d163a77"/>
<column name="STATUS" value="VISITSTATUSPLANNED "/>
</insert>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6e685b98b76ffee42644c33a1e7fe269291ca42a..b42801cfda3ebf6e3df2109928f50c17d0e41a50 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1143,6 +1143,34 @@
<title>Creation user</title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>LON</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="3" />
+ <size v="11" />
+ <scale v="8" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LAT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="3" />
+ <size v="10" />
+ <scale v="8" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index 0b6f95c995e62e440e543f9a9839fd760bf4a6c3..659f2cb64d1ab3828820aa979ef3a5b5518650ac 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -469,6 +469,18 @@
<name>ReplaceStandardAddress_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>LAT</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/lat/documentation.adoc</documentation>
+ <title>Latitude</title>
+ <contentType>NUMBER</contentType>
+ </entityField>
+ <entityField>
+ <name>LON</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/lon/documentation.adoc</documentation>
+ <title>Longitude</title>
+ <contentType>NUMBER</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -577,6 +589,14 @@
<name>COUNTRY.displayValue</name>
<expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/country.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LAT.value</name>
+ <recordfield>ADDRESS.LAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LON.value</name>
+ <recordfield>ADDRESS.LON</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Address_entity/documentation.adoc b/entity/Address_entity/documentation.adoc
index e50f759d6ac0cc4e9633c6e52571914239f2fc68..af4ee8b4a1306ddc2b05ef8e27fd1f5958a1df35 100644
--- a/entity/Address_entity/documentation.adoc
+++ b/entity/Address_entity/documentation.adoc
@@ -7,6 +7,7 @@ an entity for logic behind a postal address
The entity manages storing postal addresses and provides features like validation.
Every `CONTACT` has one standard address value that is used by default for some actions. Keep in mind that this standard address has a special status and therefore may cannot be deleted.
+The geographical location of an address can be stored in the fields 'LAT' (latitude) and 'LON' (longitude).
Webservice Validation: See WsValidation_lib
To enable the nominatim webservice: go to Preferences -> _____PREFERENCES_PROJECT -> _____PREFERENCES_PROJECT
diff --git a/entity/Address_entity/entityfields/lat/documentation.adoc b/entity/Address_entity/entityfields/lat/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..848d26373626ba9a82ea8b80b74ec676bcb21c09
--- /dev/null
+++ b/entity/Address_entity/entityfields/lat/documentation.adoc
@@ -0,0 +1,5 @@
+= Latitude
+
+The field "LAT" is used to store the geolocation latitude of the address.
+
+Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/lon/documentation.adoc b/entity/Address_entity/entityfields/lon/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..47eed872dbeaa2bfb811df52e01615d28e866a49
--- /dev/null
+++ b/entity/Address_entity/entityfields/lon/documentation.adoc
@@ -0,0 +1,5 @@
+= Longitude
+
+The field "LON" is used to store the geolocation longitude of the address.
+
+Currently, the field is not filled with data, this will be implemented in the future.
\ No newline at end of file
diff --git a/entity/Contract_entity/recordcontainers/index/query.js b/entity/Contract_entity/recordcontainers/index/query.js
index 0b7612604a0518ed4437906473ea5f0caf38e248..e12356c93b0c2cefab1f3d847d91dfa563ffbbbe 100644
--- a/entity/Contract_entity/recordcontainers/index/query.js
+++ b/entity/Contract_entity/recordcontainers/index/query.js
@@ -8,20 +8,21 @@ import("Sql_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTRACTID " //as "_uid_"
- + ", " + sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | ") //as "_title_"
- + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
- KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]) //as "_description_"
- + ", CONTRACTCODE "
- + ", CONTACT.ORGANISATION_ID" //as CONTACT_ORG_ID
- + ", ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue"
- + ", CONTRACT.CONTACT_ID")
- .from("CONTRACT")
- .join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
- .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+var querySelect = newSelect([
+ "CONTRACTID", //#UID
+ sqlHelper.concat(["CONTRACTCODE", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractStatus(), "CONTRACTSTATUS")], " | "), //#TITLE
+ sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Type of contract") + ":'",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.contractType(), "CONTRACTTYPE")]), //#DESCRIPTION
+ "CONTRACTCODE",
+ "CONTACT.ORGANISATION_ID", //CONTACT_ORG_ID
+ "ORGANISATION.NAME", //CONTACT_ORG_ID.displayValue
+ "CONTRACT.CONTACT_ID"
+ ])
+ .from("CONTRACT")
+ .join("CONTACT", "CONTRACT.CONTACT_ID = CONTACTID")
+ .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID");
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) {
- querySelect.where("CONTRACT.CONTRACTID", vars.get("$local.idvalue"), SqlBuilder.IN())
-}
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("CONTRACT.CONTRACTID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/index/query.js b/entity/Offer_entity/recordcontainers/index/query.js
index 6026dd62b0e7e82195b1597e9907f011545ce07f..32864cdd4aa7c56b613c6d4d984718c1d2e897b5 100644
--- a/entity/Offer_entity/recordcontainers/index/query.js
+++ b/entity/Offer_entity/recordcontainers/index/query.js
@@ -2,28 +2,26 @@ import("system.SQLTYPES");
import("system.translate");
import("system.result");
import("system.vars");
-import("system.calendars");
-import("system.db");
import("Keyword_lib");
import("Sql_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("OFFER.OFFERID " // as "_uid_",
- + ", " + sqlHelper.concat([sqlHelper.cast("OFFER.OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | ") //as "_title_"
- + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]) // as "_description_"
- + ", OFFER.OFFERCODE"
- + ", OFFER.CONTACT_ID "
- + ", CONTACT.ORGANISATION_ID " // as CONTACT_ORG_ID
- + ", ORGANISATION.NAME") // as "CONTACT_ORG_ID.displayValue"
- .from("OFFER")
- .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID")
- .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
- .orderBy("OFFER.OFFERCODE");
+var querySelect = newSelect([
+ "OFFER.OFFERID", //#UID
+ sqlHelper.concat([sqlHelper.cast("OFFER.OFFERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.offerStatus(), "OFFER.STATUS")], " | "), //#TITLE
+ sqlHelper.concat(["ORGANISATION.NAME", "'| " + translate.text("Description") + ":'", sqlHelper.castLob("OFFER.INFO", 250)]), //#DESCRIPTION
+ "OFFER.OFFERCODE",
+ "OFFER.CONTACT_ID",
+ "CONTACT.ORGANISATION_ID", //CONTACT_ORG_ID
+ "ORGANISATION.NAME" //CONTACT_ORG_ID.displayValue
+ ])
+ .from("OFFER")
+ .join("CONTACT", "OFFER.CONTACT_ID = CONTACTID")
+ .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .orderBy("OFFER.OFFERCODE");
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0)
-{
- querySelect.where("OFFER.OFFERID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("OFFER.OFFERID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js b/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
index 0d0a95eccca8e1e727a25fe04a1099d583af6471..2829b047ba35ddd7cc76bfe3e1b04677ae6420b2 100644
--- a/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/objects/children/contactid_param/valueProcess.js
@@ -1,14 +1,6 @@
-import("system.db");
import("system.result");
import("system.vars");
import("Contact_lib");
if (vars.get("$field.CONTACT_ID"))
-{
- var ids = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
- if (ids.length >= 3 && ids[2]){
- result.string(db.cell("select CONTACTID from CONTACT"
-+ " join ORGANISATION on ORGANISATIONID = ORGANISATION_ID"
-+ " where ORGANISATION_ID = '" + ids[2] + "'"
-+ " and PERSON_ID is null"))}
-}
\ No newline at end of file
+ result.string(ContactUtils.getOrganisationContactId(vars.get("field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
index 28676a75cab4da50168d2e44d2142abf7d8044e2..1da341d92cdf7c2b4a618197df76a8d6a6b1dc67 100644
--- a/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
@@ -1,8 +1,8 @@
-import("system.logging");
-import("system.vars");
-import("system.db");
+import("Sql_lib");
import("system.result");
-var salesorderid = vars.get("$field.SALESORDERID")
-if(salesorderid)
-result.string(db.cell("select ISOLANGUAGE from SALESORDER where SALESORDERID = '" + salesorderid + "'"))
\ No newline at end of file
+var language = newSelect("ISOLANGUAGE")
+ .from("SALESORDER")
+ .whereIfSet("SALESORDER.SALESORDERID", "$field.SALESORDERID")
+ .cell(true);
+result.string(language);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/index/query.js b/entity/Order_entity/recordcontainers/index/query.js
index f0f600b464a18cfbe610b23dbd3889337d28dc15..e8aa2e80361037d578289ebf58e7c20672d08731 100644
--- a/entity/Order_entity/recordcontainers/index/query.js
+++ b/entity/Order_entity/recordcontainers/index/query.js
@@ -1,28 +1,26 @@
import("system.SQLTYPES");
import("system.result");
import("system.vars");
-import("system.calendars");
-import("system.db");
import("Sql_lib");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("SALESORDERID " // as "_uid_"
- + ", " + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | ") // as "_title_"
- + ", " + sqlHelper.concat(["ORGANISATION.NAME"], " | ") // as "_description_"
- + ", SALESORDERCODE"
- + ", SALESORDER.CONTACT_ID"
- + ", CONTACT.ORGANISATION_ID " //as CONTACT_ORG_ID
- + ", ORGANISATION.NAME ") //as "CONTACT_ORG_ID.displayValue"
- .from("SALESORDER")
- .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID")
- .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
- .orderBy("SALESORDERCODE");
+var querySelect = newSelect([
+ "SALESORDERID", //#UID
+ sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10)], " | "), //#TITLE
+ sqlHelper.concat(["ORGANISATION.NAME"], " | "), //#DESCRIPTION
+ "SALESORDERCODE",
+ "SALESORDER.CONTACT_ID",
+ "CONTACT.ORGANISATION_ID", //as CONTACT_ORG_ID
+ "ORGANISATION.NAME" //as "CONTACT_ORG_ID.displayValue"
+ ])
+ .from("SALESORDER")
+ .join("CONTACT", "SALESORDER.CONTACT_ID = CONTACTID")
+ .join("ORGANISATION", "ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .orderBy("SALESORDERCODE");
-if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0)
-{
- querySelect.where("SALESORDER.SALESORDERID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("SALESORDER.SALESORDERID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index cbd7cb44ef5d77d0e3656bfe5867f3c3f68ce8f8..75a3286746e7c7dde4b390f59fc46d30a3c47fbc 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1353,6 +1353,16 @@
</affectedTables>
<affectedIds>%aditoprj%/entity/Organisation_entity/recordcontainers/index/affectedIds.js</affectedIds>
<indexFieldMappings>
+ <indexRecordFieldMapping>
+ <name>#LOCATION</name>
+ <indexFieldType>LOCATION</indexFieldType>
+ <additionalFieldNameAliases>
+ <element>location</element>
+ </additionalFieldNameAliases>
+ <isGlobalSearchField v="false" />
+ <isFilterable v="false" />
+ <isLookupFilter v="false" />
+ </indexRecordFieldMapping>
<indexRecordFieldMapping>
<name>NAME.value</name>
<indexFieldType>PROPER_NAME</indexFieldType>
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index eeb55badd15ac127cc5f9a7c8ea8b64d3d374a65..79b1326651647972db577e2b8919dc629c9c8187 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -5,6 +5,7 @@ import("system.calendars");
import("system.db");
import("Sql_lib");
import("Communication_lib");
+import("system.SQLTYPES");
/*
Before changing the results that are returned here:
@@ -12,40 +13,39 @@ Please keep in mind that some of the indexfields are used in other modules (like
You may want to check out if your change affects other modules. However adding more fields should not be a problem therefor.
*/
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
- + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
-sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTACT.CONTACTID "
- + ", " + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
- + ", " + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
- ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
- ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
- ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
- ], " | ")
- //additional indexed fields
- + ", ORGANISATION.NAME"
- + ", ORGANISATION.ORGANISATIONID"
- + ", CONTACT.CONTACTID"
- + ", ORGANISATION.CUSTOMERCODE"
- + ", ADDRESS.ADDRESS "
- + ", ADDRESS.COUNTRY "
- + ", ADDRESS.ZIP "
- + ", ADDRESS.CITY "
- + ", COMMUNICATION.ADDR "
- + ", PHONE.ADDR "
- )
- .from("ORGANISATION")
- .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
- .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
- .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE")//TODO: refactor to new SqlBuilder
+var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
+var sqlHelper = new SqlMaskingUtils();
+var querySelect = newSelect([
+ "CONTACT.CONTACTID",
+ sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"]),
+ sqlHelper.concat([
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
+ ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
+ sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
+ sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+ ], " | "),
+ sqlHelper.concat([sqlHelper.cast("defaultAddress.LAT", SQLTYPES.VARCHAR, 16), sqlHelper.cast("defaultAddress.LON", SQLTYPES.VARCHAR, 16)], ","),
+ //additional indexed fields
+ "ORGANISATION.NAME",
+ "ORGANISATION.ORGANISATIONID",
+ "CONTACT.CONTACTID",
+ "ORGANISATION.CUSTOMERCODE",
+ "ADDRESS.ADDRESS",
+ "ADDRESS.COUNTRY",
+ "ADDRESS.ZIP",
+ "ADDRESS.CITY",
+ "COMMUNICATION.ADDR",
+ "PHONE.ADDR"
+ ])
+ .from("ORGANISATION")
+ .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
+ .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+ .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
+ .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone");
if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0)
-{
- querySelect.where("CONTACT.CONTACTID", vars.get("$local.idvalue"), SqlBuilder.IN());
-}
+ querySelect.where("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect.toString());
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index c1983f7ee8be7bdf52619e4c14cb9cfd6f7826b3..a21cc7b2e3bcfef7d726807ac05d781af660b92d 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -13,46 +13,43 @@ You may want to check out if your change affects other modules. However adding m
*/
var sqlQuery, sqlHelper, queryCondition, affectedIds;
-var CommMediumPhoneIds = db.array( db.COLUMN, "select KEYID from AB_KEYWORD_ENTRY join ab_keyword_attributerelation on AB_KEYWORD_ENTRYID = AB_KEYWORD_ENTRY_ID "
- + " join ab_keyword_attribute on AB_KEYWORD_ATTRIBUTEID = AB_KEYWORD_ATTRIBUTE_ID and CHAR_VALUE = 'TELEPHONE' and AB_KEYWORD_ATTRIBUTE.CONTAINER = 'CommunicationMedium'");
+var commMediumPhoneIds = CommUtil.getMediumIdsByCategory("PHONE");
sqlHelper = new SqlMaskingUtils();
-var querySelect = newSelect("CONTACT.CONTACTID "
- + "," + sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"])
- + "," + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'"
- ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
- ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
- ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
- ], " | ")
- //additional indexed fields
- + ", CONTACT.CONTACTID "
- + ", PERSON.PERSONID "
- + ", PERSON.FIRSTNAME "
- + ", PERSON.LASTNAME "
- + ", TRIM(PERSON.GENDER) "
- + ", CONTACT.ORGANISATION_ID "
- + ", ORGANISATION.NAME "
- + ", ADDRESS.ADDRESS "
- + ", ADDRESS.COUNTRY "
- + ", ADDRESS.ZIP "
- + ", ADDRESS.CITY "
- + ", COMMUNICATION.ADDR "
- + ", PHONE.ADDR "
- )
- .from("PERSON")
- .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
- .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
- .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
- .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
- .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE") //TODO: refactor to new SqlBuilder
- .orderBy("CONTACT.CONTACTID");
-
-if (vars.exists("$local.idvalue"))
-{
- affectedIds = vars.get("$local.idvalue");
- querySelect.whereIfSet("CONTACT.CONTACTID", affectedIds, SqlBuilder.IN());
-}
+var querySelect = newSelect([
+ "CONTACT.CONTACTID", //#UID
+ sqlHelper.concat(["PERSON.SALUTATION", "PERSON.FIRSTNAME", "PERSON.LASTNAME", "'|'", "ORGANISATION.NAME"]), //#TITLE
+ sqlHelper.concat([
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO", "'-'",
+ "defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"]),
+ sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"]),
+ sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
+ ], " | "), //#DESCRIPTION
+ //additional indexed fields
+ "CONTACT.CONTACTID",
+ "PERSON.PERSONID",
+ "PERSON.FIRSTNAME",
+ "PERSON.LASTNAME",
+ sqlHelper.trim("PERSON.GENDER"),
+ "CONTACT.ORGANISATION_ID",
+ "ORGANISATION.NAME",
+ "ADDRESS.ADDRESS",
+ "ADDRESS.COUNTRY",
+ "ADDRESS.ZIP",
+ "ADDRESS.CITY",
+ "COMMUNICATION.ADDR",
+ "PHONE.ADDR"
+ ])
+ .from("PERSON")
+ .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
+ .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+ .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
+ .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("COMMUNICATION", newWhere("phone.CONTACT_ID = CONTACT.CONTACTID")
+ .and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN()), "phone")
+ .orderBy("CONTACT.CONTACTID");
+if (vars.exists("$local.idvalue"))
+ querySelect.whereIfSet("CONTACT.CONTACTID", "$local.idvalue", SqlBuilder.IN());
result.string(querySelect);
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/index/query.js b/entity/Product_entity/recordcontainers/index/query.js
index 5d811e52c4fc3435b9c17aedd36efd979eef4c0b..ad3ce1ae86df57d36ab7bcde323b417ddc646241 100644
--- a/entity/Product_entity/recordcontainers/index/query.js
+++ b/entity/Product_entity/recordcontainers/index/query.js
@@ -1,22 +1,20 @@
import("system.result");
import("system.vars");
-import("system.calendars");
-import("system.db");
import("Keyword_lib");
import("Sql_lib");
import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var sqlQuery = newSelect("PRODUCTID as \"_uid_\""
- + ", " + sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | ") // as "_title_"
- + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID") // as "_description_"
- + ", PRODUCTCODE ")
- .from("PRODUCT")
- .orderBy("PRODUCTCODE");
+var sqlQuery = newSelect([
+ "PRODUCTID", //#UID
+ sqlHelper.concat(["PRODUCTCODE", "PRODUCTNAME"], " | "), //#TITLE
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode(), "GROUPCODEID"), //#DESCRIPTION
+ "PRODUCTCODE"
+ ])
+ .from("PRODUCT")
+ .orderBy("PRODUCTCODE");
-if (vars.exists("$local.idvalue")) {
- var affectedIds = vars.get("$local.idvalue");
- sqlQuery.whereIfSet("PRODUCT.PRODUCTID", affectedIds, SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ sqlQuery.whereIfSet("PRODUCT.PRODUCTID", "$local.idvalue", SqlBuilder.IN());
result.string(sqlQuery.toString());
\ No newline at end of file
diff --git a/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js b/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
index 778e62eb9820cecef3e378e97114d53f78cea22f..3135d2cddf197831f1547b797d50ad006ee0d387 100644
--- a/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/RoleChildren_entity/recordcontainers/jdito/onDelete.js
@@ -1,7 +1,5 @@
import("Sql_lib");
-import("system.db");
-import("system.vars");
-var uid = vars.get("$field.UID");
-var alias = SqlUtils.getSystemAlias();
-db.deleteData("ASYS_ROLES_CHILDREN", "ID = '" + uid + "'", alias)
\ No newline at end of file
+new SqlBuilder(SqlUtils.getSystemAlias())
+ .where("ASYS_ROLES_CHILDREN.ID", "$field.UID")
+ .deleteData();
\ No newline at end of file
diff --git a/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js b/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
index ef5e24b81d4997315d826c016dfd7e5ab07725f8..a1bc13a234a647ca0ffedb456a9c0c7f70386772 100644
--- a/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/RoleChildren_entity/recordcontainers/jdito/onUpdate.js
@@ -7,10 +7,11 @@ import("system.vars");
var selectedRoleName = vars.exists("$param.RoleId_param") && vars.get("$param.RoleId_param");
var selectedRoleType = vars.exists("$param.RoleType_param") && vars.get("$param.RoleType_param");
-if (selectedRoleName && selectedRoleType == "CUSTOM") {
- var alias = SqlUtils.getSystemAlias();
+if (selectedRoleName && selectedRoleType == "CUSTOM")
+{
var childRole = vars.get("$local.rowdata")["CHILD_ROLE.value"];
- var uid = vars.get("$field.UID");
- db.updateData("ASYS_ROLES_CHILDREN", ["CHILD_ROLE"], null, [childRole], "ID = '" + uid + "'", alias);
+ new SqlBuilder(SqlUtils.getSystemAlias())
+ .where("ASYS_ROLES_CHILDREN.ID", "$field.UID")
+ .updateFields({"CHILD_ROLE" : childRole});
}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/index/query.js b/entity/Salesproject_entity/recordcontainers/index/query.js
index 1b84bf3549d756af8c7672952d3a159ffaef8708..b39c8d68ffd1e7e13b652a1bac2008d5a0ed8fec 100644
--- a/entity/Salesproject_entity/recordcontainers/index/query.js
+++ b/entity/Salesproject_entity/recordcontainers/index/query.js
@@ -7,24 +7,24 @@ import("KeywordRegistry_basic");
var sqlHelper = new SqlMaskingUtils();
-var sqlQuery = newSelect("SALESPROJECTID " // as "_uid_"
- + ", PROJECTTITLE " //as "_title_"
- + ", " + sqlHelper.concat([
- "'" + translate.text("Status") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"),
- "'| " + translate.text("Phase") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
- ]) //as "_description_"
- + ", PROJECTCODE"
- + ", PROJECTTITLE"
- + ", STATUS"
- + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS") // as "STATUS.displayValue"
- + ", PHASE"
- + ", " + KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "PHASE")) // as "PHASE.displayValue")
- .from("SALESPROJECT")
- .orderBy("PROJECTCODE");
+var sqlQuery = newSelect([
+ "SALESPROJECTID", //#UID
+ "PROJECTTITLE", //#TITLE
+ sqlHelper.concat([
+ "'" + translate.text("Status") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"),
+ "'| " + translate.text("Phase") + ":'", KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectPhase(), "PHASE")
+ ]), //#DESCRIPTION
+ "PROJECTCODE",
+ "PROJECTTITLE",
+ "STATUS",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "STATUS"), //STATUS.displayValue
+ "PHASE",
+ KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesprojectState(), "PHASE") //PHASE.displayValue
+ ])
+ .from("SALESPROJECT")
+ .orderBy("PROJECTCODE");
-if (vars.exists("$local.idvalue")) {
- var affectedIds = vars.get("$local.idvalue");
- sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", affectedIds, SqlBuilder.IN());
-}
+if (vars.exists("$local.idvalue"))
+ sqlQuery.whereIfSet("SALESPROJECT.SALESPROJECTID", "$local.idvalue", SqlBuilder.IN());
result.string(sqlQuery.toString());
\ No newline at end of file
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 4ec4a7d08e7f192053d1446f0a3ed507f8bde9ae..341015c21e87d2ef978e949006f017dd5f0d9e10 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -62,7 +62,7 @@ if(idValues == false)
.from("CONTACT")
.join("ORGANISATION", "CONTACT.ORGANISATION_ID = org.ORGANISATIONID", "org")
.leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .join("ADDRESS", "ADDRESS_ID = ADDRESSID")
+ .leftJoin("ADDRESS", "ADDRESS_ID = ADDRESSID")
.join("AB_ATTRIBUTERELATION", "visitPlanFrequency.OBJECT_ROWID = CONTACT.CONTACTID", "visitPlanFrequency")
.where(["AB_ATTRIBUTERELATION", "AB_ATTRIBUTE_ID", "visitPlanFrequency"], $AttributeRegistry.visitPlanFrequency())
.table();
@@ -80,7 +80,7 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
newSelect("min(ENTRYDATE)")
.from("VISITPLANENTRY")
- .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID = VISITRECOMMENDATION.CONTACT_ID")
+ .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID", "VISITRECOMMENDATION.CONTACT_ID")
.and("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged())
.and("VISITPLANENTRY.entrydate", datetime.today(), SqlBuilder.GREATER())
@@ -88,8 +88,8 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
newSelect("VISITRECOMMENDATION.CONTACT_ID")
.from("VISITPLANEMPLOYEEWEEK, VISITPLANENTRY")
- .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEKID")
- .and("VISITRECOMMENDATION.CONTACT_ID = VISITPLANENTRY.ORGANISATION_CONTACT_ID")
+ .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID")
+ .and("VISITRECOMMENDATION.CONTACT_ID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID")
.and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
.and("VISITPLANENTRY.entrydate", newSelect("min(vp.entrydate)")
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index f3a165c300b8ac8fcdc430dd2a6e1acd2f37b1ee..72d74c91028530af1a86804e166da47c0795dfeb 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -298,7 +298,7 @@
</entry>
<entry>
<key>SEEN</key>
- <value>Ungelese</value>
+ <value>Neu</value>
</entry>
<entry>
<key>UNSEEN</key>
@@ -8595,7 +8595,6 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Seen</key>
- <value></value>
</entry>
<entry>
<key>Unseen</key>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 244e22d007fcce28e5d7df9f7a69116e77d1af2c..3805f9a7120e5a727b9aae12a093697b62eaf9b8 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -3,9 +3,9 @@
<name>OfferitemPreview_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <headerFooterLayout>
+ <boxLayout>
<name>layout</name>
- </headerFooterLayout>
+ </boxLayout>
</layout>
<children>
<genericViewTemplate>
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 30e6b6b27aac5415eadfcaa53db1fcfc88a9ad5a..25765c5842b45ae56a9f1c3488ba5f34e8a406f9 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -641,12 +641,12 @@ NumberSequencingUtils.validateUniqueNumber = function(pNumber, pColumn, pTable,
*
* @result {String} hightest number
*/
-NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition) {
- var condition = "";
- if(pCondition != undefined)
- condition += " where " + pCondition;
- var maxNum = db.cell("select max(" + pColumn + ") from " + pTable + condition);
- return maxNum == "" ? "0" : maxNum;
+NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition)
+{
+ return newSelect(new SqlMaskingUtils().max(pColumn))
+ .from(pTable)
+ .whereIfSet(pCondition)
+ .cell() || "0";
}
/**
diff --git a/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
index 4572bef869ba742cdabc5155acd3fc3ecf76fe13..354885d3893c22e85f81c745e62614f8b636523b 100644
--- a/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
+++ b/report/Offer_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
@@ -5,6 +5,8 @@ import("system.question");
import("system.vars");
import("system.db");
+//@TODO: remove
+
var details = vars.get("$global.RptOfferOrderDetails");
var orgid = db.cell("select ORGANISATION_ID from CONTACT where CONTACTID = '" + details[1] + "'");
if (orgid.substr(0, 2) == '0 ') // Privatperson
diff --git a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
index 48fc7c800cd7d466c6f45973516ee02832f837da..dad46b278aff6020f827b7cc76b00dd4dac82d27 100644
--- a/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
+++ b/report/Salesorder_report/ribbon/ribbontasks/task_report/customcomponents/button/onClick.js
@@ -5,6 +5,8 @@ import("system.swing");
import("system.vars");
import("system.db");
+//@TODO: remove
+
var details = vars.get("$global.RptOfferOrderDetails");
var orgid = db.array(db.ROW, "select ORG_ID, LANG from RELATION where RELATIONID = '" + details[1] + "'");
if (orgid[0].substr(0, 2) == '0 ') // Privatperson