diff --git a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
index ec607aa9383d71b3ad3c4d1bd8b785c16d489981..2cfda5e78c75dc24d61318c4867d381d01e4105d 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/AlterDatatypeOfKeyColumnsToChar/alter_DocumentTemplatePlaceOfUseDatatype.xml
@@ -2,11 +2,14 @@
<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 dbms="derby" author="b.ulrich" id="83c25119-cf41-42ab-b42f-370195f9de87">
+ <!--not null must be set in derby before adding a primary key constraint-->
<sql>
ALTER TABLE DOCUMENTTEMPLATE ADD COLUMN DOCUMENTTEMPLATEID_NEW CHAR(36);
UPDATE DOCUMENTTEMPLATE SET DOCUMENTTEMPLATEID_NEW=DOCUMENTTEMPLATEID;
ALTER TABLE DOCUMENTTEMPLATE DROP COLUMN DOCUMENTTEMPLATEID;
RENAME COLUMN DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID_NEW TO DOCUMENTTEMPLATEID;
+ ALTER TABLE DOCUMENTTEMPLATE ALTER COLUMN DOCUMENTTEMPLATEID NOT NULL;
+ ALTER TABLE DOCUMENTTEMPLATE ADD CONSTRAINT PK_DOCUMENTTEMPLATE_DOCUMENTTEMPLATEID PRIMARY KEY (DOCUMENTTEMPLATEID);
</sql>
</changeSet>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1c9de620455f1a0e782540d3ca7e86c1181d8dbb
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/changelog.xml
@@ -0,0 +1,6 @@
+<?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">
+ <include relativeToChangelogFile="true" file="init_NotificationType.xml"/>
+ <include relativeToChangelogFile="true" file="insert_NotificationState.xml"/>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3d8f901c79b2216826873ea4664e1f1a401652fc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/init_NotificationType.xml
@@ -0,0 +1,85 @@
+<?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.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="f862f71e-9155-4e88-8158-170ddfa4dbf3"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_PHONECALL"/>
+ <column name="TITLE" value="Phonecall"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="19876b72-cd7d-4916-b853-22c4d9fe49c2"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_EMAIL"/>
+ <column name="TITLE" value="Email"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="16f9fbb5-9b8a-4908-babd-06c86032a22b"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_APPOINTMENT"/>
+ <column name="TITLE" value="Appointment"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="53458dba-80f5-427c-a44c-3fc8e74f3380"/>
+ <column name="KEYID" value="_____SYSTEM_NOTIFICATION_TODO"/>
+ <column name="TITLE" value="ToDo"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3d2393b3-ed13-44d6-9a6f-9280d84252cb"/>
+ <column name="KEYID" value="DownloadReady"/>
+ <column name="TITLE" value="download ready"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="09ce4611-3254-4590-958a-79178924188b"/>
+ <column name="KEYID" value="BulkMailSent"/>
+ <column name="TITLE" value="bulk mail sent"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="df47c6db-2a72-464a-b155-c4e33a4294ba"/>
+ <column name="KEYID" value="Leadimport_Notification"/>
+ <column name="TITLE" value="leadimport notification"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="58281d88-71a7-4fa7-8ef8-9289fc904697"/>
+ <column name="KEYID" value="WorkflowNotification"/>
+ <column name="TITLE" value="workflow notification"/>
+ <column name="CONTAINER" value="NotificationType"/>
+ <column name="SORTING" valueNumeric="7"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
new file mode 100644
index 0000000000000000000000000000000000000000..35501bf1692b76aa533e32e47930c612f0d97ef2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/Notification/insert_NotificationState.xml
@@ -0,0 +1,15 @@
+<?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.pongratz" id="b2894de0-4a19-4fcb-9412-0a5e91bfec80">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="daa6d8d8-fdc6-4fb2-9677-9ccc1f8a9b81"/>
+ <column name="KEYID" value="TODELETE"/>
+ <column name="TITLE" value="TODELETE"/>
+ <column name="CONTAINER" value="NotificationState"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
index 88aba8706e9098e1a1b35abad171c97f0dab8e9d..1c85cb3902af93aedea0ecdcb568ade70245a5d0 100644
--- a/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.2/changelog.xml
@@ -2,7 +2,9 @@
<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">
<include file="AlterDatatypeOfKeyColumnsToChar/changelog.xml" relativeToChangelogFile="true"/>
- <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+ <include file="AddNullableToDateNew.xml" relativeToChangelogFile="true" />
+ <include file="insert_workflowCategory_keyword.xml" relativeToChangelogFile="true"/>
+ <include file="Notification/changelog.xml" relativeToChangelogFile="true" />
<include relativeToChangelogFile="true" file="drop_salesorder_unpaid.xml"/>
<include relativeToChangelogFile="true" file="drop_salesorder_versnr.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a4bbbd1638f60b4023e3ccab49955e358c011ba9
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.2/insert_workflowCategory_keyword.xml
@@ -0,0 +1,24 @@
+<?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="38b13161-5163-48d9-9791-f9c7027cac62">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="f241b36a-c2fe-40be-9e2e-8293c700d096"/>
+ <column name="KEYID" value="WORKFLOWCATEGORYMARKETING"/>
+ <column name="TITLE" value="Marketing"/>
+ <column name="CONTAINER" value="WorkflowCategory"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="00a72718-554e-46ab-b83c-fb9b81be4be6"/>
+ <column name="KEYID" value="WORKFLOWCATEGORYRELEASE"/>
+ <column name="TITLE" value="Release"/>
+ <column name="CONTAINER" value="WorkflowCategory"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/AlterButtonlabelTitles/AlterButtonLabelTitles.xml b/.liquibase/Data_alias/basic/2020.1.3/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5bc4d387a4d7bc4cdcc662a0fa1a30bce6ed7580
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/AlterButtonlabelTitles/AlterButtonLabelTitles.xml
@@ -0,0 +1,18 @@
+<?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="b.ulrich" id="853aca63-8234-4dfd-9fc6-2e8b71af82aa">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Read"/>
+ <where>AB_KEYWORD_ENTRYID='b5f402a0-29a0-43e9-8db3-454fdbcfc9d1'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="New"/>
+ <where>AB_KEYWORD_ENTRYID='678f61e5-ef27-4e1c-b52b-0e19188b038d'</where>
+ </update>
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="Archived"/>
+ <where>AB_KEYWORD_ENTRYID='1c40a2de-e6c1-469b-b324-d7089893ca5c'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml b/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43d552d2ec9fc93913e088dfa4992289660b4ca1
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/DeleteNotificationtypeKeywords.xml
@@ -0,0 +1,9 @@
+<?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.pongratz" id="0b393c2b-c969-41ab-9eeb-3ccaf418e069">
+ <delete tableName="AB_KEYWORD_ENTRY" >
+ <where>CONTAINER = 'NotificationType'</where>
+ </delete>
+ </changeSet>
+</databaseChangeLog>
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
new file mode 100644
index 0000000000000000000000000000000000000000..17f5ed88b30f6d1c35a03131d74fa5cbd6535874
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml
@@ -0,0 +1,11 @@
+<?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 id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
+ <renameColumn
+ 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
new file mode 100644
index 0000000000000000000000000000000000000000..2144ba2aa05757e48e229d77a6615145bdfde80c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.3/changelog.xml
@@ -0,0 +1,8 @@
+<?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">
+ <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
+ <include file="DeleteNotificationtypeKeywords.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/duplicates/duplicatescanner.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
index e1c57fcd49efdb883e3bf6bf15b5ccf4f4b58877..c68b0f2baaa28d6c55c52996768f2260aecbb83b 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
@@ -8,7 +8,7 @@
<column name="FILTER_NAME" value="PersonDuplicates" />
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
<column name="ID_FIELD_NAME" value="CONTACTID" />
- <column name="SCAN_PATTERN" value="firstname:({"entityfield": "FIRSTNAME"}) AND lastname:({"entityfield": "LASTNAME"})" />
+ <column name="SCAN_PATTERN" value="{"entity":"Person_entity","provider":"indexP","filter":{"type":"group","operator":"AND","childs":[{"type":"row","name":"FIRSTNAME","operator":"ISNOTNULL","value":"","key":"","contenttype":"TEXT"},{"type":"row","name":"LASTNAME","operator":"ISNOTNULL","value":"","key":"","contenttype":"TEXT"}]}}" />
<column name="USER_NEW" value="Admin" />
<column name="DATE_NEW" valueDate="2020-06-26T00:00:00" />
<column name="USER_EDIT" value="Admin" />
@@ -20,7 +20,7 @@
<column name="FILTER_NAME" value="OrganisationDuplicates" />
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
<column name="ID_FIELD_NAME" value="CONTACTID" />
- <column name="SCAN_PATTERN" value="name:({"entityfield": "NAME", "exclude": ["gmbh", "co", "kg", "ag", "bank", "deutsche", "van", "software", "medien", "print"] }) AND city:({"entityfield": "STANDARD_CITY"})" />
+ <column name="SCAN_PATTERN" value="{"entity":"Organisation_entity","provider":"indexP","filter":{"type":"group","operator":"AND","childs":[{"type":"row","name":"NAME","operator":"CONTAINSNOT","value":"[\"gmbh\", \"co\", \"kg\", \"ag\", \"bank\", \"deutsche\", \"van\", \"software\", \"medien\", \"print\"]","key":"[\"gmbh\", \"co\", \"kg\", \"ag\", \"bank\", \"deutsche\", \"van\", \"software\", \"medien\", \"print\"]","contenttype":"LONG_TEXT"},{"type":"row","name":"STANDARD_CITY","operator":"ISNOTNULL","value":"","key":"","contenttype":"TEXT"}]}}" />
<column name="USER_NEW" value="Admin" />
<column name="DATE_NEW" valueDate="2020-06-26T00:00:00" />
<column name="USER_EDIT" value="Admin" />
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 af7e5d06f6b435f4ed23b000313f51c786bc0dfc..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_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_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_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_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_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_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_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/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index a8cc53b406959a8797b32a02af71dd93e1576384..b3fee691bdea9f7905167ec0361cff00139a4211 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -14,7 +14,8 @@
<include relativeToChangelogFile="true" file="basic/2020.1.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2020.1.2/changelog.xml"/>
-
+ <include relativeToChangelogFile="true" file="basic/2020.1.3/changelog.xml"/>
+
<!--enable this only when you definetly want to overwrite the existing data with demo records:-->
<!--<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>-->
</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dbe878d7be0c6e3f4b7dd8c645fcb4547262337b..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>
@@ -8237,9 +8265,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8272,9 +8300,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8382,13 +8410,13 @@
<entityFieldDb>
<name>DOCUMENTTEMPLATEID</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -8529,9 +8557,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8557,9 +8585,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8647,9 +8675,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8696,9 +8724,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8835,9 +8863,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8954,9 +8982,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9267,9 +9295,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9309,9 +9337,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -11573,9 +11601,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11601,9 +11629,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -11885,9 +11913,9 @@
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11920,9 +11948,9 @@
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="91" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index a8fab2595e8795a739e854e715f1669bbd0477ac..659f2cb64d1ab3828820aa979ef3a5b5518650ac 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -15,8 +15,6 @@
<mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
<textInputAllowed v="true" />
<stateProcess>%aditoprj%/entity/Address_entity/entityfields/address/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/address/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/address/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Address_entity/entityfields/address/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
@@ -471,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>
@@ -579,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/address/displayValueProcess.js b/entity/Address_entity/entityfields/address/displayValueProcess.js
deleted file mode 100644
index 18985f7a004b046c160746de13e8970eb6c87ece..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/address/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.result");
-
-// Needed for instant refresh if set by neon.setFieldValue
-// use the code if address webservice is active
-//result.string(vars.get("$field.ADDRESS"));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address/valueProcess.js b/entity/Address_entity/entityfields/address/valueProcess.js
deleted file mode 100644
index 2c9d496185be419f31c762709ca97d83a1ae4bd4..0000000000000000000000000000000000000000
--- a/entity/Address_entity/entityfields/address/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("WsValidation_lib");
-import("system.vars");
-
-// use the code if address webservice is active
-//result.string(WsValidationUtils.valueFromJSON(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Address_entity/entityfields/address_ws/valueProcess.js b/entity/Address_entity/entityfields/address_ws/valueProcess.js
index 5ccdf5a99f70f8b801158a56c1fa7b8136854130..2c7449d49d0036b67e5de71b0a7d7cf9b75876a9 100644
--- a/entity/Address_entity/entityfields/address_ws/valueProcess.js
+++ b/entity/Address_entity/entityfields/address_ws/valueProcess.js
@@ -1,3 +1,5 @@
+import("system.vars");
import("WsValidation_lib");
-WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
+if(!vars.get("$this.value"))
+ WsValidationFieldUtils.wsValueProcess(WsValidationType.get().TYPE_STREET_NOMINATIM, "$field.ADDRESS");
\ No newline at end of file
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/Appointment_entity/recordcontainers/jdito/onUpdate.js b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
index d9c947a770aed397a837cdea2483289f3d0ef2de..32ea225c34405b2ce25a50d2199e8c1800ae20c6 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js
@@ -56,7 +56,7 @@ if(event)
event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
}
- if(event[calendars.RRULE])
+ if(fields["RRULE.value"])
event[calendars.RRULE] = [fields["RRULE.value"]];
// Adds the required X-Header for status actions needed by Exchange and Domino
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
index 1d16d29705904d8d5e24c0c3990b0d6b9693bcca..a1ee18e84b4a9407a6334fc9924ef885a41c7176 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js
@@ -3,7 +3,7 @@ import("system.result");
import("system.vars");
import("system.neon");
-if(vars.get("$sys.selection").length == 1 && (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.GROUP.toString() || vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.OBJECTSELECTION.toString()))
+if(vars.get("$sys.selection").length == 1 && AttributeTypeUtil.isGroupType(vars.get("$field.ATTRIBUTE_TYPE")))
result.string(neon.COMPONENTSTATE_EDITABLE);
else
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
index 07c57c1e196e3db902ee7f56434ab85cdcda55af..6db4d90300246ab7382bfbcf8db4efe6ec9572e7 100644
--- a/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
+++ b/entity/CampaignParticipant_entity/entityfields/campaign_id/onValueChange.js
@@ -4,6 +4,6 @@ import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
{
- var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("local.value"));
+ var stepId = CampaignUtils.getDefaultCampaignStep(vars.get("$local.value"));
neon.setFieldValue("$field.CAMPAIGNSTEP_ID", stepId);
}
\ No newline at end of file
diff --git a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
index 460b39849d5d34bac95e4b987d28a665b732e860..25f85ab3968071cfcfc4df692b11e5b3cc4f168b 100644
--- a/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
+++ b/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.db");
import("system.vars");
import("Contact_lib");
-var organisationId = vars.get("$field.ORGANISATION_ID");
-var res = OrganisationUtils.getNameByOrganisationId(organisationId);
+var organisationContactId = vars.get("$field.ORGANISATION_CONTACTID");
+var res = OrganisationUtils.getNameByContactId(organisationContactId);
result.string(res);
\ 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/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index fa1098dc639a05b340f5fc1a6fda4ca95bb2d521..9e489aa2dd1130329252a759b2ddecca7fc7b297 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -118,6 +118,7 @@
<name>IS_MAIN_DOCUMENT</name>
<title>Main document</title>
<contentType>BOOLEAN</contentType>
+ <placeholderProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js</placeholderProcess>
<dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess>
<valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
diff --git a/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js b/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8b541d6a62aef80de1307ed68f9344719ec9febb
--- /dev/null
+++ b/entity/Document_entity/entityfields/is_main_document/placeholderProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Main document"));
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index b7116402fb566724a159f7c003fde69a19901b96..655421fb7bca05d24cae4098039d6815a840d667 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -14,6 +14,7 @@
<entityField>
<name>ENTITY_TO_SCAN_NAME</name>
<title>Target Entity</title>
+ <stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>UID</name>
@@ -64,7 +65,9 @@
<entityField>
<name>SCAN_PATTERN</name>
<title>Scan pattern</title>
- <contentType>LONG_TEXT</contentType>
+ <contentType>FILTER_TREE</contentType>
+ <state>AUTO</state>
+ <stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js</stateProcess>
</entityField>
<entityConsumer>
<name>ScannerResultFieldsConfig_Consumer</name>
@@ -100,6 +103,8 @@
<dbRecordContainer>
<name>DBRecordContainer</name>
<alias>Data_alias</alias>
+ <onDBInsert>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
diff --git a/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..07c220ad58c1df3eb5e3f6e8b387045763d9ad1e
--- /dev/null
+++ b/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+} else {
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js b/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..256afd274dae777fb192e66457b19415f215a693
--- /dev/null
+++ b/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("system.result");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+} else {
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..3c29c7e6c1790f6f53dd7fbb272a21d62f24667d
--- /dev/null
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js
@@ -0,0 +1,8 @@
+import("Sql_lib");
+import("system.neon");
+import("system.vars");
+
+var rowdata = vars.get("$local.rowdata");
+
+newWhere("DUPLICATESCANNER.ID", rowdata["DUPLICATESCANNER.ID"])
+.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + rowdata["DUPLICATESCANNER.ENTITY_TO_SCAN_NAME"] + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
new file mode 100644
index 0000000000000000000000000000000000000000..c8e53ac00d768ffab9c7f50553de8b2f3d327bed
--- /dev/null
+++ b/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
@@ -0,0 +1,10 @@
+import("system.vars");
+
+var rowdata = vars.get("$local.rowdata");
+
+let scanPattern = JSON.parse(rowdata["DUPLICATESCANNER.SCAN_PATTERN"]);
+if (scanPattern.provider == undefined)
+{
+ scanPattern.provider = "indexP";
+ vars.set("$field.SCAN_PATTERN", JSON.stringify(scanPattern));
+}
\ No newline at end of file
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index fc65d44a8a9fde47fccacef66a19b03e60160dfc..b14e753e4e989ccf0645d68cb7bca2f6cca765c4 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -119,7 +119,7 @@
</entityParameter>
<entityActionField>
<name>sendMail</name>
- <title>send mail</title>
+ <title>{SEND_MAIL}</title>
<onActionProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
<stateProcess>%aditoprj%/entity/Email_entity/entityfields/sendmail/stateProcess.js</stateProcess>
@@ -128,6 +128,12 @@
<name>AdditionalPlaceholders_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <documentation>%aditoprj%/entity/Email_entity/entityfields/offerid_param/documentation.adoc</documentation>
+ </entityParameter>
</entityFields>
<recordContainers>
<datalessRecordContainer>
diff --git a/entity/Email_entity/entityfields/offerid_param/documentation.adoc b/entity/Email_entity/entityfields/offerid_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..cc60a8f815575f3ed65faa6cc6634e6878b173c6
--- /dev/null
+++ b/entity/Email_entity/entityfields/offerid_param/documentation.adoc
@@ -0,0 +1,3 @@
+=OfferId_pram
+
+optional param needed for the offerEmails, to change the status of the offer
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/sendmail/onActionProcess.js b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
index a7bdf5af9030a2f9352c7f5ccd597d334995fd35..74810743f42a7d88c0dfd8989917e0603864ba98 100644
--- a/entity/Email_entity/entityfields/sendmail/onActionProcess.js
+++ b/entity/Email_entity/entityfields/sendmail/onActionProcess.js
@@ -1,3 +1,5 @@
+import("KeywordRegistry_basic");
+import("Sql_lib");
import("system.translate");
import("ActivityTask_lib");
import("system.neon");
@@ -38,6 +40,11 @@ var eml = EmailWritingUtils.openMailTemplate(
additionalPlaceholders
);
+if(vars.get("$param.ComingFrom_param") == "Offer")
+{
+ newWhere("OFFER.OFFERID", vars.get("$param.OfferId_param"))
+ .updateData(true, "OFFER", ["STATUS"], null, [$KeywordRegistry.offerStatus$sent()]);
+}
if (notificationMsg)
question.showMessage(notificationMsg, question.INFORMATION, notificationTitle);
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
index d469435d5c78d77ed6371942df1cb330d36389d3..4a1dbe67e5fb2353cd24c297f9ca0c1eb08e9304 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -22,7 +22,7 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
neon.setFieldValues({
"$field.FIRSTNAME" : name[0] || "",
"$field.LASTNAME" : name[1] || "",
- "$field.EMAIL_ADDRESS" : name[2] || "",
+ "$field.EMAIL_ADDRESS" : name[2] || vars.get("$field.EMAIL_ADDRESS") || "",
"$field.TITLE" : username
});
}
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
index 99e97c2dddc0cae705cdc328a215b226a386f227..559a598b48b1f347bf21ee32e097eacc741b1083 100644
--- a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
@@ -6,7 +6,7 @@ import("system.result");
import("Sql_lib");
var contactId = vars.get("$field.CONTACT_ID");
-if (contactId && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
+if (contactId)
{
var addresses = newSelect("ADDR, ADDR")
.from("COMMUNICATION")
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 4511f71a29b7613767ddba5aeddac2e16e5dfb8e..a103f19dab7068536886bfa494e959490bf7ab1b 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -121,6 +121,7 @@
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
+ <isPageable v="false" />
<conditionProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
@@ -143,16 +144,20 @@
<dbRecordFieldMapping>
<name>ISO3.value</name>
<recordfield>AB_LANGUAGE.ISO3</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="true" />
+ <isFilterable v="false" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME_LATIN.value</name>
<recordfield>AB_LANGUAGE.NAME_LATIN</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME_NATIVE.value</name>
<recordfield>AB_LANGUAGE.NAME_NATIVE</recordfield>
+ <isFilterable v="false" />
+ <isLookupFilter v="false" />
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
diff --git a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
index c7b4f0fdf7661d9430c260c73320cac09a35dec8..e3ab27e0a12c8b09990f1739ec1e11464248d700 100644
--- a/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/leadimportreset/onActionProcess.js
@@ -46,7 +46,7 @@ function _deleteData (pTableName, pleadimportId, pdateADayBefor)
{
let uTableName = pTableName.charAt(0);
newWhere(pTableName + "." + pTableName + "ID",
- newSelect(pTableName + "." + pTableName + "ID")
+ newSelect(uTableName + "." + pTableName + "ID")
.from(pTableName, uTableName)
.join("LEADLOG", "LEADLOG.DATE_NEW = " + uTableName + ".DATE_NEW")
.where(uTableName + ".USER_NEW = LEADLOG.USER_NEW")
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index a3dad29fd35c166e1bed11548b79bff253145df2..365030844701c4976dbe7f8114e7c5d0967ee892 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -27,6 +27,7 @@
<name>STATE</name>
<title>State</title>
<consumer>StateKeywords</consumer>
+ <groupable v="true" />
<displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
@@ -34,7 +35,7 @@
</entityField>
<entityField>
<name>CAPTION</name>
- <title>title</title>
+ <title>Title</title>
</entityField>
<entityField>
<name>CREATIONDATE</name>
@@ -45,7 +46,7 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
- <title>description</title>
+ <title>Description</title>
</entityField>
<entityField>
<name>FORCEDPRIORITY</name>
@@ -69,7 +70,7 @@
<name>TYPECODE</name>
<title>Type</title>
<groupable v="true" />
- <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
+ <dropDownProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/dropDownProcess.js</dropDownProcess>
</entityField>
<entityField>
<name>VERSION</name>
@@ -103,7 +104,7 @@
<title>set Read</title>
<description></description>
<onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
+ <isSelectionAction v="false" />
<iconId>VAADIN:OPEN_BOOK</iconId>
<tooltip></tooltip>
<tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
@@ -118,6 +119,10 @@
<tooltip></tooltip>
<tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setnew/tooltipProcess.js</tooltipProcess>
</entityActionField>
+ <entityActionField>
+ <name>getNotification</name>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/getnotification/onActionProcess.js</onActionProcess>
+ </entityActionField>
</children>
</entityActionGroup>
<entityActionField>
@@ -126,8 +131,9 @@
</entityActionField>
<entityField>
<name>RESOLVEDPRIORITY</name>
- <title>priority</title>
+ <title>Priority</title>
<consumer>PrioKeywords</consumer>
+ <groupable v="true" />
<textInputAllowed v="false" />
</entityField>
<entityConsumer>
@@ -163,6 +169,8 @@
<dbRecordContainer>
<name>db</name>
<alias>_____SYSTEMALIAS</alias>
+ <maximumDbRows v="200" />
+ <isPageable v="false" />
<fromClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
diff --git a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
index 5ee955fd6389e03589d671d10bb0f51aa70a8bb2..d9ff8a7c8fcb193f4d0e526aaa0c517caa3b48b2 100644
--- a/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
+++ b/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js
@@ -1,11 +1,20 @@
+import("Sql_lib");
import("system.vars");
import("system.tools");
import("system.notification");
import("system.neon");
+import("KeywordRegistry_basic");
var user = tools.getCurrentUser();
var selectedNotifications = vars.get("$sys.selection");
+if (selectedNotifications.length == 0){
+ selectedNotifications = newSelect("ASYS_NOTIFICATIONS.ID")
+ .from("ASYS_NOTIFICATIONS")
+ .where("ASYS_NOTIFICATIONS.STATE", [notification.STATE_SEEN.toString(), notification.STATE_UNSEEN.toString()], SqlBuilder.IN())
+ .arrayColumn();
+}
+
for(var i = 0; i < selectedNotifications.length; i++)
notification.updateUserNotificationState(user["name"], selectedNotifications[i], notification.STATE_CONFIRMED);
diff --git a/entity/Notification_entity/entityfields/state/displayValueProcess.js b/entity/Notification_entity/entityfields/state/displayValueProcess.js
index fcd088324b80387634096e3d62a49a2e82974495..277c05aab18dbce9a8a0a5f7bc078c8ada84c94d 100644
--- a/entity/Notification_entity/entityfields/state/displayValueProcess.js
+++ b/entity/Notification_entity/entityfields/state/displayValueProcess.js
@@ -1,24 +1,6 @@
-import("system.translate");
+import("Keyword_lib");
import("system.result");
import("system.vars");
+import("KeywordRegistry_basic");
-var value = vars.get("$field.STATE");
-
-switch(value)
-{
- case "SEEN":
- result.string(translate.text("Seen"));
- break;
- case "CONFIRMED":
- result.string(translate.text("Confirmed"));
- break;
- case "TODELETE":
- result.string(translate.text("To Delete"));
- break;
- case "ARCHIVE":
- result.string(translate.text("Archive"));
- break;
- default:
- result.string(translate.text("Unseen"));
- break;
-}
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.notificationState(), vars.get("$field.STATE")));
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
index a5407effb79841e7d2492e6f27f3ce81bfa33a51..f39ea4075a7d01b5ebcd3b54a316ce20694c3e79 100644
--- a/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
+++ b/entity/Notification_entity/entityfields/statekeywords/children/containername_param/valueProcess.js
@@ -1,4 +1,5 @@
import("system.result");
+import("KeywordRegistry_basic");
-result.string("NotificationState");
\ No newline at end of file
+result.string($KeywordRegistry.notificationState());
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js b/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
deleted file mode 100644
index 76e8d769dc2a82a791668c8df8783f1bfee95141..0000000000000000000000000000000000000000
--- a/entity/Notification_entity/entityfields/typecode/displayValueProcess.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import("system.result");
-import("system.translate");
-import("system.vars");
-
-var PREFIX = "_____SYSTEM_";
-var typecode = vars.get("$field.TYPECODE");
-
-switch(typecode)
-{
- case PREFIX + "NOTIFICATION_PHONECALL":
- result.string(translate.text("Phonecall"));
- break;
-
- case PREFIX + "NOTIFICATION_EMAIL":
- result.string(translate.text("Email"));
- break;
-
- case PREFIX + "NOTIFICATION_APPOINTMENT":
- result.string(translate.text("Appointment"));
- break;
-
- case PREFIX + "NOTIFICATION_TODO":
- result.string(translate.text("Todo"));
- break;
-
- default:
- result.string(typecode);
-}
\ No newline at end of file
diff --git a/entity/Notification_entity/entityfields/typecode/dropDownProcess.js b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f4800969f4e5967a497f2d0ce1b0244ccd81da63
--- /dev/null
+++ b/entity/Notification_entity/entityfields/typecode/dropDownProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.logging");
+import("system.notification");
+
+var types = []
+
+for (let property in notification.getAllTypes())
+{
+ types.push(property);
+}
+
+result.object(types);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
index a5b761ab29d8a43dfb5e9f3aa4a2b19a79bf057c..108e16a1568111f622d71415968423884be95d78 100644
--- a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
@@ -27,9 +27,5 @@ attachmentArray[0] = offerReport;
var additionalPlaceholders = [
new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
];
-
-EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders);
-
-newWhere("OFFER.OFFERID", "$field.OFFERID")
- .updateData(true, "OFFER", ["STATUS"], null, [$KeywordRegistry.offerStatus$sent()]);
-
+var offerId = vars.get("$field.OFFERID")
+EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, offerId);
\ 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
new file mode 100644
index 0000000000000000000000000000000000000000..1da341d92cdf7c2b4a618197df76a8d6a6b1dc67
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderlanguage_param/valueProcess.js
@@ -0,0 +1,8 @@
+import("Sql_lib");
+import("system.result");
+
+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..9fe5066d15193284355ea0e53ab9d5efcaf29c40 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1114,6 +1114,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>indexP</name>
+ <recordContainer>index</recordContainer>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1353,6 +1357,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/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index 8b2a82d1248e5a526244505511c3a5150ea748fe..d6e9a449d7ea9ff95c656fe2f8f4aaa2da8aee12 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -131,11 +131,6 @@
<entityName>PermissionMetaData_entity</entityName>
<fieldName>MetaData</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>EntityName_param</name>
- </entityParameter>
- </children>
</entityConsumer>
<entityParameter>
<name>EntityTitle_param</name>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 907d1408a4c2c5606ddcc61e47249d015939e3e3..a9282ecbdf9541343fa120c712cc703022a07fb9 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1277,6 +1277,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
+ <entityProvider>
+ <name>indexP</name>
+ <recordContainer>index</recordContainer>
+ </entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/grantDeleteProcess.js b/entity/Person_entity/grantDeleteProcess.js
index 7b130d228f43287df7b16ee2f16acc9f7f43c009..2c8fe13800c8f755557466f0ba55164897abd1e6 100644
--- a/entity/Person_entity/grantDeleteProcess.js
+++ b/entity/Person_entity/grantDeleteProcess.js
@@ -1,20 +1,34 @@
+import("Sql_lib");
import("Entity_lib");
import("Employee_lib");
import("Context_lib");
import("system.vars");
import("system.result");
-var contactId = vars.get("$field.CONTACTID");
-var currentContext = ContextUtils.getCurrentContextId();
+var canDelete = false;
+var personId = vars.get("$field.PERSONID");
+var personCount = newSelect("count(*)")
+ .from("CONTACT")
+ .join("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .where("PERSON.PERSONID", personId)
+ .cell()
+//only delete when the contact doesnt have any functions, because that would currently lead to the person and all his functions being deleted,
+// since there is only one person contact behind all the contacts.
+//ToDo: come back to this and implement the solution for deleting a function (#1059167) once it'S decided how that's being implemented
+if(personCount == 1)
+{
+ var contactId = vars.get("$field.CONTACTID");
+ var currentContext = ContextUtils.getCurrentContextId();
-var canDelete = new HasLinkedObjectTester()
- .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : contactId}) //Activities
- .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : contactId}) //Tasks
- .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "CONTACT", AssignmentRowId_param : contactId}) //Documents
- .and(function () {return !EmployeeUtils.isUser(contactId);})
- .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
- .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
- .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
- .validate();
+ canDelete = new HasLinkedObjectTester()
+ .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : contactId}) //Activities
+ .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : currentContext, RowId_param : contactId}) //Tasks
+ .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "CONTACT", AssignmentRowId_param : contactId}) //Documents
+ .and(function () {return !EmployeeUtils.isUser(contactId);})
+ .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : contactId}) //Offers
+ .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : contactId}) //Contracts
+ .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : JSON.stringify([contactId, vars.get("$field.PERSON_ID")]), ObjectTypes_param : JSON.stringify([currentContext, "PrivatePerson"])})
+ .validate();
+}
result.string(canDelete);
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/VisitPlanEntry_entity/VisitPlanEntry_entity.aod b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
index 46740270752b5207fb8b62d480d5ebf3c57259e9..1af833e9b8e4f3713455bea35ac9402bc3d1e732 100644
--- a/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
+++ b/entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod
@@ -30,14 +30,14 @@
<displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
- <name>ORGANISATION_ID</name>
- <documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc</documentation>
+ <name>ORGANISATION_CONTACT_ID</name>
+ <documentation>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc</documentation>
<title>Organisation</title>
<consumer>Organisations</consumer>
<mandatory v="true" />
- <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+ <stateProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ENTRYDATE</name>
@@ -247,10 +247,10 @@
<name>END_TIME.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ORGANISATION_ID.value</name>
+ <name>ORGANISATION_CONTACT_ID.value</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
- <name>ORGANISATION_ID.displayValue</name>
+ <name>ORGANISATION_CONTACT_ID.displayValue</name>
</jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>CONTACT_ID.value</name>
diff --git a/entity/VisitPlanEntry_entity/documentation.adoc b/entity/VisitPlanEntry_entity/documentation.adoc
index fe840f04ecae1b740eca60633420ce2d1f362c95..13c58c22da0edc3d1657fcdc58b7043705a181e2 100644
--- a/entity/VisitPlanEntry_entity/documentation.adoc
+++ b/entity/VisitPlanEntry_entity/documentation.adoc
@@ -2,7 +2,8 @@
For storing Visitentries with their information(date, time, contact, and most importantly: it's Status).
Linked to VisitPlanEmployeeWeek_entity so you only see the entries in the chosen week.
-ORGANISATION_ID is used to store the company that's being visited, CONTACT_ID to Store the Point-of-Contact,
+ORGANISATION_CONTACT_ID is used to store the company that's being visited,
+CONTACT_ID to Store the Point-of-Contact,
since you are normally visiting one specific person.
Keep in mind, that only the organization is important for the visitRecommendations and not the Point of Contact.
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
index 03f6b8014252f4c2405882dda74d4955d797c27f..bf3542dc528bf679b61175ff20d1e2cec67e3e60 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/onValidation.js
@@ -3,7 +3,7 @@ import("system.result");
import("Contact_lib");
import("system.vars");
-var orgId = vars.get("$field.ORGANISATION_ID");
+var orgId = vars.get("$field.ORGANISATION_CONTACT_ID");
var contactId = vars.get("$field.CONTACT_ID");
var orgContactId = ContactUtils.getPersOrgIds(contactId)[2];
diff --git a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
index fe203ca7a71f6d00e5a41fc9b1d2447822c43177..0c443c043435687de4551ffd16df721652c159e0 100644
--- a/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/contact_id/valueProcess.js
@@ -12,6 +12,6 @@ if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.v
.from("CONTACT")
.where("CONTACT.CONTACTID", contactId)
.cell();
- neon.setFieldValue("$field.ORGANISATION_ID", orgId);
+ neon.setFieldValue("$field.ORGANISATION_CONTACT_ID", orgId);
result.string(vars.get("$param.ContactId_param"));
}
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
index 0af8e295e63255fb7540147e6904e87cc65eb4fa..5fdb3779fc2b8699a502c17353bbf34ff9a59bb1 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newactivity/onActionProcess.js
@@ -17,7 +17,7 @@ var pointOfContact = newSelect("CONTACT.CONTACTID", db.getCurrentAlias())
.leftJoin("AB_ATTRIBUTE", "AB_ATTRIBUTE.AB_ATTRIBUTEID = AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID")
.leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
.where("AB_ATTRIBUTE.AB_ATTRIBUTEID", $AttributeRegistry.visitPlanPointOfContact())
- .and("CONTACT.CONTACTID", vars.get("$field.ORGANISATION_ID"))
+ .and("CONTACT.CONTACTID", vars.get("$field.ORGANISATION_CONTACT_ID"))
.cell();
var context;
@@ -25,7 +25,7 @@ if(pointOfContact)
links.push([ContactUtils.getContextByContactId(pointOfContact), pointOfContact]);
else
{
- var contactId = vars.get("$field.ORGANISATION_ID");
+ var contactId = vars.get("$field.ORGANISATION_CONTACT_ID");
context = ContactUtils.getContextByContactId(contactId);
if(context == 'Person')
{
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
index e9a7e5846d28fb6ffb8fcd6d7878ff3ea199d5f9..12468e7c64aa2eb7b2f20bf1ea259b0843a594ef 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/newappointment/onActionProcess.js
@@ -40,8 +40,8 @@ var entryDateAsLong = selectionRowData[0].ENTRYDATE;
var entryDate = datetime.toDate(entryDateAsLong, "dd-MM-yyyy");
var startTime = selectionRowData[0].BEGIN_TIME;
var endTime = selectionRowData[0].END_TIME;
-var organisation_id = selectionRowData[0].ORGANISATION_ID;
-var organisationName = OrganisationUtils.getNameByOrganisationId(organisation_id);
+var organisationContact_id = selectionRowData[0].ORGANISATION_CONTACT_ID;
+var organisationName = OrganisationUtils.getNameByContactId(organisationContact_id);
var contact_id = selectionRowData[0].CONTACT_ID;
var contactName = ContactUtils.getFullTitleByContactId(contact_id);
var contactMail = CommUtil.getStandardSubSqlMail(contact_id)
@@ -53,9 +53,9 @@ var department = contactData[0];
var contactRole = contactData[1];
var addressId = newSelect("CONTACT.ADDRESS_ID")
.from("CONTACT")
- .where("CONTACT.CONTACTID", organisation_id)
+ .where("CONTACT.CONTACTID", organisationContact_id)
.cell();
-var organisationAddress = new AddrObject(organisation_id);
+var organisationAddress = new AddrObject(organisationContact_id);
var organisationAddressFormatted = organisationAddress.getFormattedAddress(false, "{salutation_name}\n {street} {buildingno}\n {country_short} - {zip} {city}");
var contactCommunication = newSelect("COMMUNICATION.MEDIUM_ID, COMMUNICATION.ADDR")
.from("COMMUNICATION")
@@ -105,7 +105,7 @@ columnTypes = db.getColumnTypes("AB_APPOINTMENTLINK", columns, db.getCurrentAlia
values = [util.getNewUUID(),
uidAppointment[0],
"Organisation",
- organisation_id]
+ organisationContact_id]
insert = db.insertData("AB_APPOINTMENTLINK", columns, columnTypes, values)
values = [util.getNewUUID(),
diff --git a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
index b926fc89ff6515951fc64f5cec927a60f8434174..dc5b0f07067f9de2b8ea08deebdb04d1940ce157 100644
--- a/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/entityactiongroup/children/openroute/onActionProcess.js
@@ -59,7 +59,7 @@ if(vars.exists("$param.Entries_param") && vars.get("$param.Entries_param"))
var childAddresses = newSelect("ADDRESS, BUILDINGNO, ZIP, CITY, COUNTRY")
.from("ADDRESS")
.leftJoin("VISITPLANENTRY", "ADDRESS.ADDRESSID = (select ADDRESS_ID from CONTACT where CONTACT.CONTACTID \n\
- = VISITPLANENTRY.ORGANISATION_ID)")
+ = VISITPLANENTRY.ORGANISATION_CONTACT_ID)")
.where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", entryid)
.and("VISITPLANENTRY.ENTRYDATE", entrydateDB)
.table();
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
similarity index 74%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
index 4a069cec9dd05ddca04014ff4a5a534e07aff0fc..a5833c922a458e88908fd9b6a1f529d12ed6f498 100644
--- a/entity/VisitPlanEntry_entity/entityfields/organisation_id/displayValueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/displayValueProcess.js
@@ -3,7 +3,7 @@ import("system.db");
import("system.vars");
import("Contact_lib");
-var contactid = vars.get("$field.ORGANISATION_ID");
+var contactid = vars.get("$field.ORGANISATION_CONTACT_ID");
var res = ContactUtils.getFullTitleByContactId(contactid);
result.string(res);
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/documentation.adoc
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/documentation.adoc
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/stateProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/stateProcess.js
diff --git a/entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
similarity index 100%
rename from entity/VisitPlanEntry_entity/entityfields/organisation_id/valueProcess.js
rename to entity/VisitPlanEntry_entity/entityfields/organisation_contact_id/valueProcess.js
diff --git a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js b/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
index ec94b86401b566ada90ac2bd3f2d2c43bf78c950..e6afefc86171adad8a87dcf4e7570253fa9faa66 100644
--- a/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
+++ b/entity/VisitPlanEntry_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js
@@ -4,6 +4,6 @@ import("Sql_lib");
var contactIdArray = newSelect("CONTACT.CONTACTID")
.from("CONTACT")
- .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_ID"), SqlBuilder.NOT_EQUAL())
+ .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_CONTACT_ID"), SqlBuilder.NOT_EQUAL())
.arrayColumn()
result.object(contactIdArray)
\ No newline at end of file
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
index 9711f6208cf7dff928ac21b7b0a8cfc89f4b57e1..ce8bb62314fa0a0ae0023f81b31d95a3871bd812 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/contentProcess.js
@@ -16,7 +16,7 @@ var items = [];
var group = [];
var entryData = "";
-var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID, APPOINTMENT_ID")
+var entrySQL = newSelect("ENTRYDATE, VISITPLANENTRYID, BEGIN_TIME, END_TIME, ORGANISATION_CONTACT_ID, CONTACT_ID,STATUS, VISITPLANEMPLOYEEWEEK_ID, APPOINTMENT_ID")
.from("VISITPLANENTRY");
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
@@ -46,11 +46,11 @@ if(entryData.length > 0)
{
for(var i = 0; i < entryData.length; i++)
{
- var entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisation_id, contact_id, status, visitplanemployeeweek_id, appointmentid;
- [entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisation_id, contact_id, status, visitplanemployeeweek_id, appointmentid] = entryData[i]
+ var entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisationContact_id, contact_id, status, visitplanemployeeweek_id, appointmentid;
+ [entryDateRaw, visitPlanEntryId, beginn_time, end_time, organisationContact_id, contact_id, status, visitplanemployeeweek_id, appointmentid] = entryData[i]
var contactname = db.cell(PersUtils.getResolvingDisplaySubSql("'" + contact_id + "'"));
- var orgname = OrganisationUtils.getNameByOrganisationId(organisation_id);
+ var orgname = OrganisationUtils.getNameByContactId(organisationContact_id);
var parentName = translate.text(datetime.toDate(entryDateRaw, "EEEE"));
entryDate = datetime.toDate(entryDateRaw, "dd.MM.yyyy");
@@ -58,7 +58,7 @@ if(entryData.length > 0)
var alias = SqlUtils.getSystemAlias();
items.push([visitPlanEntryId, false, parentName + "#" + entryDate, "", beginn_time
- , end_time, organisation_id, orgname, contact_id, contactname, entryDateRaw, status, visitplanemployeeweek_id, appointmentid, statusDisplay]);
+ , end_time, organisationContact_id, orgname, contact_id, contactname, entryDateRaw, status, visitplanemployeeweek_id, appointmentid, statusDisplay]);
if(!vars.get("$local.idvalues"))
{
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
index c0f1048f2920e1035145fc0c8ac1dfb49f915cc3..16ad70016e8c50f71299875fd494e3da997b71ec 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onInsert.js
@@ -58,7 +58,7 @@ var valuesEntry = [
rowData["ENTRYDATE.value"],
rowData["BEGIN_TIME.value"],
rowData["END_TIME.value"],
- rowData["ORGANISATION_ID.value"],
+ rowData["ORGANISATION_CONTACT_ID.value"],
rowData["CONTACT_ID.value"],
visitPlanEmployeeWeekID,
rowData["STATUS.value"]
@@ -69,7 +69,7 @@ var columnsEntry = [
"ENTRYDATE",
"BEGIN_TIME",
"END_TIME",
- "ORGANISATION_ID",
+ "ORGANISATION_CONTACT_ID",
"CONTACT_ID",
"VISITPLANEMPLOYEEWEEK_ID",
"STATUS"
diff --git a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
index 412b3644103fb32f8c640a802d03e2c8ef5782da..fd92c0fd0b725e26423a818adff2f2e87f7e66ad 100644
--- a/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/VisitPlanEntry_entity/recordcontainers/jdito/onUpdate.js
@@ -10,7 +10,7 @@ var values = [
rowData["ENTRYDATE.value"],
rowData["BEGIN_TIME.value"],
rowData["END_TIME.value"],
- rowData["ORGANISATION_ID.value"],
+ rowData["ORGANISATION_CONTACT_ID.value"],
rowData["STATUS"]
];
@@ -18,7 +18,7 @@ var columns = [
"ENTRYDATE",
"BEGIN_TIME",
"END_TIME",
- "ORGANISATION_ID",
+ "ORGANISATION_CONTACT_ID",
"STATUS"
];
diff --git a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
index 26a88f95717ce53ce1723ca71443089d0e3a1540..341015c21e87d2ef978e949006f017dd5f0d9e10 100644
--- a/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js
@@ -47,12 +47,12 @@ if(idValues == false)
"visitPlanFrequency.ID_VALUE", "'VISITFREQUENCY '", activitySubQuery, "CONTACTID",
newSelect("min(ENTRYDATE)")
.from("VISITPLANENTRY")
- .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_ID")
+ .where("CONTACT.CONTACTID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID")
.and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
.or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
.and("VISITPLANENTRY.ENTRYDATE", newSelect("min(vp.ENTRYDATE)")
.from("VISITPLANENTRY", "vp")
- .where(["VISITPLANENTRY", "ORGANISATION_ID", "vp"], "visitplanentry.ORGANISATION_ID")
+ .where(["VISITPLANENTRY", "ORGANISATION_CONTACT_ID", "vp"], "visitplanentry.ORGANISATION_CONTACT_ID")
.and(["VISITPLANENTRY", "ENTRYDATE", "vp"], datetime.today())
.and(newWhere(["VISITPLANENTRY", "STATUS", "vp"],
$KeywordRegistry.visitPlanEntryStatus$planned())
@@ -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_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_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/entity/WorkflowStartConfig_entity/imageProcess.js b/entity/WorkflowStartConfig_entity/imageProcess.js
index 34147b89bd271ec01be2bb3fa1c6eb055186963f..8b918cbc285c80f90e305b0b2aee6655949db65f 100644
--- a/entity/WorkflowStartConfig_entity/imageProcess.js
+++ b/entity/WorkflowStartConfig_entity/imageProcess.js
@@ -2,5 +2,5 @@ import("system.result");
import("system.vars");
import("system.project");
-var contextModel = project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
+var contextModel = vars.get("$field.OBJECT_TYPE") && project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECT_TYPE"));
result.string(contextModel ? contextModel[5] : "");
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d339195f21f074660303e10b1a80ce278c3bb123..7d7faf29064e6a889ba516cd390fe185946689dc 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6872,9 +6872,30 @@
<entry>
<key>Workflow Model</key>
</entry>
+ <entry>
+ <key>{SENT_MAIL}</key>
+ </entry>
<entry>
<key>The Sales Project can only be filled when a company has been specified</key>
</entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
+ </entry>
+ <entry>
+ <key>{SEND_MAIL}</key>
+ </entry>
+ <entry>
+ <key>New</key>
+ </entry>
+ <entry>
+ <key>Release</key>
+ </entry>
+ <entry>
+ <key>Archived</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index f62aa2329c256caefa04592d5baee0d201e9aae6..14b87249af125526a2090fb370943eebb3636f65 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -32,6 +32,7 @@
</entry>
<entry>
<key>Finished</key>
+ <value>Abgeschlossen</value>
</entry>
<entry>
<key>Show my organisations</key>
@@ -5062,7 +5063,7 @@
</entry>
<entry>
<key>Read</key>
- <value>gelesen</value>
+ <value>Gelesen</value>
</entry>
<entry>
<key>Permission Set ID</key>
@@ -6737,7 +6738,7 @@
</entry>
<entry>
<key>archive</key>
- <value>archivieren</value>
+ <value>Archivieren</value>
</entry>
<entry>
<key>Bangladesh</key>
@@ -8187,7 +8188,6 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Send email</key>
- <value>E-Mail losschicken</value>
</entry>
<entry>
<key>Activites</key>
@@ -8583,7 +8583,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Zip</key>
- <value>PLZ</value>
+ <value>Plz</value>
</entry>
<entry>
<key>type</key>
@@ -8739,70 +8739,94 @@ Bitte Datumseingabe prüfen</value>
<key>Valid from (as </key>
<value>gültig ab (in </value>
</entry>
+ <entry>
+ <key>workflow notification</key>
+ <value>Workflow Benachrichtigung</value>
+ </entry>
+ <entry>
+ <key>leadimport notification</key>
+ </entry>
+ <entry>
+ <key>bulk mail sent</key>
+ </entry>
+ <entry>
+ <key>download ready</key>
+ </entry>
<entry>
<key>No new recipients found that can be added to the bulk mail.</key>
<value>Keine neuen Empfänger, die zur Serienmail hinzugefügt werden können, gefunden.</value>
</entry>
<entry>
- <key>Add Recipients</key>
- <value>Empfänger hinzufügen</value>
+ <key>Permission received</key>
+ <value>erhaltene Berechtigung</value>
</entry>
<entry>
- <key>Add Participants</key>
- <value>Teilnehmer hinzufügen</value>
+ <key>granted permission</key>
+ <value>vergebene Berechtigung</value>
</entry>
<entry>
- <key>Download letter and create Activity</key>
- <value>Brief herunterladen und Aktivität erstellen</value>
+ <key>Receive new Department Permission</key>
+ <value>Neue Abteilungs-Berechtigung erhalten</value>
</entry>
<entry>
- <key>and open Report</key>
- <value>und Report öffnen</value>
+ <key>Receive new User Permission</key>
+ <value>Neue Benutzer-Berechtigung erhalten</value>
</entry>
<entry>
<key>export</key>
</entry>
- <entry>
- <key>export using the selected template</key>
- <value>Mit der ausgewählten Vorlage Exportieren</value>
- </entry>
<entry>
<key>No new recipients found that can be added to the serial letter.</key>
<value>Keine neuen Empfänger, die zum Serienbrief werden können, gefunden.</value>
</entry>
+ <entry>
+ <key>export using the selected template</key>
+ <value>Mit der ausgewählten Vorlage Exportieren</value>
+ </entry>
<entry>
<key>send mail</key>
<value>E-Mail losschicken</value>
</entry>
<entry>
- <key>Receive new Department Permission</key>
+ <key>Total in euros</key>
</entry>
<entry>
- <key>Receive new User Permission</key>
+ <key>Workflow Model</key>
</entry>
<entry>
- <key>workflow notification</key>
+ <key>{SEND_MAIL}</key>
+ <value>Email versenden</value>
</entry>
<entry>
- <key>Permission received</key>
+ <key>The workflow could not be deployed</key>
</entry>
<entry>
- <key>leadimport notification</key>
+ <key>Workflow deploy failed</key>
</entry>
<entry>
- <key>granted permission</key>
+ <key>Download letter and create Activity</key>
</entry>
<entry>
- <key>bulk mail sent</key>
+ <key>{SENT_MAIL}</key>
</entry>
<entry>
- <key>download ready</key>
+ <key>Add Participants</key>
</entry>
<entry>
- <key>Total in euros</key>
+ <key>and open Report</key>
</entry>
<entry>
- <key>Workflow Model</key>
+ <key>Add Recipients</key>
+ </entry>
+ <entry>
+ <key>New</key>
+ <value>Neu</value>
+ </entry>
+ <entry>
+ <key>Release</key>
+ </entry>
+ <entry>
+ <key>Archived</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index dd32b2a7b3caf16d762271d43e41d228628bf79d..a36b9b673f2b9a681843ae6ffca66ea1d83a9a85 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6941,6 +6941,28 @@
<entry>
<key>The Sales Project can only be filled when a company has been specified</key>
</entry>
+ <entry>
+ <key>{SEND_MAIL}</key>
+ <value>Send mail</value>
+ </entry>
+ <entry>
+ <key>The workflow could not be deployed</key>
+ </entry>
+ <entry>
+ <key>Workflow deploy failed</key>
+ </entry>
+ <entry>
+ <key>{SENT_MAIL}</key>
+ </entry>
+ <entry>
+ <key>New</key>
+ </entry>
+ <entry>
+ <key>Release</key>
+ </entry>
+ <entry>
+ <key>Archived</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/CampaignStep/CampaignStep.aod b/neonContext/CampaignStep/CampaignStep.aod
index 99969c1dc8f63c8de66e18866f2b7eae6560f02e..6e9810b632fff5969a2b21be2d6dc11816966bb8 100644
--- a/neonContext/CampaignStep/CampaignStep.aod
+++ b/neonContext/CampaignStep/CampaignStep.aod
@@ -45,9 +45,5 @@
<name>99367402-93e6-49d4-b60c-143b6e71df00</name>
<view>CampaignStepsGantt_view</view>
</neonViewReference>
- <neonViewReference>
- <name>f146ea29-77d2-4141-b04a-36c29594e670</name>
- <view>CampaignStepMembers_view</view>
- </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
index 7d4a4e5d2a84ef5c9f155fc6f2d4b9bd223fc1e8..3dde5d4e26421ec75dbe34bc35a40fdb4fd0d3f2 100644
--- a/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
+++ b/neonView/CampaignParticipantFilter_view/CampaignParticipantFilter_view.aod
@@ -4,7 +4,7 @@
<title></title>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="false" />
+ <filterable v="true" />
<layout>
<groupLayout>
<name>layout</name>
@@ -15,8 +15,8 @@
<name>ParticipantsTable</name>
<favoriteActionGroup1>FilterViewActionGroup</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
- <isCreatable v="false" />
- <isEditable v="false" />
+ <isCreatable v="true" />
+ <isEditable v="true" />
<columns>
<neonTableColumn>
<name>1bd3a82e-89c1-4b3b-809b-b9bac7f78e58</name>
diff --git a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod b/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
deleted file mode 100644
index f66c1629d8103d1a135369cb9f519652a2750500..0000000000000000000000000000000000000000
--- a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
- <name>CampaignStepMembers_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
-</neonView>
diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
index 267ca200f71bfc159e6e25a565728e3548086719..684c65d5dc6ece746f72a21d0c72a255d3a84a08 100644
--- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
@@ -23,7 +23,7 @@
<entityField>ENTITY_TO_SCAN_NAME</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>a0eefe38-cd65-432e-819b-e108f44db7f2</name>
+ <name>840dda8e-0a7a-4c09-80d1-f7cec15b49fc</name>
<entityField>ID_FIELD_NAME</entityField>
</entityFieldLink>
<entityFieldLink>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index bb14afb0a269a9c52da65d1333fc78f34be935ee..2ff088a9ccf6c6ae330a9551921fa707c3143f07 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -28,17 +28,19 @@
<children>
<timelineViewTemplate>
<name>NotificationTimeline</name>
+ <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
<dateField>CREATIONDATE</dateField>
<titleField>CAPTION</titleField>
<descriptionField>DESCRIPTION</descriptionField>
<iconIdField>ICON</iconIdField>
<entityField>#ENTITY</entityField>
+ <isEditable v="false" />
+ <informationField>STATE</informationField>
</timelineViewTemplate>
<tableViewTemplate>
<name>NotificationTable</name>
<favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
<inlineEdit v="true" />
- <entryAction>rowClickAction</entryAction>
<iconField>ICON</iconField>
<titleField>CAPTION</titleField>
<subtitleField>RESOLVEDPRIORITY</subtitleField>
@@ -71,7 +73,9 @@
</tableViewTemplate>
<treeTableViewTemplate>
<name>NotificationTreeTable</name>
+ <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
<entityField>#ENTITY</entityField>
+ <isEditable v="false" />
<columns>
<neonTreeTableColumn>
<name>c8799a54-569a-4667-9bdd-aa11a2f6e21e</name>
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/neonView/OrderDetail_view/OrderDetail_view.aod b/neonView/OrderDetail_view/OrderDetail_view.aod
index 44791968d06aec8414a6127cfe7b9db33eb2c2ac..d912f8d7a10ffcbd8e1316878d2792510f6ed73c 100644
--- a/neonView/OrderDetail_view/OrderDetail_view.aod
+++ b/neonView/OrderDetail_view/OrderDetail_view.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
<name>OrderDetail_view</name>
- <title>Texts</title>
+ <title>Cover letter</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<noneLayout>
diff --git a/neonView/OrderMain_view/OrderMain_view.aod b/neonView/OrderMain_view/OrderMain_view.aod
index b76b54dcaaff68957fa6d0c26f48d5a57a2f9c02..428d0c02e07af523318e7f24d35f87230edab64f 100644
--- a/neonView/OrderMain_view/OrderMain_view.aod
+++ b/neonView/OrderMain_view/OrderMain_view.aod
@@ -29,16 +29,16 @@
<entityField>#ENTITY</entityField>
<view>OrderDetail_view</view>
</neonViewReference>
- <neonViewReference>
- <name>b3014999-da86-45ae-86ae-feb738d62906</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>7ec102f5-fb45-44a7-9bbf-0eba7f1536d7</name>
<entityField>Activities</entityField>
<view>ActivityFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>b3014999-da86-45ae-86ae-feb738d62906</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>351a9b5d-a050-4fb9-b3e4-402dcd84b331</name>
<entityField>Tasks</entityField>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 8955a3924f096afd7f468c468bf51278be480c9c..4c6e8a7eac674bd309fbe4aefe1f9bda7c40bba0 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -31,6 +31,10 @@
<name>a8dcb2bb-bb09-4a6e-b0f0-1b4d1111eb22</name>
<entityField>UNIT</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
<entityField>PRICE</entityField>
@@ -39,10 +43,6 @@
<name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
<entityField>DISCOUNT</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>bfd34c94-1a5f-4caf-ae6e-2c09375c023c</name>
- <entityField>VAT</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>89fd18d0-f6ee-4323-9277-464dee6da625</name>
<entityField>OPTIONAL</entityField>
@@ -77,6 +77,10 @@
<name>4998fc65-67b7-465d-9891-808dcf0fe080</name>
<entityField>UNIT</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
+ <entityField>VAT</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>b4470ca6-89e8-421b-bb91-7d32f9c48aa2</name>
<entityField>PRICE</entityField>
@@ -85,22 +89,18 @@
<name>0c533079-4b39-4412-8de5-086bf7a08706</name>
<entityField>DISCOUNT</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>e545cb87-e4a5-4154-89b1-1f88a6d59fde</name>
- <entityField>VAT</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>9ac44050-ea77-43d2-b0fe-f7ca411b91e7</name>
<entityField>OPTIONAL</entityField>
</neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
- <entityField>INFO</entityField>
- </neonTreeTableColumn>
<neonTreeTableColumn>
<name>c44b5bc2-4283-4dca-bd20-bd048e05fe45</name>
<entityField>TotalPrice</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
+ <entityField>INFO</entityField>
+ </neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
</children>
diff --git a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
index 9c98d1fe51548d2c24a3f1e415cf83a1de05e69d..cdac1faccf7f16acf27044fd57f434dea9502e3c 100644
--- a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
+++ b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
@@ -3,9 +3,9 @@
<name>WorkflowStartConfigFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <groupLayout>
+ <boxLayout>
<name>layout</name>
- </groupLayout>
+ </boxLayout>
</layout>
<children>
<tableViewTemplate>
@@ -24,19 +24,5 @@
</neonTableColumn>
</columns>
</tableViewTemplate>
- <treeTableViewTemplate>
- <name>Treetable</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTreeTableColumn>
- <name>4874074f-80af-4e99-8449-2a4dc4428360</name>
- <entityField>OBJECT_TYPE</entityField>
- </neonTreeTableColumn>
- <neonTreeTableColumn>
- <name>d479a082-ea95-40c6-81a2-9318fcf9ce98</name>
- <entityField>TRIGGER_EVENT</entityField>
- </neonTreeTableColumn>
- </columns>
- </treeTableViewTemplate>
</children>
</neonView>
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 9fd2230221263fd1de7423ef86b50dd8fbdfe473..23fb2e7385eea2c4c989ebca11ee95d7f428dae0 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -1528,7 +1528,7 @@ AttributeRelationQuery.prototype.includeDisplayValue = function ()
/**
* Executes the query and returns the result, depending on the properties of the AttributeRelationQuery object.
*
- * @return {Object[]} <p>
+ * @return {AttributeRelation[]} <p>
* Array of objects. By default, the objects contain the properties:
* <ul>
* <li>attributeId</li>
@@ -1549,8 +1549,11 @@ AttributeRelationQuery.prototype.getAttributes = function ()
"AB_ATTRIBUTE.ATTRIBUTE_NAME",
"COMBOVAL.ATTRIBUTE_NAME",
"AB_ATTRIBUTE.AB_ATTRIBUTEID",
- "AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID"
+ "AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID",
+ "AB_ATTRIBUTERELATION.OBJECT_ROWID",
+ "AB_ATTRIBUTERELATION.OBJECT_TYPE"
];
+
var valueFields = AttributeTypeUtil.getAllDatabaseFields();
@@ -1564,13 +1567,8 @@ AttributeRelationQuery.prototype.getAttributes = function ()
var mappingFn = function (row)
{
- var attrObj = {
- attributeId : row[4],
- value : row[AttributeTypeUtil.getTypeColumnIndex(row[0]) + defaultFields.length],
- attributeRelationId : row[5],
- attributeName : row[2],
- attributeType : row[0]
- };
+ var attrObj = new AttributeRelation(row[5], row[4], row[AttributeTypeUtil.getTypeColumnIndex(row[0]) + defaultFields.length],
+ row[2], row[0], row[6], row[7]);
if (this._includeDisplayValue)
{
@@ -1594,7 +1592,7 @@ AttributeRelationQuery.prototype.getAttributes = function ()
* If this method is executed on your AttributeRelationQuery<br>
* object it will return only one attribute.
*
- * @return {Object} <p>
+ * @return {AttributeRelation} <p>
* Returns the AttributeRelationQuery object<br>
* with only a sinlge attribute.<br>
*/
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index ed3ef2cce6bc01136003468b6c39ac2781c38cd4..92dee1a9b0afef708545cc604351d10c4192a776 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -883,15 +883,49 @@ _DuplicateScannerUtils._buildUpdateResetStandardCommunications = function(pSourc
*/
_DuplicateScannerUtils._loadIndexPattern = function(pScannerName, pTargetEntity)
{
- let scanPattern = newSelect("SCAN_PATTERN")
+ let scanPattern = _DuplicateScannerUtils._filterToScanPattern( newSelect("SCAN_PATTERN")
.from("DUPLICATESCANNER")
.where("DUPLICATESCANNER.FILTER_NAME", pScannerName)
.and("DUPLICATESCANNER.ENTITY_TO_SCAN_NAME", pTargetEntity)
- .cell();
+ .cell());
scanPattern = scanPattern.trim();
return scanPattern;
}
+
+_DuplicateScannerUtils._filterToScanPattern = function(filterString) {
+ let filter = JSON.parse(filterString);
+ return _DuplicateScannerUtils._filterChildsToScanPattern(filter.filter.childs, filter.filter.operator);
+}
+
+_DuplicateScannerUtils._filterChildsToScanPattern = function(childs, operator) {
+ let group = "";
+ for (let i = 0; i < childs.length; i++) {
+ if (group != ""){
+ group = group + " " + operator+ " ";
+ }
+ if (childs[i].type == "row"){
+ group = group + _DuplicateScannerUtils._filterChildsRowToScanPattern(childs[i].name, childs[i].operator, childs[i].value);
+ } else if (childs[i].type == "group") {
+ group = group + "(" + _DuplicateScannerUtils._filterChildsToScanPattern(childs[i].childs, childs[i].operator) + ")";
+ }
+ }
+ return group;
+}
+
+_DuplicateScannerUtils._filterChildsRowToScanPattern = function (name, operator, value) {
+ let row = "";
+ row = row + name.toLowerCase() + ':({"entityfield":"' + name + '"';
+ switch (operator){
+ case 'NOT_EQUAL':
+ row = row + ', "exclude":' + JSON.parse(value);
+ case 'ISNOTNULL':
+ row = row + ', "empty":' + false;
+ }
+ row = row + '})';
+ return row;
+}
+
_DuplicateScannerUtils._loadEntityFieldConfigsFromPattern = function(indexPattern)
{
return indexPattern.match(/[^{}]+(?=\})/g);
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 94a4ab8ba9daa08c1021663cb1d6435a661e94c7..34ae40ebfa34a87d89f1a84131521b9220e36b06 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -78,8 +78,9 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
* @param {String} pComingFrom source from where you started (e.g. "Person", "Organisation" )
* @param {String} pEmailFilename optional file name of the email.
* @param {String} [pAdditionalPlaceholders] additional placeholders for the email
+ * @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
*/
-EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders)
+EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom, pAttachmentArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
{
var params = {
"ContactId_param" : pToContactId,
@@ -87,7 +88,8 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComing
"ComingFrom_param" : pComingFrom,
"NotificationMsg_param" : pNotificationMsg,
"EmailFilename" : pEmailFilename,
- "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders)
+ "AdditionalPlaceholders_param" : JSON.stringify(pAdditionalPlaceholders),
+ "OfferId_param" : pOfferId
};
if (pToEmailAddress)
@@ -111,14 +113,15 @@ EmailWritingUtils.getMailbridgeAddress = function ()
* @param {String} pNotificationMsg message which will be shown after the operation is done.
* @param {String} pEmailFilename optional file name of the email.
* @param {String} [pAdditionalPlaceholders] additional placeholders for the email
+ * @param {String} [pOfferId] optional needed for the offerEmails, to change the status of the offer
* Report have to be a object with these attrs: content (base64 encoded report), contentType (mimeType of the report), filename (complete filename with filending)
*/
-EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders)
+EmailWritingUtils.sendReportAsMail = function (pRecipient, pReportArray, pComingFrom, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId)
{
var pRecpientEmail = newSelect("COMMUNICATION.ADDR").from("COMMUNICATION")
.where("COMMUNICATION.CONTACT_ID", pRecipient).and("COMMUNICATION.MEDIUM_ID", "COMMEMAIL").cell();
- EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders);
+ EmailWritingUtils.openNewMail(pRecipient, pRecpientEmail, pComingFrom, pReportArray, pNotificationMsg, pEmailFilename, pAdditionalPlaceholders, pOfferId);
}
/**
diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index 9997efa52934025c8d61e7cd6eb8414737af9fe8..a4fbd6bd4e44b0b1068e110f60e27107bceb47ee 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -20,7 +20,7 @@ KeywordData.getSimpleData = function (pKeywordContainer, pLocale, pOnlyActives)
var identifier = "KeywordSimpleData_" + pKeywordContainer + flags;
var cache = new CachedData(identifier, true, pLocale);
return cache.load(function (pTranslationNecessary, pLocale){
- var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE")
+ var keywordEntrySelect = newSelect("AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ENTRY.TITLE", "Data_alias")
.from("AB_KEYWORD_ENTRY")
.orderBy("AB_KEYWORD_ENTRY.SORTING asc, AB_KEYWORD_ENTRY.TITLE asc")
.where("AB_KEYWORD_ENTRY.CONTAINER", pKeywordContainer);
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 2ae7c40b6e90dc3d207d4441cbeb3abeadfd128c..76562cebe08f90b4ce28a46a9f1265b5741a8ec0 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -21,6 +21,11 @@ $KeywordRegistry._autoPad = function(pKey){return (pKey + "
$KeywordRegistry.attributeType = function(){return "AttributeType";};
$KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
+$KeywordRegistry.keywordAttributeType$char = function(){return "CHAR";};
+$KeywordRegistry.keywordAttributeType$number = function(){return "NUMBER";};
+$KeywordRegistry.keywordAttributeType$bool = function(){return "BOOLEAN";};
+$KeywordRegistry.keywordAttributeType$longChar = function(){return "LONGCHAR";};
+
$KeywordRegistry.contractPayment = function(){return "ContractPayment";};
$KeywordRegistry.contractStatus = function(){return "ContractStatus";};
@@ -286,4 +291,6 @@ $KeywordRegistry.visitRecommendationPrioSource = function(){return $KeywordRegis
$KeywordRegistry.visitRecommendationPrioSource$visitFrequency = function(){return $KeywordRegistry._autoPad("VISITFREQUENCY");};
$KeywordRegistry.visitRecommendationPrioSource$manual = function(){return $KeywordRegistry._autoPad("MANUAL");};
-$KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
\ No newline at end of file
+$KeywordRegistry.workflowCategory = function(){return "WorkflowCategory";};
+
+$KeywordRegistry.notificationState = function () { return "NotificationState";};
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index d49860b7ac46e5f1f8d093310260d8406de9b0e0..ee03a52bec3a0052633d48aace52aeb834a107da 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -283,8 +283,21 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
return priceLists[list];
}
//customer deposited price list (defined by Attribute)
- if (priceListFilter.priceList != "" && priceListFilter.priceList == priceLists[list].priceList) {
- return priceLists[list];
+ if (priceListFilter.priceList != "") {
+ var res;
+ var escape;
+ // runs trough the possible pricelists to find the one with the correct pricelist ("-type").
+ // e.g: PRICELISTSERVICE, PRICELISTSPECIAL, PRICELISTKEY, PRICELISTDEFAULT
+ for(var index in priceLists)
+ {
+
+ if (priceLists[index]["priceList"] == priceListFilter.priceList)
+ {
+ res = priceLists[index]; //The first time the condition is true the correct pricelist is found.
+ break; // The object is ordered by fromQuantity descending so we have to stop after the condition is true
+ }
+ }
+ return res;
}
//default price list
if (priceLists[list].priceList == $KeywordRegistry.productPricelist$standardList()) {
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/process/ctiServerEvents/process.js b/process/ctiServerEvents/process.js
index ecb4f7e36158f19b8473870b9b5c2f280934b8dd..e0df2b323d8dc904b125b3c44fc12db5a50a5fe2 100644
--- a/process/ctiServerEvents/process.js
+++ b/process/ctiServerEvents/process.js
@@ -62,6 +62,8 @@ var ringingHandlerFn = function()
var affectedContext = this.contactsCall[0].PERSON_ID.trim() == "" ? "Organisation" : "Person";
notificationConfig.linkInfo(text.encodeMS([affectedContext, affectedContactId]));
}
+
+ notificationConfig.initialState(notification.STATE_CONFIRMED);
notification.addNotificationWith(notificationConfig);
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