diff --git a/.aditoprj/ignoredScanServiceTasks.json b/.aditoprj/ignoredScanServiceTasks.json
index 7a82a0675d76038ae9b1c576dcc22b21ae577991..d621cb1f862cc1fd76cc2c1bca508bf89cbf5c34 100644
--- a/.aditoprj/ignoredScanServiceTasks.json
+++ b/.aditoprj/ignoredScanServiceTasks.json
@@ -78,144 +78,6 @@
"description": "There is no index for the column \"DEPLOYMENT_ID\" in the table \"DATABASECHANGELOG\" [59]",
"groupName": "nb-tasklist-warning"
},
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObserverationEditGeneric/fields/entityField/NOTIFICATION_PRIO [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_FIELD\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_FIELD [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_FILTER\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_FILTER [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_ID\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_ID [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_TYPE\" located in: ObserverationEditGeneric/fields/entityField/OBJECT_TYPE [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBSERVER\" located in: ObserverationEditGeneric/fields/entityField/OBSERVER [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"TRIGGEREVENTDELETE\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTDELETE [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"TRIGGEREVENTINSERT\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTINSERT [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationEdit_view/ObservationEdit_view.aod",
- "line": -1,
- "description": "Dead Reference \"TRIGGEREVENTUPDATE\" located in: ObserverationEditGeneric/fields/entityField/TRIGGEREVENTUPDATE [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
- "line": -1,
- "description": "Dead Reference \"FilterActions\" located in: ObservationFilterTreeTable/favoriteActionGroup1/FilterActions [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
- "line": -1,
- "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObservationFilterTreeTable/columns/entityField/NOTIFICATION_PRIO [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_TYPE\" located in: ObservationFilterTreeTable/columns/entityField/OBJECT_TYPE [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBSERVATION_ID\" located in: ObservationFilterTreeTable/parentField/OBSERVATION_ID [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
- "line": -1,
- "description": "Dead Reference \"OnlyMyObservations_param\" located in: neonDashletConfiguration/parameters/OnlyMyObservations_param [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationFilter_view/ObservationFilter_view.aod",
- "line": -1,
- "description": "Dead Reference \"observationType\" located in: ObservationFilterTreeTable/columns/entityField/observationType [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"NOTIFICATION_PRIO\" located in: ObservationPreviewCard/subtitleField/NOTIFICATION_PRIO [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_FIELD\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_FIELD [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_FILTER\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_FILTER [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_ID\" located in: ObservationPreviewGeneric/fields/entityField/OBJECT_ID [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"OBJECT_TYPE\" located in: ObservationPreviewCard/titleField/OBJECT_TYPE [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"TRIGGEREVENTDELETE\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTDELETE [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"TRIGGEREVENTINSERT\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTINSERT [67]",
- "groupName": "nb-tasklist-warning"
- },
- {
- "target": "neonView/ObservationPreview_view/ObservationPreview_view.aod",
- "line": -1,
- "description": "Dead Reference \"TRIGGEREVENTUPDATE\" located in: ObservationPreviewScoreCard/fields/entityField/TRIGGEREVENTUPDATE [67]",
- "groupName": "nb-tasklist-warning"
- },
{
"target": "neonView/SalesprojectAnalysesPhases_view/SalesprojectAnalysesPhases_view.aod",
"line": -1,
diff --git a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
index 6cf5d524b1420157e979a3d41c742b3f3e586a6d..e45780f3a8c5af0b7c44f1ac39841430fe1a3feb 100644
--- a/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.0/changelog.xml
@@ -13,4 +13,4 @@
<include relativeToChangelogFile="true" file="EwsContactSync/changelog.xml"/>
<include relativeToChangelogFile="true" file="Export/changelog.xml"/>
<include relativeToChangelogFile="true" file="insert_ProductGroupcode.xml"/>
-</databaseChangeLog>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1f04bc2b9923e4c127ec5e87d952657c13dd6933
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/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="insertBulkMailSenderAddressKeyword.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0fc18b63a15ed14e6486279434c15da61ad7cc5f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/BulkMail/insertBulkMailSenderAddressKeyword.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="m.groppe" id="50badea9-da46-4aa0-94ed-a2c3db2874ac">
+ <insert tableName="AB_KEYWORD_CATEGORY">
+ <column name="AB_KEYWORD_CATEGORYID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+ <column name="NAME" value="BulkmailSenderAddress"/>
+ <column name="SORTINGBY" valueNumeric="0"/>
+ <column name="SORTINGDIRECTION" value="ASC"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="c4773a13-314d-4f00-a7d3-ab65947586ba"/>
+ <column name="KEYID" value="news@adito.de"/>
+ <column name="TITLE" value="news@adito.de"/>
+ <column name="CONTAINER"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="3f31d08d-bf59-4bb7-9e96-7f026571cb79"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Employee/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Employee/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d71510f3a08b861f96016cdf609308c9b510007e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Employee/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="insert_ServiceDepartment.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Employee/insert_ServiceDepartment.xml b/.liquibase/Data_alias/basic/2021.2.2/Employee/insert_ServiceDepartment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2b0bafe8d7cbd9958edf719ce06a9dda40a0b6fe
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Employee/insert_ServiceDepartment.xml
@@ -0,0 +1,35 @@
+<?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="v.broens" id="ce4bcbe5-e2a6-468d-8481-6bef9d538de5">
+ <update tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_NAME" value="IT"/>
+ <where> AB_ATTRIBUTEID = 'e47c7fb1-1072-4f03-a275-e4b6331deec1'</where>
+ </update>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Service"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="5"/>
+ </insert>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="30324d52-53c6-4e2b-a604-38a35a2184e0"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Office staff"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a4048b9a-1c5e-45b5-8996-9b68d3e78af8"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="ATTRIBUTE_NAME" value="Field staff"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="de14c675-2734-4991-82c7-88e8c6dfe3b7"/>
+ <column name="ATTRIBUTE_TYPE" value="VOID"/>
+ <column name="SORTING" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Mailbridge/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Mailbridge/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6bf1aea5c371197b01bad7bf47e80161512345aa
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Mailbridge/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="insert_InboxFilterComponent.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Mailbridge/insert_InboxFilterComponent.xml b/.liquibase/Data_alias/basic/2021.2.2/Mailbridge/insert_InboxFilterComponent.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ea752f5f890da25f7cf6d0cb264c6809fd8e8870
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Mailbridge/insert_InboxFilterComponent.xml
@@ -0,0 +1,17 @@
+<?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="" id="27c0ee46-a456-479e-a5b6-27e4624f6b18">
+ <insert tableName="ab_keyword_entry">
+ <column name="AB_KEYWORD_ENTRYID" value="958021c1-e025-4d8c-8cfb-0d963d609dc2"/>
+ <column name="KEYID" value="SUBJECT_BODY"/>
+ <column name="TITLE" value="Subject and Body"/>
+ <column name="CONTAINER" value="InboxFilterComponent"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="7723f275-e9b2-4a77-92de-e2e558638664"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Mosaico/append_mosaicoTemplateCategory.xml b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/append_mosaicoTemplateCategory.xml
new file mode 100644
index 0000000000000000000000000000000000000000..62ada358254d029efe897ff7d8b52e309839fbe3
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/append_mosaicoTemplateCategory.xml
@@ -0,0 +1,17 @@
+<?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="a.fraeder" id="b564a74d-cba8-406d-8a54-f56663f02c09">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="a5e6edd3-35cb-4da0-b1c2-463e5ad5cae9"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="be28e8a4-08d4-4697-b248-8b97b4e6e749"/>
+ <column name="KEYID" value="LANDINGPAGE"/>
+ <column name="TITLE" value="Landingpage"/>
+ <column name="CONTAINER" value="MosaicoTemplateCategory"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Mosaico/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1bdc1fd3b6bea6ee93fb3d8a8ebe9a86f8de7e74
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/changelog.xml
@@ -0,0 +1,7 @@
+<?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="insert_mosaico_color_keyword.xml"/>
+ <include relativeToChangelogFile="true" file="append_mosaicoTemplateCategory.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Mosaico/insert_mosaico_color_keyword.xml b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/insert_mosaico_color_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a2229c68a8666f714d2402c776c0add77d864d6b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Mosaico/insert_mosaico_color_keyword.xml
@@ -0,0 +1,63 @@
+<?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="m.groppe" id="38c3216e-d0dd-4f4b-97fd-2a76d8892a72">
+ <insert tableName="AB_KEYWORD_CATEGORY">
+ <column name="AB_KEYWORD_CATEGORYID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+ <column name="NAME" value="MosaicoColor"/>
+ <column name="SORTINGBY" valueNumeric="0"/>
+ <column name="SORTINGDIRECTION" value="ASC"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="0037e823-4e16-4504-9f26-82dd226733f0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+ <column name="KEYID" value="0B2D3A"/>
+ <column name="TITLE" value="Adito dark blue"/>
+ <column name="CONTAINER" value="MosaicoColor"/>
+ <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="6f3b9635-679c-47b4-9fe3-0770aaca719c"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+ <column name="KEYID" value="009AB9"/>
+ <column name="TITLE" value="Adito light blue"/>
+ <column name="CONTAINER" value="MosaicoColor"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b9ce199e-a4e1-4b48-ba61-85ee6139b89c"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+ <column name="KEYID" value="ED1652"/>
+ <column name="TITLE" value="Adito red"/>
+ <column name="CONTAINER" value="MosaicoColor"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="09f299f7-9faa-40c4-a53d-e7b5c33dca53"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+ <column name="KEYID" value="EEF5F7"/>
+ <column name="TITLE" value="Adito grey"/>
+ <column name="CONTAINER" value="MosaicoColor"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="692699de-d7ad-4500-b71e-153555a2ceac"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="dc4cc24d-5df2-481f-a028-8d22ce6f6e64"/>
+ <column name="KEYID" value="FFFFFF"/>
+ <column name="TITLE" value="White"/>
+ <column name="CONTAINER" value="MosaicoColor"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offer/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Offer/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..43d3f1056899fb14bc1b977c3a956d5a35346b4a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offer/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="update_OfferSetZeroProbability.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offer/update_OfferSetZeroProbability.xml b/.liquibase/Data_alias/basic/2021.2.2/Offer/update_OfferSetZeroProbability.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c473d075052c034844cc364b734fcb90884efae4
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offer/update_OfferSetZeroProbability.xml
@@ -0,0 +1,19 @@
+<?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="02eac203-25b5-480c-a73b-364d1c76d051">
+ <update tableName="OFFER">
+ <column name="PROBABILITY" valueNumeric="0"/>
+ <where>PROBABILITY is null</where>
+ </update>
+ <addDefaultValue
+ columnDataType="NUMERIC(14,2)"
+ columnName="PROBABILITY"
+ defaultValueNumeric="0"
+ tableName="OFFER"/>
+ <addNotNullConstraint
+ columnDataType="NUMERIC(14,2)"
+ columnName="PROBABILITY"
+ tableName="OFFER"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_offer.xml b/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_offer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1a4e28becff4011d16f6cf85748d990a449374ea
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_offer.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 author="p.neub" id="a76dd9e5-5b66-4b5d-8c93-9fc8104f695e">
+ <dropColumn tableName="OFFER">
+ <column name="DISCOUNTED_NET"/>
+ <column name="DISCOUNTED_VAT"/>
+ </dropColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_order.xml b/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_order.xml
new file mode 100644
index 0000000000000000000000000000000000000000..eb835d2ca05bface467d9293e68619aeb3119eb5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/alter_order.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 author="p.neub" id="b5cd257d-1df9-4704-9e66-45c220c67158">
+ <dropColumn tableName="SALESORDER">
+ <column name="DISCOUNTED_NET"/>
+ <column name="DISCOUNTED_VAT"/>
+ </dropColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7179a953f3f64c2cc67f6d6355cbfff16e564e78
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/OfferOrder/changelog.xml
@@ -0,0 +1,7 @@
+<?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="alter_offer.xml"/>
+ <include relativeToChangelogFile="true" file="alter_order.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offeritem/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..17b59f34cb8941cf482c762276660a4c7099f156
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/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="update_OfferitemSetZeroDiscount.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Offeritem/update_OfferitemSetZeroDiscount.xml b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/update_OfferitemSetZeroDiscount.xml
new file mode 100644
index 0000000000000000000000000000000000000000..206cf4f999182c0d71aa169971235c39d0d334ff
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Offeritem/update_OfferitemSetZeroDiscount.xml
@@ -0,0 +1,19 @@
+<?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="2372c4db-0f58-474a-bb00-71ddd5776ff7">
+ <update tableName="OFFERITEM">
+ <column name="DISCOUNT" valueNumeric="0"/>
+ <where>DISCOUNT is null</where>
+ </update>
+ <addDefaultValue
+ columnDataType="NUMERIC(14,2)"
+ columnName="DISCOUNT"
+ defaultValueNumeric="0"
+ tableName="OFFERITEM"/>
+ <addNotNullConstraint
+ columnDataType="NUMERIC(14,2)"
+ columnName="DISCOUNT"
+ tableName="OFFERITEM"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Person/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Person/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d07fccaf8322be29e8a370377c947344af22881b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Person/changelog.xml
@@ -0,0 +1,7 @@
+<?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="insert_ServiceRole.xml"/>
+ <include relativeToChangelogFile="true" file="insert_ServiceDeparment.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceDeparment.xml b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceDeparment.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a53d52b0996a78243e52635c7268ecf4d427996c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceDeparment.xml
@@ -0,0 +1,17 @@
+<?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="v.broens" id="bf635bf3-a1db-4c23-8a09-718b98847aa4">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="26c175af-c13d-4056-8ac3-b69a3dcb387c"/>
+ <column name="KEYID" value="CONTACTSERVICE"/>
+ <column name="TITLE" value="Service"/>
+ <column name="CONTAINER" value="ContactDepartment"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="cda5deac-5b7c-4c98-9904-2eb3b224235d"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceRole.xml b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceRole.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dd8e827f3b02ac665fa7bc7e9f5c23f5b6300ac5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Person/insert_ServiceRole.xml
@@ -0,0 +1,17 @@
+<?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="v.broens" id="23b94ef5-1ff8-4f8b-9411-29ea69f17912">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b1f74f90-bfe3-4062-a018-cdfe839e62cb"/>
+ <column name="KEYID" value="CONTACTROLESERVICE"/>
+ <column name="TITLE" value="Service Manager"/>
+ <column name="CONTAINER" value="ContactContactrole"/>
+ <column name="SORTING" valueNumeric="8"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="866fd65f-131c-4038-99ce-78606971ec98"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e2399a10ecb43adf4f250ceaad663cc85e190084
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/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="update_SalesorderitemSetZeroDiscount.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/update_SalesorderitemSetZeroDiscount.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/update_SalesorderitemSetZeroDiscount.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f50ad6ccaddfc3e85b4d7f8439acc1d254daac25
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesorderitem/update_SalesorderitemSetZeroDiscount.xml
@@ -0,0 +1,19 @@
+<?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="f1176133-6149-4e3a-a19c-0199c2ea6c00">
+ <update tableName="SALESORDERITEM">
+ <column name="DISCOUNT" valueNumeric="0"/>
+ <where>DISCOUNT is null</where>
+ </update>
+ <addDefaultValue
+ columnDataType="NUMERIC(14,2)"
+ columnName="DISCOUNT"
+ defaultValueNumeric="0"
+ tableName="SALESORDERITEM"/>
+ <addNotNullConstraint
+ columnDataType="NUMERIC(14,2)"
+ columnName="DISCOUNT"
+ tableName="SALESORDERITEM"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesproject/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..be255f7f32e9a0ec54ec66b2dc76f5b5eacccbe1
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/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="update_SalesprojectSetZeroProbability.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/Salesproject/update_SalesprojectSetZeroProbability.xml b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/update_SalesprojectSetZeroProbability.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ab47beff7163fd059ca3d260ab064c1dbac32f5f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/Salesproject/update_SalesprojectSetZeroProbability.xml
@@ -0,0 +1,19 @@
+<?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="c32865a9-ed82-44e5-814c-b8953d710e4d">
+ <update tableName="SALESPROJECT">
+ <column name="PROBABILITY" valueNumeric="0"/>
+ <where>PROBABILITY is null</where>
+ </update>
+ <addDefaultValue
+ columnDataType="DECIMAL(6, 2)"
+ columnName="PROBABILITY"
+ defaultValueNumeric="0"
+ tableName="SALESPROJECT"/>
+ <addNotNullConstraint
+ columnDataType="DECIMAL(6, 2)"
+ columnName="PROBABILITY"
+ tableName="SALESPROJECT"/>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_contact_relation.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_contact_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..81e6ba18257b4dcbefaf2ad445bc87da46d24806
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_contact_relation.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="ce615720-6c32-4c81-b86b-702ffb6d0f18">
+ <addColumn tableName="employeegroup_contact_relation">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_rule.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_rule.xml
new file mode 100644
index 0000000000000000000000000000000000000000..22d342ab3d6e8a4ed3888d86c9ec5dd705058d2c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_rule.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="0224dc71-d58c-4ac8-ba02-7390718de9b3">
+ <addColumn tableName="employeegroup_rule">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_rulegroup_relation.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_rulegroup_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..e91304f40f8cdf2cd5bb172e9ff347aeecc07a4b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_employeegroup_rulegroup_relation.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="01f80b77-6b0d-4b21-a7ad-97515129b646">
+ <addColumn tableName="employeegroup_rulegroup_relation">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inbox.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inbox.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6370eb49e0dda7721870eeb3fd42ce01a6cfe0f5
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inbox.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="df5487f4-2039-476d-a227-4115a298fc02">
+ <addColumn tableName="inbox">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inbox_employeegroup_relation.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inbox_employeegroup_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..efe56b77bcef719407a12696997acdd68a5c2acb
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inbox_employeegroup_relation.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="f6644f41-3796-4690-9a3e-bb89fba748cb">
+ <addColumn tableName="inbox_employeegroup_relation">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inboxfilter.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inboxfilter.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7d6bb21f9371202bdc7c093d3cd5fe3b577daba7
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inboxfilter.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="e39e175d-01ed-424c-bbb1-8a2b06cb2dfe">
+ <addColumn tableName="inboxfilter">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inboxfiltergroup_relation.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inboxfiltergroup_relation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f2e4c95d5ea67efa01cc1f772904868c60d8e4bb
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_inboxfiltergroup_relation.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="2277b6b5-8435-4df9-a243-5fdb600756c4">
+ <addColumn tableName="inboxfiltergroup_relation">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_mailsignature.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_mailsignature.xml
new file mode 100644
index 0000000000000000000000000000000000000000..25005a2cebb6c0b2a1ed61404276caa0906e5707
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_mailsignature.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="680730b8-37e4-4c3d-829f-35e61af0d68a">
+ <addColumn tableName="mailsignature">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_ticket.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_ticket.xml
new file mode 100644
index 0000000000000000000000000000000000000000..569387f3284795b010506374638f4d6358bfaf3f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_ticket.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="8f027f3f-b02f-461f-98b5-fc21f8ece230">
+ <addColumn tableName="ticket">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_tickettemplate.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_tickettemplate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d87056fc956222e2e16a8c50e67ec56c9fa27a2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/add_tickettemplate.xml
@@ -0,0 +1,13 @@
+<?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="V.Broens" id="3a4f4400-362d-4a08-9219-c37df019e001">
+ <addColumn tableName="tickettemplate">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="DATE_NEW" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_employeegroup.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_employeegroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a27e9b3843e763c5a4224aff367230743954ca00
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_employeegroup.xml
@@ -0,0 +1,17 @@
+<?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="V.Broens" id="967d7bab-8c00-4942-aa49-45c6d3e64ea0">
+ <renameColumn
+ columnDataType="DATETIME"
+ newColumnName="DATE_NEW"
+ oldColumnName="DATE"
+ tableName="employeegroup"/>
+ <addColumn tableName="employeegroup">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_employeegroup_rulegroup.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_employeegroup_rulegroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b0f90988322b9192f39d2953d191a179bb4aeb2c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_employeegroup_rulegroup.xml
@@ -0,0 +1,17 @@
+<?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="V.Broens" id="5478a352-7092-4113-808c-24da1e96a55d">
+ <renameColumn
+ columnDataType="DATETIME"
+ newColumnName="DATE_NEW"
+ oldColumnName="DATE"
+ tableName="employeegroup_rulegroup"/>
+ <addColumn tableName="employeegroup_rulegroup">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_inboxfiltergroup.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_inboxfiltergroup.xml
new file mode 100644
index 0000000000000000000000000000000000000000..fdb4e0e51195bb98b84e141a987c4b05e47f1b72
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/alter_inboxfiltergroup.xml
@@ -0,0 +1,17 @@
+<?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="V.Broens" id="262b1c8d-fdf7-4bdf-8413-4f98761c0fce">
+ <renameColumn
+ columnDataType="DATETIME"
+ newColumnName="DATE_NEW"
+ oldColumnName="DATE"
+ tableName="inboxfiltergroup"/>
+ <addColumn tableName="inboxfiltergroup">
+ <column name="DATE_EDIT" type="DATETIME"/>
+ <column name="USER_NEW" type="NVARCHAR(50)"/>
+ <column name="USER_EDIT" type="NVARCHAR(50)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..cd397f6a20d70889a5e7aa0ad5711f226886e043
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/StandardColumns/changelog.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">
+ <include relativeToChangelogFile="true" file="add_employeegroup_contact_relation.xml"/>
+ <include relativeToChangelogFile="true" file="add_employeegroup_rule.xml"/>
+ <include relativeToChangelogFile="true" file="add_employeegroup_rulegroup_relation.xml"/>
+ <include relativeToChangelogFile="true" file="add_inbox.xml"/>
+ <include relativeToChangelogFile="true" file="add_inbox_employeegroup_relation.xml"/>
+ <include relativeToChangelogFile="true" file="add_inboxfilter.xml"/>
+ <include relativeToChangelogFile="true" file="add_inboxfiltergroup_relation.xml"/>
+ <include relativeToChangelogFile="true" file="add_mailsignature.xml"/>
+ <include relativeToChangelogFile="true" file="add_ticket.xml"/>
+ <include relativeToChangelogFile="true" file="add_tickettemplate.xml"/>
+ <include relativeToChangelogFile="true" file="alter_employeegroup.xml"/>
+ <include relativeToChangelogFile="true" file="alter_employeegroup_rulegroup.xml"/>
+ <include relativeToChangelogFile="true" file="alter_inboxfiltergroup.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml b/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7451fe72e3df6a6ad0dd1b235dc67662d9feac2
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_display-name_prospective-customer.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.tran" id="5e9314bc-291b-4396-a155-e1a06afcbb1c">
+ <update tableName="AB_ATTRIBUTE">
+ <column name="ATTRIBUTE_NAME" value="Existing customer" />
+ <where>AB_ATTRIBUTEID = 'be3b5fe2-2146-4eab-80a4-3c1cf4d6156a'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml b/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a823261ccfd831ccb5b8d91b64ede62555de77a0
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_display-value_task-status-completed_keyword.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.tran" id="8f556a75-720c-45b6-9cfe-c26308f96a65">
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="TITLE" value="completed" />
+ <where>AB_KEYWORD_ENTRYID = '7311d8c5-edf2-492e-be4d-6f0469334611'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml b/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
new file mode 100644
index 0000000000000000000000000000000000000000..34559711345a7dc050d25e33b4f3ea18f1d6e52d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/alter_relation-type-title_grandchildof.xml
@@ -0,0 +1,9 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="d.tran" id="f420d656-da64-4ac2-aa10-8ce529479240">
+ <update tableName="AB_OBJECTRELATIONTYPE">
+ <column name="RELATION_TITLE" value="grandchild of" />
+ <where>AB_OBJECTRELATIONTYPEID = 'a2296f93-2371-4ab8-9f29-ef0795d1e9b2'</where>
+ </update>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
index d305c8241e2e7d485b6ae523c45de336e141c76d..99965c48e688f6233a99f168ddacbdffe26874bf 100644
--- a/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
+++ b/.liquibase/Data_alias/basic/2021.2.2/changelog.xml
@@ -2,6 +2,21 @@
<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="alter_relation-type-title_grandchildof.xml"/>
+ <include relativeToChangelogFile="true" file="alter_display-value_task-status-completed_keyword.xml"/>
+ <include relativeToChangelogFile="true" file="alter_display-name_prospective-customer.xml"/>
+ <include relativeToChangelogFile="true" file="Offer/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="lead_nurturing/changelog.xml"/>
<include relativeToChangelogFile="true" file="add_offer_showprice.xml"/>
<include relativeToChangelogFile="true" file="Ticket/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="StandardColumns/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Person/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Offeritem/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Salesorderitem/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Salesproject/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Employee/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Mosaico/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Mailbridge/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="OfferOrder/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="BulkMail/changelog.xml"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.xml b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.xml
new file mode 100644
index 0000000000000000000000000000000000000000..56ef3124b273a9968118dda08e565c4bf92d5a54
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/alter_bulkmail.xml
@@ -0,0 +1,13 @@
+<?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="m.groppe" id="1801edd3-72d9-4297-8b9b-7ac14cb57884">
+ <addColumn tableName="BULKMAIL">
+ <column name="CAMPAIGN_ID" type="CHAR(36)"/>
+ </addColumn>
+ <createIndex indexName="IDX_BULKMAIL_CAMPAIGN_ID" tableName="BULKMAIL">
+ <column name="CAMPAIGN_ID" />
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/changelog.xml b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ed0b6f78cdbe379dcbad60271d42421a88f4fd0e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/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 relativeToChangelogFile="true" file="alter_bulkmail.xml"/>
+ <include relativeToChangelogFile="true" file="insert_adHocMailBulkMailStatus.xml"/>
+ <include relativeToChangelogFile="true" file="insert_documentTemplateTypeDownload.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a86582d63eed6938eb9991386344ebf05948fa15
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_adHocMailBulkMailStatus.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="m.groppe" id="246a1182-ff3c-461a-b533-ae305f0468a6">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
+ <column name="KEYID" value="BULKMAILADHOC"/>
+ <column name="TITLE" value="Ad hoc"/>
+ <column name="CONTAINER" value="BulkMailStatus"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="76fc02b9-a1b6-4c76-bdd5-a52d0e1ef286"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cfb85e46-8af0-432c-a783-251333c999bf"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="b0fe2c5e-7195-497c-9a47-5837e0ce30a8"/>
+ <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.xml b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a7652f40db52495012574a2877e062699f8d77bf
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2021.2.2/lead_nurturing/insert_documentTemplateTypeDownload.xml
@@ -0,0 +1,16 @@
+<?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="m.groppe" id="212e1f2b-9913-4555-b7d4-74b848c4712e">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="ec364de4-a2ef-47f0-a9ec-adec4496fbd0"/>
+ <column name="AB_KEYWORD_CATEGORY_ID" value="b5afd40b-bfa7-4aee-89ea-06b8c7deb304"/>
+ <column name="KEYID" value="DOWNLOAD"/>
+ <column name="TITLE" value="Download"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
index 0998fd9809252b07a75d271b94e44c0b479ebdcd..231a2e8745fe1a30b280ea4c203103ed13e58fca 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_objectrelationtype.xml
@@ -90,7 +90,7 @@
<column name="HIERARCHY" valueNumeric="0"/>
<column name="ICON" value="VAADIN:FAMILY"/>
<column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
- <column name="RELATION_TITLE" value="Grandchild of"/>
+ <column name="RELATION_TITLE" value="grandchild of"/>
</insert>
<insert tableName="ab_objectrelationtype">
<column name="SIDE" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
index 4d8f39ff9f74cac2c7d55e23c63f1bbe6fd07d28..cbf8ccdc7c2810f42c27113cb3a016d0a3e93c7f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/communication.xml
@@ -1,1604 +1,1770 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="autogenerated" id="85339226-13ab-4563-93c1-4483ffcfe5d2">
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-4.1.xsd">
+ <changeSet author="s.pongratz" id="8f3d0fa3-5f8b-46a9-ad7b-419eb2e4be96">
<delete tableName="communication"/>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="00d07819-985b-4efe-a634-da71ae482907"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:26:09"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="https://meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMINTERNET"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="05d24d50-677f-4c7a-9f39-8a8082f267cd"/>
- <column name="DATE_EDIT" valueDate="2019-06-07T02:41:44"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="info@skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:31:52"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="0a4410ef-bd92-4baa-95db-632f82d1de94"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:46:14"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 941 52360"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T05:32:40"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="106b7d14-8973-4122-a9af-4ece26f4fd73"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:59:17"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 7541 56874-15"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
- <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="10e26e57-b3d3-4d99-be5b-d6ac924e729e"/>
- <column name="ADDR" value="willi.kainz@rocketmail.org"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-28T01:36:40"/>
- <column name="OBJECT_ROWID" value="fe7456a0-16ff-4c5d-a856-3c9d743f7535"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="11b513f0-4fef-4525-976e-f08740d57c44"/>
- <column name="DATE_EDIT" valueDate="2021-06-29T09:05:48"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="+49 40 42580"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:45:42"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="14216c79-e688-46f4-9cc7-d3c140dea0eb"/>
- <column name="ADDR" value="hotline@brandt-feldmann-ag.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="0"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-29T08:22:35"/>
- <column name="OBJECT_ROWID" value="c786372f-4e8d-4ed0-b573-1d9993b6ff46"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="14a01219-985b-4efe-a634-da71ae482907"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:25:49"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="meinefirma@adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="14d01219-985b-4efe-a634-da71ae482907"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:30:03"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="ppfiffig@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="14d05619-985b-4efe-a634-da71ae482907"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:29:54"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="lsommer@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="14df395d-2efe-4e5b-9413-df0268ef1d44"/>
- <column name="ADDR" value="+49 160 98712364"/>
- <column name="MEDIUM_ID" value="COMMMOBIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T11:03:55"/>
- <column name="OBJECT_ROWID" value="42397577-c00b-4434-859e-0766ab40bf8b"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="1abdb349-b66e-46df-8cfa-f44bf8845575"/>
- <column name="ADDR" value="jgruber@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T10:57:51"/>
- <column name="OBJECT_ROWID" value="7c0b4ee5-2012-4c91-8980-502c1602329b"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="1b708272-0803-4c65-a4ac-b9b676d08af7"/>
- <column name="ADDR" value="lreiter@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-06T12:18:05"/>
- <column name="OBJECT_ROWID" value="1102ffa0-b2b3-4a67-8c77-507517989f17"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="1ee5df44-f8ca-477e-a6d1-f8fee59d5d0e"/>
- <column name="ADDR" value="snagel@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:28:37"/>
- <column name="OBJECT_ROWID" value="43bed135-5650-4634-8cea-f0bc803a2e42"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="1fd3454a-f054-4472-8e53-26f9b4a0ce76"/>
- <column name="DATE_EDIT" valueDate="2019-05-23T11:23:53"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 40 63520"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:48:09"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="22d01219-985b-4efe-a634-da71ae482907"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:31:40"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664746"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="22d07819-985b-4efe-a634-da71ae482907"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:27:09"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="+49 8743 96640"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="2445a63f-85b7-40cc-ad99-0bc261f60db6"/>
- <column name="DATE_EDIT" valueDate="2019-06-07T02:46:11"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="https://www.industrial-steel.de"/>
- <column name="MEDIUM_ID" value="COMMINTERNET"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="2553feeb-6ca1-42a4-9581-f51c7e9dec8f"/>
- <column name="ADDR" value="+49 8743 9664234"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:32:40"/>
- <column name="OBJECT_ROWID" value="caafc567-f118-4ae0-babd-d3616ebd6cf9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="2561b25b-1af2-4512-a77f-97d542c578b7"/>
- <column name="ADDR" value="+49 40 6352-105"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-11T08:26:11"/>
- <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="270d381e-3d37-40d7-a776-4d6302ed60d2"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:46:49"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 89 36920"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T05:36:39"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="29db4625-1f5a-4ca0-81e0-f4636c011fd3"/>
- <column name="ADDR" value="wkainz@industrial-steel.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T11:03:53"/>
- <column name="OBJECT_ROWID" value="42397577-c00b-4434-859e-0766ab40bf8b"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="2b4aa05b-2268-496b-91d8-e2eb2029a4ef"/>
- <column name="ADDR" value="+49 8743 9664637"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:29:11"/>
- <column name="OBJECT_ROWID" value="f173b5f7-4276-472b-820b-d1b34811fdc9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="2f571583-f8d2-47ad-b183-8d9cab3b3c19"/>
- <column name="ADDR" value="info@grobbe-werk.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:11:18"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="38d42eff-c782-4ffa-80d7-db812cf1c6db"/>
- <column name="ADDR" value="psteiger@trans-logistics.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
- <column name="OBJECT_ROWID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:31:25"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="tadmin@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
- <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="3da6609c-79f0-449e-a236-3636368382f5"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:43:48"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 421 98650"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:46:23"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="3fb1a544-6a1d-420a-95b7-e98956b79539"/>
- <column name="ADDR" value="doyle@globgroup.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T04:01:21"/>
- <column name="OBJECT_ROWID" value="907bd419-77de-4a8c-8b9b-936c5393e5e7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="3fda2c6d-80c0-4af4-962a-1e04f89ea378"/>
- <column name="ADDR" value="chef@netro.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-29T08:00:41"/>
- <column name="OBJECT_ROWID" value="0cb0af25-dbd0-4e82-92e2-8afd03acbf36"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="417ce25b-8d42-47b2-b7df-1dfcc28075be"/>
- <column name="ADDR" value="https://skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMINTERNET"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="459d704e-f140-4927-aae3-771fecd2891a"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:43:26"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 4321 78990"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:34:41"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="4602f1f8-7a40-4c0d-bb92-649935d11bd6"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:33:11"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="hsmith@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
- <column name="OBJECT_ROWID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="4ba08e1c-7094-412c-b4a4-210a330f6d71"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:57:36"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 711 8754-32"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:22:23"/>
- <column name="OBJECT_ROWID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="4de9fc9d-0f57-458d-8302-4000e2dc6e1e"/>
- <column name="ADDR" value="info@fischer.tr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:55:17"/>
- <column name="OBJECT_ROWID" value="9c6c42c3-d9f8-4b92-a8c4-9c554e3844cc"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="4f3230c0-41e4-4861-880f-14ad0fcc5a35"/>
- <column name="ADDR" value="info@superbauer.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:32:15"/>
- <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="504d764b-25f4-4272-a43e-053041ab3534"/>
- <column name="ADDR" value="+49 40 425811"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-29T09:06:15"/>
- <column name="OBJECT_ROWID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="508e1a48-5e0d-4474-8059-ad495f3b629d"/>
- <column name="DATE_EDIT" valueDate="2019-06-07T02:43:55"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="info@document-solutions.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:24:31"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5136702b-2898-4db3-98d2-436772febc35"/>
- <column name="ADDR" value="+49 871 9751500"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="0"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
- <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5270133a-a59a-41c0-a812-2618c7557215"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T08:26:27"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 40 6352-109"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:04:03"/>
- <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="529cadf7-7e9c-4828-9497-6ce6effb1624"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:33:34"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="bleicht@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
- <column name="OBJECT_ROWID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="56e9d5fe-b77d-4321-938c-d331cd5b3e1e"/>
- <column name="ADDR" value="lkanzler@web.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:13:02"/>
- <column name="OBJECT_ROWID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5705eb99-f8a3-482c-9bcc-55a260b4bb1a"/>
- <column name="ADDR" value="cpabst@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:19:48"/>
- <column name="OBJECT_ROWID" value="cc0b2548-3657-45da-8226-ec5722f56539"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="58d01219-985b-4efe-a634-da71ae482907"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:32:11"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664333"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5c95cd5b-068d-46f5-b656-55e94200d976"/>
- <column name="ADDR" value="+49 8743 9664285"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:31:34"/>
- <column name="OBJECT_ROWID" value="cc0b2548-3657-45da-8226-ec5722f56539"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5d31f105-e04f-4824-8011-6b940f198b87"/>
- <column name="ADDR" value="gl@meister-messebau.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T10:53:39"/>
- <column name="OBJECT_ROWID" value="a4eabe23-533f-4a1e-bbdb-ba2b406d3590"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5e9910d0-5ace-4dcd-b35f-f92d84e64562"/>
- <column name="ADDR" value="gweingartner@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T10:51:45"/>
- <column name="OBJECT_ROWID" value="7de6316b-62aa-4bea-a186-702c1b87a15c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5ea00579-3eb5-4c1f-9396-63a15b134f60"/>
- <column name="ADDR" value="info@industrial-steel.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:19:53"/>
- <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="5f9aaf24-69d7-4089-a31d-e15d6d55dc92"/>
- <column name="ADDR" value="info@sevent.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:30:12"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="600317f2-e2c6-4e46-903b-4db8539d6c21"/>
- <column name="ADDR" value="+49 8743 9664033"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:32:26"/>
- <column name="OBJECT_ROWID" value="8601f666-9b67-48e0-9ac2-7a7a9b653e2f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="6266511a-bf74-4db8-9456-9c3225caaca5"/>
- <column name="ADDR" value="gtauber@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T10:59:22"/>
- <column name="OBJECT_ROWID" value="aee383d4-a34a-45aa-b2f3-abab9da800e3"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="64f4028b-7a2b-405a-a434-61f262abf2c3"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:58:59"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 7541 56874-0"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T05:36:18"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="66b9cfdf-e289-407f-8418-9436b1d2152b"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:44:31"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 871 65320"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:48:35"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="674a8118-31ef-492c-83c6-6ecfcebc9c9a"/>
- <column name="ADDR" value="atannenbaum@industiral-steel.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-15T05:13:19"/>
- <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="6823d32a-0ef1-45af-a112-b43afe5addf6"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:43:59"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 841 32510"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:46:57"/>
- <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="68cfc3de-358a-4910-bbe7-5c5356da3212"/>
- <column name="ADDR" value="info@lockman.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T02:59:05"/>
- <column name="OBJECT_ROWID" value="abf652a3-5fc8-408a-8094-ebdb8b5feff7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="69732d7d-1340-4a98-aa61-9186c7f51607"/>
- <column name="ADDR" value="mhueber@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:19:00"/>
- <column name="OBJECT_ROWID" value="291815c6-89ab-4b10-88a8-6819c34030ae"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="69c70cb5-276d-4983-9607-a5fd55196573"/>
- <column name="ADDR" value="info@kronen.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:22:21"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="6a9b52cd-805f-4fec-9601-2b1874990f7b"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:45:02"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 89 653250"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:49:52"/>
- <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="6b5b76d9-489d-40e1-ac78-3261de6433a6"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:45:29"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 89 25630"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T05:29:24"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="6de0cb05-ebf3-4884-ba21-85117fc95dd7"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:36:32"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 170 1212121"/>
- <column name="MEDIUM_ID" value="COMMMOBIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-15T03:56:26"/>
- <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="73f6780a-5ef6-4647-b26b-4e7ef29d8364"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:45:57"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 30 65780"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T05:30:33"/>
- <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="76a59a85-c04a-4f37-b276-d022c568e071"/>
- <column name="ADDR" value="mericson@skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
- <column name="OBJECT_ROWID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="78496224-0a11-4f2e-bc60-99940a08298d"/>
- <column name="DATE_EDIT" valueDate="2019-06-06T02:50:34"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="https://transatlantik-logistics.de"/>
- <column name="MEDIUM_ID" value="COMMINTERNET"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="786bdaba-c36d-4107-9c6f-abc15ebb4e25"/>
- <column name="ADDR" value="info@matthiasbogen.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:10:46"/>
- <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="7c3ba80d-52ee-4275-a6b3-3afad4fb59b9"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:28:50"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664433"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:03:15"/>
- <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="7cd286d9-6267-465c-bffa-7acab253e734"/>
- <column name="ADDR" value="greattohearfromyou@fsa.org"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-29T07:43:52"/>
- <column name="OBJECT_ROWID" value="67187e68-c1c3-4081-89d0-2d752061f7b6"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="7ff7d10a-41ba-4c6e-8c78-c47bd8df7579"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:32:04"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664490"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
- <column name="OBJECT_ROWID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="82584c83-5a7d-4923-8907-2953240fb8e5"/>
- <column name="ADDR" value="dvortrefflich@trans-logistics.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
- <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="8600ac7a-7b4a-4db5-8f43-9c104604f423"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:57:27"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 711 8754-25"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
- <column name="OBJECT_ROWID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="86784334-c997-4305-8526-35db5047ce93"/>
- <column name="ADDR" value="info@kältetechnik.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:20:31"/>
- <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="867cab6b-2d71-4039-b42c-38333332c204"/>
- <column name="ADDR" value="kainz@bucher.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T11:07:45"/>
- <column name="OBJECT_ROWID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="886854ab-635e-40e5-9427-c90a6642b964"/>
- <column name="ADDR" value="pmacher@industrial-steel.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-05T03:52:59"/>
- <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="88cdb62f-6ab1-4d45-b3cf-7c07c9edf25d"/>
- <column name="ADDR" value="max.huber@aquire.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-29T07:51:40"/>
- <column name="OBJECT_ROWID" value="227ec10d-7bf4-4cf7-824f-8b1d7625bd6e"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="8f1bb672-d971-4fcb-8b65-3aba41a57b96"/>
- <column name="DATE_EDIT" valueDate="2021-10-06T01:33:43"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="ijammeh@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:24:06"/>
- <column name="OBJECT_ROWID" value="06758e4b-8e0c-4a7e-97e5-c5e7502a7aa5"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="9043d80c-e3c5-4995-bf20-0d34b67da39a"/>
- <column name="ADDR" value="+49 8743 9664843"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:31:57"/>
- <column name="OBJECT_ROWID" value="1102ffa0-b2b3-4a67-8c77-507517989f17"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="91195ee8-25f3-47df-b785-8c18510e647a"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:45:46"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 89 87750"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T05:32:03"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="920cf62e-5a9f-4c25-9c01-1e22b3f64891"/>
- <column name="DATE_EDIT" valueDate="2019-06-07T02:44:07"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="info@jpmtouristik.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:21:42"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="949aae5e-2546-437b-af27-0ac1b18d3970"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:59:26"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 7541 56874-19"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
- <column name="OBJECT_ROWID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="954a729a-dd11-4760-86a8-dc09e9c11d1a"/>
- <column name="ADDR" value="info@aquire.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:09:20"/>
- <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="98bb2c06-db4c-4188-9676-67fb32881a1f"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:30:26"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664732"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
- <column name="OBJECT_ROWID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="9a440c7f-5f00-43f0-9c0b-fb1b8a35721e"/>
- <column name="ADDR" value="+49 40 6352-111"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-11T08:26:49"/>
- <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="9c6e32fd-fd56-4231-a461-39526e3c5d15"/>
- <column name="ADDR" value="+49 8122 976431"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-07T07:23:29"/>
- <column name="OBJECT_ROWID" value="08773b26-9914-4bf9-a6c1-a9d70be64d32"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="9de9e448-c8de-47d7-9ee1-4e151481eb5c"/>
- <column name="ADDR" value="hstorbeck@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:18:08"/>
- <column name="OBJECT_ROWID" value="8601f666-9b67-48e0-9ac2-7a7a9b653e2f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="9ef26074-4e9e-4ea4-a614-d1c456d0edf7"/>
- <column name="ADDR" value="maltinger@skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-28T01:40:29"/>
- <column name="OBJECT_ROWID" value="f682daa0-4da9-435c-b40a-552701d89570"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="a01f78f1-424a-4c3c-8a94-b50081e1612e"/>
- <column name="ADDR" value="reinhardt@brandtfeldmann.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="0"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:41:15"/>
- <column name="OBJECT_ROWID" value="e1124568-4dcb-42f4-9376-2bcda518e8aa"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="a0ba95f9-c872-4bfc-9591-868aaa3b2ac3"/>
- <column name="ADDR" value="info@mnfversicherung.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:27:25"/>
- <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="a608ae2d-1c68-43dd-b13e-b55f6bbcbdef"/>
- <column name="ADDR" value="+49 89 32178"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T04:03:07"/>
- <column name="OBJECT_ROWID" value="6ad822f2-5d20-41bb-9ff3-79afe1024085"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="a7cd429f-b81c-4bfe-9aa1-06d77d728812"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:30:40"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664828"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
- <column name="OBJECT_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="a8dca1e8-f787-446b-b065-8089322b0402"/>
- <column name="ADDR" value="https://www.xing.com/companies/aditosoftwaregmbh"/>
- <column name="MEDIUM_ID" value="COMMXING"/>
- <column name="ISSTANDARD" valueNumeric="0"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-23T11:42:52"/>
- <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="a9930b1e-ca73-4afb-9b27-7026d06aec77"/>
- <column name="ADDR" value="weiss@fischerf.tr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:56:16"/>
- <column name="OBJECT_ROWID" value="ae1f155c-71de-414e-8af7-8db46e79369d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="ab3be7b1-85dd-4f85-8d88-3fd35f2b8eb7"/>
- <column name="ADDR" value="freeman@globgroup.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T04:00:50"/>
- <column name="OBJECT_ROWID" value="57ac8507-ef62-459d-8353-aeec3465d234"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="ab6da5e4-bea2-4a66-b818-b8ad5c57a167"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T11:08:09"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="info@bucher.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-21T09:10:07"/>
- <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b05c7203-42f9-46d9-9140-227a98398e58"/>
- <column name="ADDR" value="pstrauss@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:31:59"/>
- <column name="OBJECT_ROWID" value="caafc567-f118-4ae0-babd-d3616ebd6cf9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b1468fbb-25be-4c31-95a4-bb1c6341cfe9"/>
- <column name="ADDR" value="jmetzger@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T10:50:44"/>
- <column name="OBJECT_ROWID" value="c760411c-3034-4d25-84ee-fa7c4d86902c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b3be54f7-884c-4a88-8c4b-b52a4595d547"/>
- <column name="DATE_EDIT" valueDate="2021-10-14T12:41:41"/>
- <column name="USER_EDIT" value="Harold Smith"/>
- <column name="ADDR" value="psolana@industrial-steel.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:32:30"/>
- <column name="OBJECT_ROWID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b7a11507-0a52-46e4-bef4-f9bce325844f"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:57:53"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 711 8754-29"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
- <column name="OBJECT_ROWID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b8789eca-7b8b-4261-8fc5-cd9053a704f2"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:57:16"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 711 8754-0"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T05:31:22"/>
- <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b9773f8a-97bf-4071-9b1e-32b5e89e526a"/>
- <column name="ADDR" value="contact@globgroup.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
- <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b986e88b-d637-47e5-8553-addbd8b31488"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:57:45"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 711 8754-22"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:30:47"/>
- <column name="OBJECT_ROWID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="b9b0499c-ea37-4a41-9a0b-8ed570d91683"/>
- <column name="DATE_EDIT" valueDate="2021-06-29T07:44:09"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="kontakt@schild.de "/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
- <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="bde2ff44-c2f1-421e-919f-6e7194c951ec"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:31:12"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="slustig@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
- <column name="OBJECT_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="bebcbe4b-d795-40ff-bfeb-47d7357c489e"/>
- <column name="ADDR" value="info@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-28T09:32:07"/>
- <column name="OBJECT_ROWID" value="a059aa9d-0463-4dbd-8b54-e85e235e63e0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="bf6122eb-b257-4bc3-97a7-f60985e0dc82"/>
- <column name="DATE_EDIT" valueDate="2019-06-07T02:41:08"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="info@trans-logistics.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:32:54"/>
- <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="c1947507-c62e-411c-82f4-89e5a6e02a4f"/>
- <column name="ADDR" value="+44 20 1432 3000"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T02:28:08"/>
- <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="c26ed7f7-eeb3-4523-8141-4309a719dc00"/>
- <column name="ADDR" value="vertrieb@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T10:54:52"/>
- <column name="OBJECT_ROWID" value="39da41b4-ba90-4795-aed6-381b52d331ff"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="c68be666-221e-46b4-8fad-d49bb1117c3a"/>
- <column name="ADDR" value="+49 821 96690"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
- <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="c7d84edf-1a48-45fd-8364-e29f45ac1739"/>
- <column name="DATE_EDIT" valueDate="2021-10-14T12:50:33"/>
- <column name="USER_EDIT" value="Harold Smith"/>
- <column name="ADDR" value="tmausbeier@skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:22:24"/>
- <column name="OBJECT_ROWID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="cc2f1e5f-9cd9-4bbb-87d4-a98d883ebbc1"/>
- <column name="DATE_EDIT" valueDate="2021-10-14T12:42:30"/>
- <column name="USER_EDIT" value="Harold Smith"/>
- <column name="ADDR" value="rscherbeatstein@skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:30:48"/>
- <column name="OBJECT_ROWID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="cc9fc040-2a0d-4520-acbf-91d4d8e10c97"/>
- <column name="ADDR" value="+49 8743 9664299"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:29:31"/>
- <column name="OBJECT_ROWID" value="b5c037fa-7407-4e84-b9d0-0a2a9835bd9f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="cdb40870-1678-4b75-a894-395a185f0e86"/>
- <column name="ADDR" value="+49 8743 9664376"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:30:11"/>
- <column name="OBJECT_ROWID" value="06758e4b-8e0c-4a7e-97e5-c5e7502a7aa5"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="cf54bd1a-46a9-4bc4-9cdf-7557cd6d497d"/>
- <column name="ADDR" value="cburger@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T11:01:18"/>
- <column name="OBJECT_ROWID" value="a38a19f6-6255-47b0-bbea-138bae2271c4"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d0629982-5797-4eda-b36b-a58d2fc551ec"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:59:10"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 7541 56874-11"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
- <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d169b08b-116b-4f80-92ab-7fc26d162bc8"/>
- <column name="ADDR" value="+49 8743 9664323"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:30:58"/>
- <column name="OBJECT_ROWID" value="43bed135-5650-4634-8cea-f0bc803a2e42"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d21825c5-2837-4dfc-b9d2-7f368b0f1608"/>
- <column name="ADDR" value="sdehler@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:25:13"/>
- <column name="OBJECT_ROWID" value="f173b5f7-4276-472b-820b-d1b34811fdc9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d32b5d16-3136-49ff-8c6c-71b7fe501552"/>
- <column name="ADDR" value="+49 176 48525800"/>
- <column name="MEDIUM_ID" value="COMMMOBIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-11-25T01:52:48"/>
- <column name="OBJECT_ROWID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d395f5eb-ff5f-4cd6-9e52-04066349d523"/>
- <column name="DATE_EDIT" valueDate="2019-06-05T03:50:57"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="cdecker@trans-logistics.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
- <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d5a90157-2c05-474c-aeda-0ab08d26075a"/>
- <column name="ADDR" value="jgrüner@web.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:11:20"/>
- <column name="OBJECT_ROWID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d5c63405-8959-4b82-baff-2d2ddde41b74"/>
- <column name="ADDR" value="baer@fischer.tr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:54:51"/>
- <column name="OBJECT_ROWID" value="701569b7-d791-4682-89a1-bf26682187af"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d6a0723c-5e4d-4771-8808-79b510e864cb"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:41:37"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 171 9654874"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-16T01:26:03"/>
- <column name="OBJECT_ROWID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="d721d57c-7cb0-45ee-a12f-982ec4efb62c"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:31:15"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664100"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
- <column name="OBJECT_ROWID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="da54f448-f013-428b-85b1-311df2903223"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:44:43"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 5690"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:49:12"/>
- <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="ddcc3940-fdb2-49b1-8812-1e7d2ecf2598"/>
- <column name="DATE_EDIT" valueDate="2021-10-14T12:48:39"/>
- <column name="USER_EDIT" value="Harold Smith"/>
- <column name="ADDR" value="lalpenhorn@skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:42:07"/>
- <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="de32eb0c-672b-4ce5-a80e-63a8ac976599"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:33:22"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="fmüller@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
- <column name="OBJECT_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="dead3100-379c-4ca3-958f-006ba17a78ad"/>
- <column name="ADDR" value="info@netro.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-23T10:42:41"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e0662d2c-ea02-4796-8783-a5ad4a8683fe"/>
- <column name="DATE_EDIT" valueDate="2021-10-13T08:30:34"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 8743 9664292"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
- <column name="OBJECT_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e076075c-1d67-4a9d-aed8-1a66bb1adfb2"/>
- <column name="ADDR" value="alindner@industrial-steel.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-15T05:10:34"/>
- <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e21bc8d9-f546-4f97-9c4c-4e4de67512a7"/>
- <column name="DATE_EDIT" valueDate="2021-06-28T12:29:24"/>
- <column name="USER_EDIT" value="Birgit Leicht"/>
- <column name="ADDR" value="hobermeier@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
- <column name="OBJECT_ROWID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e2582d76-229d-4885-bfce-d33fd472ea8f"/>
- <column name="ADDR" value="info@messebau-meister.hr"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-28T09:35:45"/>
- <column name="OBJECT_ROWID" value="2a45eaab-3638-42fa-82ec-1b6893cb6a30"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e2e71a65-be33-4599-a05f-1b2306be8193"/>
- <column name="ADDR" value="+49 8743 9664300"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-13T08:29:50"/>
- <column name="OBJECT_ROWID" value="291815c6-89ab-4b10-88a8-6819c34030ae"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e2fcaf67-b1fd-4d2e-9848-ba45677cf494"/>
- <column name="ADDR" value="+49 711 8754-31"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-06-11T11:58:07"/>
- <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e4726063-bcbb-4527-8438-5f9fee077ce1"/>
- <column name="DATE_EDIT" valueDate="2019-06-07T02:40:05"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="info@waken-neuser.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:33:16"/>
- <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e5881da8-b7c4-42bf-b463-77f28fbba7b0"/>
- <column name="ADDR" value="info@andersondibbert.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="0"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:22:58"/>
- <column name="OBJECT_ROWID" value="344f217a-1be3-494f-b3a2-6429f5f1f038"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e5b76921-2067-4f7d-b0b9-6c3d97dd5ca0"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:44:52"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 871 65320"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:49:30"/>
- <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e5dd9be5-ad40-4846-bc2c-5c5170bcf72f"/>
- <column name="ADDR" value="+49 8731 975310"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-28T09:35:45"/>
- <column name="OBJECT_ROWID" value="2a45eaab-3638-42fa-82ec-1b6893cb6a30"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e8879d5e-a702-45a3-a050-b960aeb6cc25"/>
- <column name="ADDR" value="read@lockman.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:27:03"/>
- <column name="OBJECT_ROWID" value="ca86f481-fa9d-4476-88d9-b00ac7e16166"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="e98ad653-1951-4066-9a82-cd963c53541b"/>
- <column name="ADDR" value="marsh@globgroup.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T04:01:51"/>
- <column name="OBJECT_ROWID" value="462c6bea-8aa7-443e-a104-188b451dfd6f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="ea561d25-863a-4666-bc57-00a414fa1bf2"/>
- <column name="ADDR" value="maltinger@industrial-steel.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-16T01:24:26"/>
- <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="eb740f5e-a92c-4f6b-b079-e3dab491d06e"/>
- <column name="ADDR" value="+49 8731 975310"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-06-28T09:32:39"/>
- <column name="OBJECT_ROWID" value="a059aa9d-0463-4dbd-8b54-e85e235e63e0"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="ecb6313a-3663-45b0-80db-453a43eb0d0d"/>
- <column name="DATE_EDIT" valueDate="2019-06-05T03:50:35"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="amorgenstern@trans-logistics.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
- <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="ed70aa14-c1a6-4e37-8c53-c92b59e5602f"/>
- <column name="ADDR" value="jfrohberg@meinefirma.adito.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2021-10-06T11:27:40"/>
- <column name="OBJECT_ROWID" value="b5c037fa-7407-4e84-b9d0-0a2a9835bd9f"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="f0ba9565-8b43-46db-80f8-a45f6be9cc4e"/>
- <column name="DATE_EDIT" valueDate="2019-05-28T07:45:37"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 871 65820"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-23T10:42:51"/>
- <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="f2f8499d-2d00-485f-9d2f-381fd5e8f7ce"/>
- <column name="ADDR" value="info@pichelmaier-finc.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-22T03:27:48"/>
- <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="f31e7b32-cc81-4b6a-868f-e9f4879dcee3"/>
- <column name="DATE_EDIT" valueDate="2019-06-11T11:59:36"/>
- <column name="USER_EDIT" value="Admin"/>
- <column name="ADDR" value="+49 7541 56874-16"/>
- <column name="MEDIUM_ID" value="COMMPHONE"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
- <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="f33e7c30-0094-4596-b7bf-b410726e7688"/>
- <column name="ADDR" value="fuller@andersondibbert.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:23:25"/>
- <column name="OBJECT_ROWID" value="16b6d702-e7c3-4b7d-a972-26291556d8da"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="f7a16e4a-bc01-45f9-965c-9b5a50b55434"/>
- <column name="ADDR" value="daniels@andersondibbert.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:25:29"/>
- <column name="OBJECT_ROWID" value="fbf35866-b9b2-4db5-8c67-8f02fd71c9e9"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="f95dfa47-a5ff-407a-9c1c-826c5aa72c72"/>
- <column name="DATE_EDIT" valueDate="2021-10-14T12:43:20"/>
- <column name="USER_EDIT" value="Harold Smith"/>
- <column name="ADDR" value="azweistein@skyscraper-bau.de"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
- <column name="OBJECT_ROWID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
- </insert>
- <insert tableName="communication">
- <column name="OBJECT_TYPE" value="Contact"/>
- <column name="COMMUNICATIONID" value="fd76d21f-4dc0-46d8-a6e1-59e95f62699d"/>
- <column name="ADDR" value="bush@lockman.com"/>
- <column name="MEDIUM_ID" value="COMMEMAIL"/>
- <column name="ISSTANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Birgit Leicht"/>
- <column name="DATE_NEW" valueDate="2021-06-28T03:27:44"/>
- <column name="OBJECT_ROWID" value="59c9d416-0a39-4948-a540-f439178fbafe"/>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="00d07819-985b-4efe-a634-da71ae482907" />
+ <column name="ADDR" value="https://meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:36" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:26:09" />
+ <column name="MEDIUM_ID" value="COMMINTERNET" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="05d24d50-677f-4c7a-9f39-8a8082f267cd" />
+ <column name="ADDR" value="info@skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:31:52" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-07T02:41:44" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="0a4410ef-bd92-4baa-95db-632f82d1de94" />
+ <column name="ADDR" value="+49 941 52360" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T05:32:40" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:46:14" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="106b7d14-8973-4122-a9af-4ece26f4fd73" />
+ <column name="ADDR" value="+49 7541 56874-15" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:20:04" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:59:17" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="10e26e57-b3d3-4d99-be5b-d6ac924e729e" />
+ <column name="ADDR" value="willi.kainz@rocketmail.org" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-28T01:36:40" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="fe7456a0-16ff-4c5d-a856-3c9d743f7535" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="11b513f0-4fef-4525-976e-f08740d57c44" />
+ <column name="ADDR" value="+49 40 42580" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:45:42" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-29T09:05:48" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="14216c79-e688-46f4-9cc7-d3c140dea0eb" />
+ <column name="ADDR" value="hotline@brandt-feldmann-ag.de" />
+ <column name="ISSTANDARD" valueNumeric="0" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-29T08:22:35" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="c786372f-4e8d-4ed0-b573-1d9993b6ff46" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="14a01219-985b-4efe-a634-da71ae482907" />
+ <column name="ADDR" value="meinefirma@adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:36" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:25:49" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="14d01219-985b-4efe-a634-da71ae482907" />
+ <column name="ADDR" value="ppfiffig@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:36" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:30:03" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="14d05619-985b-4efe-a634-da71ae482907" />
+ <column name="ADDR" value="lsommer@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:36" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:29:54" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="14df395d-2efe-4e5b-9413-df0268ef1d44" />
+ <column name="ADDR" value="+49 160 98712364" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T11:03:55" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMMOBIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="42397577-c00b-4434-859e-0766ab40bf8b" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="1abdb349-b66e-46df-8cfa-f44bf8845575" />
+ <column name="ADDR" value="jgruber@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T10:57:51" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="7c0b4ee5-2012-4c91-8980-502c1602329b" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="1b708272-0803-4c65-a4ac-b9b676d08af7" />
+ <column name="ADDR" value="lreiter@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-06T12:18:05" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="1102ffa0-b2b3-4a67-8c77-507517989f17" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="1ee5df44-f8ca-477e-a6d1-f8fee59d5d0e" />
+ <column name="ADDR" value="snagel@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:28:37" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="43bed135-5650-4634-8cea-f0bc803a2e42" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="1fd3454a-f054-4472-8e53-26f9b4a0ce76" />
+ <column name="ADDR" value="+49 40 63520" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:48:09" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-23T11:23:53" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="22d01219-985b-4efe-a634-da71ae482907" />
+ <column name="ADDR" value="+49 8743 9664746" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:36" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:31:40" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="22d07819-985b-4efe-a634-da71ae482907" />
+ <column name="ADDR" value="+49 8743 96640" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:36" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:27:09" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="2445a63f-85b7-40cc-ad99-0bc261f60db6" />
+ <column name="ADDR" value="https://www.industrial-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-15T03:21:35" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-07T02:46:11" />
+ <column name="MEDIUM_ID" value="COMMINTERNET" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="2553feeb-6ca1-42a4-9581-f51c7e9dec8f" />
+ <column name="ADDR" value="+49 8743 9664234" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:32:40" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="caafc567-f118-4ae0-babd-d3616ebd6cf9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="2561b25b-1af2-4512-a77f-97d542c578b7" />
+ <column name="ADDR" value="+49 40 6352-105" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-11T08:26:11" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="270d381e-3d37-40d7-a776-4d6302ed60d2" />
+ <column name="ADDR" value="+49 89 36920" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T05:36:39" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:46:49" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="29db4625-1f5a-4ca0-81e0-f4636c011fd3" />
+ <column name="ADDR" value="wkainz@industrial-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T11:03:53" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="42397577-c00b-4434-859e-0766ab40bf8b" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="2b4aa05b-2268-496b-91d8-e2eb2029a4ef" />
+ <column name="ADDR" value="+49 8743 9664637" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:29:11" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="f173b5f7-4276-472b-820b-d1b34811fdc9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="2f571583-f8d2-47ad-b183-8d9cab3b3c19" />
+ <column name="ADDR" value="info@grobbe-werk.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:11:18" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="38d42eff-c782-4ffa-80d7-db812cf1c6db" />
+ <column name="ADDR" value="psteiger@trans-logistics.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:41:21" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994" />
+ <column name="ADDR" value="tadmin@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:38" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:31:25" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="3da6609c-79f0-449e-a236-3636368382f5" />
+ <column name="ADDR" value="+49 421 98650" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:46:23" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:43:48" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="3fb1a544-6a1d-420a-95b7-e98956b79539" />
+ <column name="ADDR" value="doyle@globgroup.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T04:01:21" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="907bd419-77de-4a8c-8b9b-936c5393e5e7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="3fda2c6d-80c0-4af4-962a-1e04f89ea378" />
+ <column name="ADDR" value="chef@netro.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-29T08:00:41" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="0cb0af25-dbd0-4e82-92e2-8afd03acbf36" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="417ce25b-8d42-47b2-b7df-1dfcc28075be" />
+ <column name="ADDR" value="https://skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-15T03:41:53" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMINTERNET" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="459d704e-f140-4927-aae3-771fecd2891a" />
+ <column name="ADDR" value="+49 4321 78990" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:34:41" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:43:26" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="4602f1f8-7a40-4c0d-bb92-649935d11bd6" />
+ <column name="ADDR" value="hsmith@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:31:51" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:33:11" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="4ba08e1c-7094-412c-b4a4-210a330f6d71" />
+ <column name="ADDR" value="+49 711 8754-32" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:22:23" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:57:36" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="4de9fc9d-0f57-458d-8302-4000e2dc6e1e" />
+ <column name="ADDR" value="info@fischer.tr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:55:17" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="9c6c42c3-d9f8-4b92-a8c4-9c554e3844cc" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="4f3230c0-41e4-4861-880f-14ad0fcc5a35" />
+ <column name="ADDR" value="info@superbauer.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:32:15" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="504d764b-25f4-4272-a43e-053041ab3534" />
+ <column name="ADDR" value="+49 40 425811" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-29T09:06:15" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="3da2a794-7155-4009-95e0-b8aeb703acfc" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="508e1a48-5e0d-4474-8059-ad495f3b629d" />
+ <column name="ADDR" value="info@document-solutions.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:24:31" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-07T02:43:55" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5136702b-2898-4db3-98d2-436772febc35" />
+ <column name="ADDR" value="+49 871 9751500" />
+ <column name="ISSTANDARD" valueNumeric="0" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-07T02:47:29" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5270133a-a59a-41c0-a812-2618c7557215" />
+ <column name="ADDR" value="+49 40 6352-109" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:04:03" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T08:26:27" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="529cadf7-7e9c-4828-9497-6ce6effb1624" />
+ <column name="ADDR" value="bleicht@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:14:38" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:33:34" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="56e9d5fe-b77d-4321-938c-d331cd5b3e1e" />
+ <column name="ADDR" value="lkanzler@web.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:13:02" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5705eb99-f8a3-482c-9bcc-55a260b4bb1a" />
+ <column name="ADDR" value="cpabst@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:19:48" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="cc0b2548-3657-45da-8226-ec5722f56539" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="58d01219-985b-4efe-a634-da71ae482907" />
+ <column name="ADDR" value="+49 8743 9664333" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-13T01:16:36" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:32:11" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5c95cd5b-068d-46f5-b656-55e94200d976" />
+ <column name="ADDR" value="+49 8743 9664285" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:31:34" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="cc0b2548-3657-45da-8226-ec5722f56539" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5d31f105-e04f-4824-8011-6b940f198b87" />
+ <column name="ADDR" value="gl@meister-messebau.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T10:53:39" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="a4eabe23-533f-4a1e-bbdb-ba2b406d3590" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5e9910d0-5ace-4dcd-b35f-f92d84e64562" />
+ <column name="ADDR" value="gweingartner@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T10:51:45" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="7de6316b-62aa-4bea-a186-702c1b87a15c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5ea00579-3eb5-4c1f-9396-63a15b134f60" />
+ <column name="ADDR" value="info@industrial-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:19:53" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="5f9aaf24-69d7-4089-a31d-e15d6d55dc92" />
+ <column name="ADDR" value="info@sevent.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:30:12" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="600317f2-e2c6-4e46-903b-4db8539d6c21" />
+ <column name="ADDR" value="+49 8743 9664033" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:32:26" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="8601f666-9b67-48e0-9ac2-7a7a9b653e2f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="6266511a-bf74-4db8-9456-9c3225caaca5" />
+ <column name="ADDR" value="gtauber@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T10:59:22" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="aee383d4-a34a-45aa-b2f3-abab9da800e3" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="64f4028b-7a2b-405a-a434-61f262abf2c3" />
+ <column name="ADDR" value="+49 7541 56874-0" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T05:36:18" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:58:59" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="66b9cfdf-e289-407f-8418-9436b1d2152b" />
+ <column name="ADDR" value="+49 871 65320" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:48:35" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:44:31" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="674a8118-31ef-492c-83c6-6ecfcebc9c9a" />
+ <column name="ADDR" value="atannenbaum@industiral-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-15T05:13:19" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d3ec3869-b710-44d9-b20f-50f0724631ac" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="6823d32a-0ef1-45af-a112-b43afe5addf6" />
+ <column name="ADDR" value="+49 841 32510" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:46:57" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:43:59" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="68cfc3de-358a-4910-bbe7-5c5356da3212" />
+ <column name="ADDR" value="info@lockman.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T02:59:05" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="abf652a3-5fc8-408a-8094-ebdb8b5feff7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="69732d7d-1340-4a98-aa61-9186c7f51607" />
+ <column name="ADDR" value="mhueber@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:19:00" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="291815c6-89ab-4b10-88a8-6819c34030ae" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="69c70cb5-276d-4983-9607-a5fd55196573" />
+ <column name="ADDR" value="info@kronen.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:22:21" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="6a9b52cd-805f-4fec-9601-2b1874990f7b" />
+ <column name="ADDR" value="+49 89 653250" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:49:52" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:45:02" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="6b5b76d9-489d-40e1-ac78-3261de6433a6" />
+ <column name="ADDR" value="+49 89 25630" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T05:29:24" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:45:29" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="6de0cb05-ebf3-4884-ba21-85117fc95dd7" />
+ <column name="ADDR" value="+49 170 1212121" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-15T03:56:26" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:36:32" />
+ <column name="MEDIUM_ID" value="COMMMOBIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="73f6780a-5ef6-4647-b26b-4e7ef29d8364" />
+ <column name="ADDR" value="+49 30 65780" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T05:30:33" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:45:57" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="76a59a85-c04a-4f37-b276-d022c568e071" />
+ <column name="ADDR" value="mericson@skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:10:21" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="78496224-0a11-4f2e-bc60-99940a08298d" />
+ <column name="ADDR" value="https://transatlantik-logistics.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-15T03:28:49" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-06T02:50:34" />
+ <column name="MEDIUM_ID" value="COMMINTERNET" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="786bdaba-c36d-4107-9c6f-abc15ebb4e25" />
+ <column name="ADDR" value="info@matthiasbogen.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:10:46" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="7c3ba80d-52ee-4275-a6b3-3afad4fb59b9" />
+ <column name="ADDR" value="+49 8743 9664433" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:03:15" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:28:50" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="7cd286d9-6267-465c-bffa-7acab253e734" />
+ <column name="ADDR" value="greattohearfromyou@fsa.org" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-29T07:43:52" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="67187e68-c1c3-4081-89d0-2d752061f7b6" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="7ff7d10a-41ba-4c6e-8c78-c47bd8df7579" />
+ <column name="ADDR" value="+49 8743 9664490" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:31:51" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:32:04" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="82584c83-5a7d-4923-8907-2953240fb8e5" />
+ <column name="ADDR" value="dvortrefflich@trans-logistics.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:35:38" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="8600ac7a-7b4a-4db5-8f43-9c104604f423" />
+ <column name="ADDR" value="+49 711 8754-25" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:10:21" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:57:27" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="86784334-c997-4305-8526-35db5047ce93" />
+ <column name="ADDR" value="info@kältetechnik.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:20:31" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="867cab6b-2d71-4039-b42c-38333332c204" />
+ <column name="ADDR" value="kainz@bucher.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T11:07:45" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="3da2a794-7155-4009-95e0-b8aeb703acfc" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="886854ab-635e-40e5-9427-c90a6642b964" />
+ <column name="ADDR" value="pmacher@industrial-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-05T03:52:59" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="6e667085-bb97-4039-8dfe-2230002985e0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="88cdb62f-6ab1-4d45-b3cf-7c07c9edf25d" />
+ <column name="ADDR" value="max.huber@aquire.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-29T07:51:40" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="227ec10d-7bf4-4cf7-824f-8b1d7625bd6e" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="8f1bb672-d971-4fcb-8b65-3aba41a57b96" />
+ <column name="ADDR" value="ijammeh@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:24:06" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-06T01:33:43" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="06758e4b-8e0c-4a7e-97e5-c5e7502a7aa5" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="9043d80c-e3c5-4995-bf20-0d34b67da39a" />
+ <column name="ADDR" value="+49 8743 9664843" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:31:57" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="1102ffa0-b2b3-4a67-8c77-507517989f17" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="91195ee8-25f3-47df-b785-8c18510e647a" />
+ <column name="ADDR" value="+49 89 87750" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T05:32:03" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:45:46" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="920cf62e-5a9f-4c25-9c01-1e22b3f64891" />
+ <column name="ADDR" value="info@jpmtouristik.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:21:42" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-07T02:44:07" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="949aae5e-2546-437b-af27-0ac1b18d3970" />
+ <column name="ADDR" value="+49 7541 56874-19" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:41:21" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:59:26" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="954a729a-dd11-4760-86a8-dc09e9c11d1a" />
+ <column name="ADDR" value="info@aquire.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:09:20" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="98bb2c06-db4c-4188-9676-67fb32881a1f" />
+ <column name="ADDR" value="+49 8743 9664732" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:14:38" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:30:26" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="9a440c7f-5f00-43f0-9c0b-fb1b8a35721e" />
+ <column name="ADDR" value="+49 40 6352-111" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-11T08:26:49" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="9c6e32fd-fd56-4231-a461-39526e3c5d15" />
+ <column name="ADDR" value="+49 8122 976431" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-07T07:23:29" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="08773b26-9914-4bf9-a6c1-a9d70be64d32" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="9de9e448-c8de-47d7-9ee1-4e151481eb5c" />
+ <column name="ADDR" value="hstorbeck@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:18:08" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="8601f666-9b67-48e0-9ac2-7a7a9b653e2f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="9ef26074-4e9e-4ea4-a614-d1c456d0edf7" />
+ <column name="ADDR" value="maltinger@skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-28T01:40:29" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="f682daa0-4da9-435c-b40a-552701d89570" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="a01f78f1-424a-4c3c-8a94-b50081e1612e" />
+ <column name="ADDR" value="reinhardt@brandtfeldmann.de" />
+ <column name="ISSTANDARD" valueNumeric="0" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:41:15" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="e1124568-4dcb-42f4-9376-2bcda518e8aa" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="a0ba95f9-c872-4bfc-9591-868aaa3b2ac3" />
+ <column name="ADDR" value="info@mnfversicherung.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:27:25" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="a608ae2d-1c68-43dd-b13e-b55f6bbcbdef" />
+ <column name="ADDR" value="+49 89 32178" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T04:03:07" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="6ad822f2-5d20-41bb-9ff3-79afe1024085" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="a7cd429f-b81c-4bfe-9aa1-06d77d728812" />
+ <column name="ADDR" value="+49 8743 9664828" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:23:58" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:30:40" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="a8dca1e8-f787-446b-b065-8089322b0402" />
+ <column name="ADDR" value="https://www.xing.com/companies/aditosoftwaregmbh" />
+ <column name="ISSTANDARD" valueNumeric="0" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-23T11:42:52" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMXING" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="a9930b1e-ca73-4afb-9b27-7026d06aec77" />
+ <column name="ADDR" value="weiss@fischerf.tr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:56:16" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="ae1f155c-71de-414e-8af7-8db46e79369d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="ab3be7b1-85dd-4f85-8d88-3fd35f2b8eb7" />
+ <column name="ADDR" value="freeman@globgroup.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T04:00:50" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="57ac8507-ef62-459d-8353-aeec3465d234" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="ab6da5e4-bea2-4a66-b818-b8ad5c57a167" />
+ <column name="ADDR" value="info@bucher.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-21T09:10:07" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T11:08:09" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b05c7203-42f9-46d9-9140-227a98398e58" />
+ <column name="ADDR" value="pstrauss@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:31:59" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="caafc567-f118-4ae0-babd-d3616ebd6cf9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b1468fbb-25be-4c31-95a4-bb1c6341cfe9" />
+ <column name="ADDR" value="jmetzger@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T10:50:44" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="c760411c-3034-4d25-84ee-fa7c4d86902c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b3be54f7-884c-4a88-8c4b-b52a4595d547" />
+ <column name="ADDR" value="psolana@industrial-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:32:30" />
+ <column name="USER_EDIT" value="Harold Smith" />
+ <column name="DATE_EDIT" valueDate="2021-10-14T12:41:41" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="2c427e51-0434-40b3-ad00-3a9076067e03" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b7a11507-0a52-46e4-bef4-f9bce325844f" />
+ <column name="ADDR" value="+49 711 8754-29" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:39:25" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:57:53" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b8789eca-7b8b-4261-8fc5-cd9053a704f2" />
+ <column name="ADDR" value="+49 711 8754-0" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T05:31:22" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:57:16" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b9773f8a-97bf-4071-9b1e-32b5e89e526a" />
+ <column name="ADDR" value="contact@globgroup.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-07T02:47:29" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b986e88b-d637-47e5-8553-addbd8b31488" />
+ <column name="ADDR" value="+49 711 8754-22" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:30:47" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:57:45" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="b9b0499c-ea37-4a41-9a0b-8ed570d91683" />
+ <column name="ADDR" value="kontakt@schild.de " />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-07T02:39:32" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-06-29T07:44:09" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="bde2ff44-c2f1-421e-919f-6e7194c951ec" />
+ <column name="ADDR" value="slustig@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:16:40" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:31:12" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="bebcbe4b-d795-40ff-bfeb-47d7357c489e" />
+ <column name="ADDR" value="info@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-28T09:32:07" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="a059aa9d-0463-4dbd-8b54-e85e235e63e0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="bf6122eb-b257-4bc3-97a7-f60985e0dc82" />
+ <column name="ADDR" value="info@trans-logistics.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:32:54" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-07T02:41:08" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="c1947507-c62e-411c-82f4-89e5a6e02a4f" />
+ <column name="ADDR" value="+44 20 1432 3000" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T02:28:08" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="c26ed7f7-eeb3-4523-8141-4309a719dc00" />
+ <column name="ADDR" value="vertrieb@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T10:54:52" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="39da41b4-ba90-4795-aed6-381b52d331ff" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="c68be666-221e-46b4-8fad-d49bb1117c3a" />
+ <column name="ADDR" value="+49 821 96690" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-07T02:39:32" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="777246d5-7a73-4c52-af14-84df66128e5d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="c7d84edf-1a48-45fd-8364-e29f45ac1739" />
+ <column name="ADDR" value="tmausbeier@skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:22:24" />
+ <column name="USER_EDIT" value="Harold Smith" />
+ <column name="DATE_EDIT" valueDate="2021-10-14T12:50:33" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="cc2f1e5f-9cd9-4bbb-87d4-a98d883ebbc1" />
+ <column name="ADDR" value="rscherbeatstein@skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:30:48" />
+ <column name="USER_EDIT" value="Harold Smith" />
+ <column name="DATE_EDIT" valueDate="2021-10-14T12:42:30" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="cc9fc040-2a0d-4520-acbf-91d4d8e10c97" />
+ <column name="ADDR" value="+49 8743 9664299" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:29:31" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="b5c037fa-7407-4e84-b9d0-0a2a9835bd9f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="cdb40870-1678-4b75-a894-395a185f0e86" />
+ <column name="ADDR" value="+49 8743 9664376" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:30:11" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="06758e4b-8e0c-4a7e-97e5-c5e7502a7aa5" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="cf54bd1a-46a9-4bc4-9cdf-7557cd6d497d" />
+ <column name="ADDR" value="cburger@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T11:01:18" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="a38a19f6-6255-47b0-bbea-138bae2271c4" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d0629982-5797-4eda-b36b-a58d2fc551ec" />
+ <column name="ADDR" value="+49 7541 56874-11" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:06:21" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:59:10" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d169b08b-116b-4f80-92ab-7fc26d162bc8" />
+ <column name="ADDR" value="+49 8743 9664323" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:30:58" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="43bed135-5650-4634-8cea-f0bc803a2e42" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d21825c5-2837-4dfc-b9d2-7f368b0f1608" />
+ <column name="ADDR" value="sdehler@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:25:13" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="f173b5f7-4276-472b-820b-d1b34811fdc9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d32b5d16-3136-49ff-8c6c-71b7fe501552" />
+ <column name="ADDR" value="+49 176 48525800" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-11-25T01:52:48" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMMOBIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="79ce56fc-0022-4d5c-91b1-080c0f1e2191" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d395f5eb-ff5f-4cd6-9e52-04066349d523" />
+ <column name="ADDR" value="cdecker@trans-logistics.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:06:21" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-05T03:50:57" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="4cc98357-25f3-462b-898c-440f9faf4b97" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d5a90157-2c05-474c-aeda-0ab08d26075a" />
+ <column name="ADDR" value="jgrüner@web.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:11:20" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d5c63405-8959-4b82-baff-2d2ddde41b74" />
+ <column name="ADDR" value="baer@fischer.tr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:54:51" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="701569b7-d791-4682-89a1-bf26682187af" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d6a0723c-5e4d-4771-8808-79b510e864cb" />
+ <column name="ADDR" value="+49 171 9654874" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-16T01:26:03" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:41:37" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="2c427e51-0434-40b3-ad00-3a9076067e03" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="d721d57c-7cb0-45ee-a12f-982ec4efb62c" />
+ <column name="ADDR" value="+49 8743 9664100" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:26:54" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:31:15" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="da54f448-f013-428b-85b1-311df2903223" />
+ <column name="ADDR" value="+49 8743 5690" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:49:12" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:44:43" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="ddcc3940-fdb2-49b1-8812-1e7d2ecf2598" />
+ <column name="ADDR" value="lalpenhorn@skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:42:07" />
+ <column name="USER_EDIT" value="Harold Smith" />
+ <column name="DATE_EDIT" valueDate="2021-10-14T12:48:39" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="de32eb0c-672b-4ce5-a80e-63a8ac976599" />
+ <column name="ADDR" value="fmüller@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:23:58" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:33:22" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="dead3100-379c-4ca3-958f-006ba17a78ad" />
+ <column name="ADDR" value="info@netro.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-23T10:42:41" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e0662d2c-ea02-4796-8783-a5ad4a8683fe" />
+ <column name="ADDR" value="+49 8743 9664292" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:16:40" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2021-10-13T08:30:34" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e076075c-1d67-4a9d-aed8-1a66bb1adfb2" />
+ <column name="ADDR" value="alindner@industrial-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-15T05:10:34" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="45635aca-7971-43df-a683-c80c86cb58cc" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e21bc8d9-f546-4f97-9c4c-4e4de67512a7" />
+ <column name="ADDR" value="hobermeier@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:26:54" />
+ <column name="USER_EDIT" value="Birgit Leicht" />
+ <column name="DATE_EDIT" valueDate="2021-06-28T12:29:24" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e2582d76-229d-4885-bfce-d33fd472ea8f" />
+ <column name="ADDR" value="info@messebau-meister.hr" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-28T09:35:45" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="2a45eaab-3638-42fa-82ec-1b6893cb6a30" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e2e71a65-be33-4599-a05f-1b2306be8193" />
+ <column name="ADDR" value="+49 8743 9664300" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-13T08:29:50" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="291815c6-89ab-4b10-88a8-6819c34030ae" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e2fcaf67-b1fd-4d2e-9848-ba45677cf494" />
+ <column name="ADDR" value="+49 711 8754-31" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-06-11T11:58:07" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e4726063-bcbb-4527-8438-5f9fee077ce1" />
+ <column name="ADDR" value="info@waken-neuser.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:33:16" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-07T02:40:05" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e5881da8-b7c4-42bf-b463-77f28fbba7b0" />
+ <column name="ADDR" value="info@andersondibbert.com" />
+ <column name="ISSTANDARD" valueNumeric="0" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:22:58" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="344f217a-1be3-494f-b3a2-6429f5f1f038" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e5b76921-2067-4f7d-b0b9-6c3d97dd5ca0" />
+ <column name="ADDR" value="+49 871 65320" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:49:30" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:44:52" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e5dd9be5-ad40-4846-bc2c-5c5170bcf72f" />
+ <column name="ADDR" value="+49 8731 975310" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-28T09:35:45" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="2a45eaab-3638-42fa-82ec-1b6893cb6a30" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e8879d5e-a702-45a3-a050-b960aeb6cc25" />
+ <column name="ADDR" value="read@lockman.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:27:03" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="ca86f481-fa9d-4476-88d9-b00ac7e16166" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="e98ad653-1951-4066-9a82-cd963c53541b" />
+ <column name="ADDR" value="marsh@globgroup.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T04:01:51" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="462c6bea-8aa7-443e-a104-188b451dfd6f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="ea561d25-863a-4666-bc57-00a414fa1bf2" />
+ <column name="ADDR" value="maltinger@industrial-steel.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-16T01:24:26" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="a8a5f214-8165-4627-bee2-bceb3578147e" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="eb740f5e-a92c-4f6b-b079-e3dab491d06e" />
+ <column name="ADDR" value="+49 8731 975310" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-06-28T09:32:39" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="a059aa9d-0463-4dbd-8b54-e85e235e63e0" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="ecb6313a-3663-45b0-80db-453a43eb0d0d" />
+ <column name="ADDR" value="amorgenstern@trans-logistics.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:20:04" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-05T03:50:35" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="ed70aa14-c1a6-4e37-8c53-c92b59e5602f" />
+ <column name="ADDR" value="jfrohberg@meinefirma.adito.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2021-10-06T11:27:40" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="b5c037fa-7407-4e84-b9d0-0a2a9835bd9f" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="f0ba9565-8b43-46db-80f8-a45f6be9cc4e" />
+ <column name="ADDR" value="+49 871 65820" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-23T10:42:51" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-05-28T07:45:37" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="f2f8499d-2d00-485f-9d2f-381fd5e8f7ce" />
+ <column name="ADDR" value="info@pichelmaier-finc.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-22T03:27:48" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Organisation" />
+ <column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="f31e7b32-cc81-4b6a-868f-e9f4879dcee3" />
+ <column name="ADDR" value="+49 7541 56874-16" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:35:38" />
+ <column name="USER_EDIT" value="Admin" />
+ <column name="DATE_EDIT" valueDate="2019-06-11T11:59:36" />
+ <column name="MEDIUM_ID" value="COMMPHONE" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="29271db0-4253-46c9-b7c2-5e25376b9d19" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="f33e7c30-0094-4596-b7bf-b410726e7688" />
+ <column name="ADDR" value="fuller@andersondibbert.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:23:25" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="16b6d702-e7c3-4b7d-a972-26291556d8da" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="f7a16e4a-bc01-45f9-965c-9b5a50b55434" />
+ <column name="ADDR" value="daniels@andersondibbert.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:25:29" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="fbf35866-b9b2-4db5-8c67-8f02fd71c9e9" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="f95dfa47-a5ff-407a-9c1c-826c5aa72c72" />
+ <column name="ADDR" value="azweistein@skyscraper-bau.de" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Admin" />
+ <column name="DATE_NEW" valueDate="2019-05-19T08:39:25" />
+ <column name="USER_EDIT" value="Harold Smith" />
+ <column name="DATE_EDIT" valueDate="2021-10-14T12:43:20" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7" />
+ </insert>
+ <insert tableName="COMMUNICATION">
+ <column name="COMMUNICATIONID" value="fd76d21f-4dc0-46d8-a6e1-59e95f62699d" />
+ <column name="ADDR" value="bush@lockman.com" />
+ <column name="ISSTANDARD" valueNumeric="1" />
+ <column name="USER_NEW" value="Birgit Leicht" />
+ <column name="DATE_NEW" valueDate="2021-06-28T03:27:44" />
+ <column name="USER_EDIT" />
+ <column name="DATE_EDIT" />
+ <column name="MEDIUM_ID" value="COMMEMAIL" />
+ <column name="OBJECT_TYPE" value="Person" />
+ <column name="OBJECT_ROWID" value="59c9d416-0a39-4948-a540-f439178fbafe" />
</insert>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/employeegroup.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/employeegroup.xml
index ca58a34b76662e1d646ec63b8b9b059e2e7edcf7..20497401e83f79d0c5977c2ac5d233fd8082585f 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/employeegroup.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/employeegroup.xml
@@ -3,13 +3,13 @@
<changeSet author="autogenerated" id="4057e30a-6441-4457-8871-27cad7ec8c0d">
<delete tableName="employeegroup"/>
<insert tableName="employeegroup">
- <column name="DATE" valueDate="2021-10-06T10:45:02"/>
+ <column name="DATE_NEW" valueDate="2021-10-06T10:45:02"/>
<column name="EMPLOYEEGROUPID" value="777dc20b-15f1-4a81-9a5f-df2985cbf605"/>
<column name="GROUPNAME" value="Kundenservice"/>
<column name="STATUS" value="ACTIVE "/>
</insert>
<insert tableName="employeegroup">
- <column name="DATE" valueDate="2021-10-07T12:06:29"/>
+ <column name="DATE_NEW" valueDate="2021-10-07T12:06:29"/>
<column name="EMPLOYEEGROUPID" value="85268396-e3d7-4024-be9f-2632cc5ffb36"/>
<column name="GROUPNAME" value="Allgemein"/>
<column name="STATUS" value="ACTIVE "/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/inboxfiltergroup.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/inboxfiltergroup.xml
index 24dc42b87e88c9a9a2415204bf7e2e6bc3ade556..974b0c5a38e338c455d7d35cbdda915dcb2b7113 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/inboxfiltergroup.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/inboxfiltergroup.xml
@@ -3,13 +3,13 @@
<changeSet author="autogenerated" id="7a59652f-1865-4172-b16b-f84e7dc927d6">
<delete tableName="inboxfiltergroup"/>
<insert tableName="inboxfiltergroup">
- <column name="DATE" valueDate="2021-10-08T12:50:27"/>
+ <column name="DATE_NEW" valueDate="2021-10-08T12:50:27"/>
<column name="INBOXFILTERGROUPID" value="1a0bf718-3e4e-489c-bfa9-c0e1041324b5"/>
<column name="NAME" value="Allgemein "/>
<column name="STATE" value="ACTIVE"/>
</insert>
<insert tableName="inboxfiltergroup">
- <column name="DATE" valueDate="2021-10-06T10:52:30"/>
+ <column name="DATE_NEW" valueDate="2021-10-06T10:52:30"/>
<column name="INBOXFILTERGROUPID" value="a21df88c-d5e5-486a-b57e-f4485fc6928d"/>
<column name="NAME" value="Kundenservice"/>
<column name="STATE" value="ACTIVE"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
index d761d01164cd17ddd82d092474bcca487e98cd17..3df9e9fd415d60f98f1e8a2fca811a4966a6a6e2 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offer.xml
@@ -144,6 +144,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T08:27:21"/>
<column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
<column name="STATUS" value="OFFERSTATWON"/>
+ <column name="PROBABILITY" valueNumeric="0"/>
</insert>
<insert tableName="offer">
<column name="PAYMENTTERMS" value="PAYTERM7"/>
@@ -153,7 +154,6 @@
<column name="CONTACT_ID" value="a059aa9d-0463-4dbd-8b54-e85e235e63e0"/>
<column name="USER_NEW" value="Birgit Leicht"/>
<column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
- <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="VERSNR" valueNumeric="1"/>
<column name="OFFERID" value="4f877dc9-8fce-41d5-bce4-f3ac34b12fde"/>
@@ -165,7 +165,6 @@
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="PROBABILITY" valueNumeric="50"/>
<column name="OFFERCODE" valueNumeric="1015"/>
- <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
<column name="VAT" valueNumeric="712.50"/>
<column name="DATE_NEW" valueDate="2021-06-28T05:49:22"/>
<column name="HEADER" value="Wir danken Ihnen für Ihre Anfrage und bieten Ihnen die von Ihnen genannten Produkte wie folgt an:"/>
@@ -220,7 +219,6 @@
<column name="CONTACT_ID" value="aee383d4-a34a-45aa-b2f3-abab9da800e3"/>
<column name="USER_NEW" value="Birgit Leicht"/>
<column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
- <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="VERSNR" valueNumeric="1"/>
<column name="OFFERID" value="98ee9b03-b4cb-4e69-bf3b-ab6fd63e7b7a"/>
@@ -232,7 +230,6 @@
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="PROBABILITY" valueNumeric="0"/>
<column name="OFFERCODE" valueNumeric="1016"/>
- <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
<column name="VAT" valueNumeric="1900.00"/>
<column name="DATE_NEW" valueDate="2021-06-28T06:29:59"/>
<column name="ACTIONUSER" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -267,7 +264,6 @@
<column name="CONTACT_ID" value="3da2a794-7155-4009-95e0-b8aeb703acfc"/>
<column name="USER_NEW" value="Birgit Leicht"/>
<column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
- <column name="DISCOUNTED_VAT" valueNumeric="76950.00"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="VERSNR" valueNumeric="1"/>
<column name="OFFERID" value="b25b1da5-c179-4142-a9c8-130c888a9b29"/>
@@ -279,7 +275,6 @@
<column name="PROBABILITY" valueNumeric="0"/>
<column name="APPROVAL" value="2"/>
<column name="OFFERCODE" valueNumeric="1014"/>
- <column name="DISCOUNTED_NET" valueNumeric="49000.00"/>
<column name="VAT" valueNumeric="76950.00"/>
<column name="DATE_NEW" valueDate="2020-01-23T10:55:49"/>
<column name="HEADER" value="Wir danken Ihnen für Ihre Anfrage und bieten Ihnen die von Ihnen genannten Produkte wie folgt an:"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
index 393b314d4ef6e0f1b0d7c79f591e645f587db6b9..70437cfb1f191cce14b47c762be2dda9fb20f610 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/offeritem.xml
@@ -14,6 +14,7 @@
<column name="ITEMPOSITION" value="1.3"/>
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -27,6 +28,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="1000.00"/>
<column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="10.00"/>
@@ -41,6 +43,7 @@
<column name="PRICE" valueNumeric="5000.00"/>
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="800.00"/>
@@ -55,6 +58,7 @@
<column name="UNIT" value="QUANTITYHOUR"/>
<column name="PRICE" valueNumeric="125.00"/>
<column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="3600.00"/>
@@ -83,6 +87,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="3500.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -96,6 +101,7 @@
<column name="ITEMPOSITION" value="1.1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -110,6 +116,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="50000.00"/>
<column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="2.00"/>
@@ -124,6 +131,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="3.00"/>
@@ -137,6 +145,7 @@
<column name="ITEMPOSITION" value="1.1.1"/>
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -151,6 +160,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="2500.00"/>
<column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="2.00"/>
@@ -164,6 +174,7 @@
<column name="ITEMPOSITION" value="1.2"/>
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1000.00"/>
@@ -177,6 +188,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="150.00"/>
<column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="3.00"/>
@@ -190,6 +202,7 @@
<column name="ITEMPOSITION" value="1.1.2"/>
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -204,6 +217,7 @@
<column name="UNIT" value="QUANTITYHOUR"/>
<column name="PRICE" valueNumeric="1000.00"/>
<column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -219,6 +233,7 @@
<column name="PRICE" valueNumeric="10000.00"/>
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="3600.00"/>
@@ -233,6 +248,7 @@
<column name="UNIT" value="QUANTITYHOUR"/>
<column name="PRICE" valueNumeric="125.00"/>
<column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="5.00"/>
@@ -248,6 +264,7 @@
<column name="PRICE" valueNumeric="10000.00"/>
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -262,6 +279,7 @@
<column name="PRICE" valueNumeric="50000.00"/>
<column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
<column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -276,6 +294,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -303,6 +322,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="250.00"/>
<column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="2.00"/>
@@ -317,6 +337,7 @@
<column name="UNIT" value="QUANTITYHOUR"/>
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="2.00"/>
@@ -331,6 +352,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="3.00"/>
@@ -345,6 +367,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -359,6 +382,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="50000.00"/>
<column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="5.00"/>
@@ -388,6 +412,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="600.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="5.00"/>
@@ -402,6 +427,7 @@
<column name="PRICE" valueNumeric="5000.00"/>
<column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="offeritem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -415,6 +441,7 @@
<column name="UNIT" value="QUANTITYPIECES"/>
<column name="PRICE" valueNumeric="25000.00"/>
<column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
index 5b694cd653792f42785025028bbcdf4962e82750..f85458736f5134c152c38c4263ff595762d7a793 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorder.xml
@@ -76,12 +76,10 @@
<column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
<column name="SALESORDERDATE" valueDate="2020-08-11T12:00:00"/>
<column name="DUNNINGDATE" valueDate="2021-06-29T12:00:00"/>
- <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="CURRENCY" value="EUR"/>
<column name="NET" valueNumeric="10600.00"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
- <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
<column name="VAT" valueNumeric="1900.00"/>
<column name="PAYDUEDATE" valueDate="2020-08-18T12:00:00"/>
<column name="PAYMENTADDRESS" value="Meister Messebau Aitrachstraße 5 84130 Dingolfing"/>
@@ -104,12 +102,10 @@
<column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
<column name="SALESORDERDATE" valueDate="2021-06-29T12:00:00"/>
<column name="DUNNINGDATE" valueDate="2021-06-29T12:02:24"/>
- <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="CURRENCY" value="EUR"/>
<column name="NET" valueNumeric="3750.00"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
- <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
<column name="VAT" valueNumeric="712.50"/>
<column name="PAYDUEDATE" valueDate="2020-08-15T12:00:00"/>
<column name="PAYMENTADDRESS" value="Meister Messebau GmbH Aitrachstraße 7 84130 Dingolfing"/>
@@ -158,12 +154,10 @@
<column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
<column name="SALESORDERDATE" valueDate="2021-06-29T12:00:00"/>
<column name="DUNNINGDATE" valueDate="2021-06-29T12:06:46"/>
- <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="CURRENCY" value="EUR"/>
<column name="NET" valueNumeric="10600.00"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
- <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
<column name="VAT" valueNumeric="1900.00"/>
<column name="PAYDUEDATE" valueDate="2020-08-18T12:00:00"/>
<column name="PAYMENTADDRESS" value="Meister Messebau Aitrachstraße 5 84130 Dingolfing"/>
@@ -283,12 +277,10 @@
<column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
<column name="SALESORDERDATE" valueDate="2020-07-06T12:00:00"/>
<column name="DUNNINGDATE" valueDate="2021-06-29T12:02:24"/>
- <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="CURRENCY" value="EUR"/>
<column name="NET" valueNumeric="3750.00"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
- <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
<column name="VAT" valueNumeric="712.50"/>
<column name="PAYDUEDATE" valueDate="2020-08-13T12:00:00"/>
<column name="PAYMENTADDRESS" value="Meister Messebau GmbH Aitrachstraße 7 84130 Dingolfing"/>
@@ -378,12 +370,10 @@
<column name="OBJECT_ROWID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
<column name="SALESORDERDATE" valueDate="2020-07-08T12:00:00"/>
<column name="DUNNINGDATE" valueDate="2021-06-29T12:00:00"/>
- <column name="DISCOUNTED_VAT" valueNumeric="712.50"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="CURRENCY" value="EUR"/>
<column name="NET" valueNumeric="3750.00"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
- <column name="DISCOUNTED_NET" valueNumeric="3750.00"/>
<column name="VAT" valueNumeric="712.50"/>
<column name="PAYDUEDATE" valueDate="2020-08-15T12:00:00"/>
<column name="PAYMENTADDRESS" value="Meister Messebau GmbH Aitrachstraße 7 84130 Dingolfing"/>
@@ -406,12 +396,10 @@
<column name="OBJECT_ROWID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
<column name="SALESORDERDATE" valueDate="2020-08-11T12:00:00"/>
<column name="DUNNINGDATE" valueDate="2021-06-29T12:07:39"/>
- <column name="DISCOUNTED_VAT" valueNumeric="1900.00"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="CURRENCY" value="EUR"/>
<column name="NET" valueNumeric="10600.00"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
- <column name="DISCOUNTED_NET" valueNumeric="10600.00"/>
<column name="VAT" valueNumeric="1900.00"/>
<column name="PAYDUEDATE" valueDate="2020-08-18T12:00:00"/>
<column name="PAYMENTADDRESS" value="Meister Messebau Aitrachstraße 5 84130 Dingolfing"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
index 743844503622c2e957f5627f4ca5d518abec683f..f0d59d1e5e460741cf7cf5a8c3cefa187501acc0 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesorderitem.xml
@@ -14,6 +14,7 @@
<column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
<column name="SALESORDERITEMID" value="001410e8-f70b-4041-901c-02275ff6deb5"/>
<column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -26,6 +27,7 @@
<column name="PRICE" valueNumeric="3500.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="SALESORDERITEMID" value="07ceecff-e3cc-4891-b820-3fb6b977a9cc"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -38,6 +40,7 @@
<column name="PRICE" valueNumeric="3500.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="SALESORDERITEMID" value="08de406a-79bf-468f-8fea-29acfc79a1e8"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -51,6 +54,7 @@
<column name="PRICE" valueNumeric="600.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="SALESORDERITEMID" value="0b6823a7-7c89-4da8-a4fb-1f2ce4d3a6f0"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1200.00"/>
@@ -74,6 +78,7 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="SALESORDERITEMID" value="17856c63-10f8-46c6-9295-5ad5bedff8ba"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="5.00"/>
@@ -87,6 +92,7 @@
<column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="SALESORDERITEMID" value="2f409cb9-4d85-4e39-8e78-4838cd9a9224"/>
<column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="10.00"/>
@@ -100,6 +106,7 @@
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="SALESORDERITEMID" value="35c54c0a-760c-4a6b-a5f1-4d6beaec07ac"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="5.00"/>
@@ -113,6 +120,7 @@
<column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="SALESORDERITEMID" value="368569a0-4d4d-4535-b2a5-8e380d5612ef"/>
<column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -125,6 +133,7 @@
<column name="PRICE" valueNumeric="25000.00"/>
<column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
<column name="SALESORDERITEMID" value="39da8def-662f-4904-b9bf-b4e97affbeb7"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="50.00"/>
@@ -138,6 +147,7 @@
<column name="PRICE" valueNumeric="1060.00"/>
<column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="SALESORDERITEMID" value="3d9a18ac-2182-4cd5-a2c4-140674466821"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="2.00"/>
@@ -151,6 +161,7 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="2.00"/>
@@ -164,6 +175,7 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -177,6 +189,7 @@
<column name="PRICE" valueNumeric="50000.00"/>
<column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
<column name="SALESORDERITEMID" value="468023b8-fb3e-4e4c-9d30-841d12888b73"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -190,6 +203,7 @@
<column name="PRICE" valueNumeric="600.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="SALESORDERITEMID" value="4c403665-3fc3-43cd-9921-1f07e2a358ef"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="2.00"/>
@@ -203,6 +217,7 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -216,6 +231,7 @@
<column name="PRICE" valueNumeric="25000.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="SALESORDERITEMID" value="692f2acd-08b6-45d1-bcdf-6f8e46999039"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -230,6 +246,7 @@
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="SALESORDERITEMID" value="6e12bc70-5607-4ee5-b40f-2d65fd07ba22"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -266,6 +283,7 @@
<column name="PRICE" valueNumeric="125.00"/>
<column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
<column name="SALESORDERITEMID" value="8e946799-4921-41a6-a419-eca29dc1a3e0"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="5.00"/>
@@ -294,6 +312,7 @@
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="SALESORDERITEMID" value="950fd897-5ec0-4838-b45f-1b811ab391dd"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -307,6 +326,7 @@
<column name="PRICE" valueNumeric="600.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="SALESORDERITEMID" value="a157e7c1-8ed3-4231-9b84-1db9aa4f6bc6"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -319,6 +339,7 @@
<column name="PRICE" valueNumeric="1000.00"/>
<column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
<column name="SALESORDERITEMID" value="b4f02784-4593-4caf-a845-40b426d00082"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1000.00"/>
@@ -331,6 +352,7 @@
<column name="PRICE" valueNumeric="150.00"/>
<column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
<column name="SALESORDERITEMID" value="b5f17aaa-ffa7-4c8e-bbcb-d51cfecb06db"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="5.00"/>
@@ -359,6 +381,7 @@
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="SALESORDERITEMID" value="cd79054e-b74b-4c09-b49b-a62ee738818b"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -372,6 +395,7 @@
<column name="PRICE" valueNumeric="1000.00"/>
<column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
<column name="SALESORDERITEMID" value="cd7c9255-0de8-4b15-a952-caf9669b447a"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
<insert tableName="salesorderitem">
<column name="QUANTITY" valueNumeric="1.00"/>
@@ -385,6 +409,7 @@
<column name="PRICE" valueNumeric="2500.00"/>
<column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
<column name="SALESORDERITEMID" value="e53aaecf-d8b6-4327-96cb-66f004e4b5fb"/>
+ <column name="DISCOUNT" valueNumeric="0"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
index 2f5a2758f730037ad35989e124478cab99f5b5db..ae504db23f5b56a81d527ad993272f9d15562dd2 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
@@ -15,7 +15,6 @@
<column name="SALESPROJECTID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="PROJECTTITLE" value="Erstprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
- <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -30,7 +29,6 @@
<column name="SALESPROJECTID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="PROJECTTITLE" value="Skyscraper / Pilotprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
- <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -43,7 +41,7 @@
<column name="SALESPROJECTID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
<column name="PROJECTTITLE" value="Meister Messebau/ Umsetzung"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
- <column name="CURRENCYRATE_ID" value=""/>
+ <column name="PROBABILITY" valueNumeric="0.00"/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASEOFFER"/>
@@ -58,7 +56,6 @@
<column name="SALESPROJECTID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="PROJECTTITLE" value="Kronen Pilotprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
- <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -87,7 +84,6 @@
<column name="SALESPROJECTID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
<column name="PROJECTTITLE" value="Meister Messebau "/>
<column name="STATUS" value="SALPROJSTATPARTIAL"/>
- <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -102,7 +98,6 @@
<column name="SALESPROJECTID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="PROJECTTITLE" value="Transatlantik Initialprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
- <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASEPROS"/>
@@ -116,7 +111,6 @@
<column name="SALESPROJECTID" value="e1d29d7a-744b-412d-8b29-11810a592139"/>
<column name="PROJECTTITLE" value="FSA Projekteinführung"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
- <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASECONTACT"/>
@@ -130,7 +124,6 @@
<column name="SALESPROJECTID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
<column name="PROJECTTITLE" value="Projekt 123"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
- <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASENEGO"/>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
index 3182ed1152e0baf421315d7cf0383b301946c134..f264af0cf465dacffde1b37e6b43ab99d3948e49 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/weblink.xml
@@ -59,7 +59,7 @@
<column name="LINKTYPE" value="WEBLINK_EMAIL"/>
<column name="USER_EDIT" value="Lisa Sommer"/>
<column name="URL" value="http://www.adito.de"/>
- <column name="USER_NEW" value="Admin"/>
+ <column name="USER_NEW" value="Lisa Sommer"/>
<column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
<column name="SCORE" valueNumeric="0"/>
<column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
@@ -67,5 +67,44 @@
<column name="ISREDIRECT" valueNumeric="1"/>
<column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
</insert>
+ <insert tableName="weblink">
+ <column name="WEBLINKID" value="c82da3d0-8156-4dd5-86f2-ad68ea3d11ef"/>
+ <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+ <column name="USER_EDIT" value="Lisa Sommer"/>
+ <column name="URL" value="https://www.adito.de/unternehmen/philosophie.html"/>
+ <column name="USER_NEW" value="Lisa Sommer"/>
+ <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+ <column name="SCORE" valueNumeric="0"/>
+ <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+ <column name="PLACEHOLDER" value="adito_about"/>
+ <column name="ISREDIRECT" valueNumeric="1"/>
+ <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+ </insert>
+ <insert tableName="weblink">
+ <column name="WEBLINKID" value="75b2ca5c-e270-45ad-9ade-7f70a15674b4"/>
+ <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+ <column name="USER_EDIT" value="Lisa Sommer"/>
+ <column name="URL" value="https://www.adito.de/impressum.html"/>
+ <column name="USER_NEW" value="Lisa Sommer"/>
+ <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+ <column name="SCORE" valueNumeric="0"/>
+ <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+ <column name="PLACEHOLDER" value="adito_impressum"/>
+ <column name="ISREDIRECT" valueNumeric="1"/>
+ <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+ </insert>
+ <insert tableName="weblink">
+ <column name="WEBLINKID" value="ea7300fc-ee2d-49e6-8eb2-ff5b5922737a"/>
+ <column name="LINKTYPE" value="WEBLINK_EMAIL"/>
+ <column name="USER_EDIT" value="Lisa Sommer"/>
+ <column name="URL" value="https://www.adito.de/kontakt/formular.html"/>
+ <column name="USER_NEW" value="Lisa Sommer"/>
+ <column name="DATE_NEW" valueDate="2021-04-27T07:32:15"/>
+ <column name="SCORE" valueNumeric="0"/>
+ <column name="DATE_EDIT" valueDate="2021-10-15T08:19:23"/>
+ <column name="PLACEHOLDER" value="adito_contact"/>
+ <column name="ISREDIRECT" valueNumeric="1"/>
+ <column name="LINKEVALUATIONTYPE" value="LINKEVALUATION_DEFAULT"/>
+ </insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/workflows/blob/advertisingShipment.xml b/.liquibase/Data_alias/basic/workflows/blob/advertisingShipment.xml
index 260461ae913e6fbad7d7a8b31580ff889210ca26..2d97bd7749b191ad539e461701e8a45e84fdb3c4 100644
--- a/.liquibase/Data_alias/basic/workflows/blob/advertisingShipment.xml
+++ b/.liquibase/Data_alias/basic/workflows/blob/advertisingShipment.xml
@@ -5,7 +5,7 @@
<documentation>Workflow for handling Advertisingmaterials</documentation>
<startEvent id="startEvent1" flowable:formFieldValidation="true"></startEvent>
<exclusiveGateway id="sid-ADD3DA2A-E320-4E07-9D04-73D8A9625D1E"></exclusiveGateway>
- <userTask id="sid-3EB74D83-9BE8-427C-A5E8-72D906429892" name="Test Post Versand" flowable:candidateGroups="PROJECT_OfficeStaff,PROJECT_Marketing" flowable:formFieldValidation="true">
+ <userTask id="sid-3EB74D83-9BE8-427C-A5E8-72D906429892" name="Post Versand" flowable:candidateGroups="PROJECT_OfficeStaff,PROJECT_Marketing" flowable:formFieldValidation="true">
<extensionElements>
<modeler:group-info-name-PROJECT_OfficeStaff xmlns:modeler="http://flowable.org/modeler"><![CDATA[Office staff]]></modeler:group-info-name-PROJECT_OfficeStaff>
<modeler:group-info-name-PROJECT_Marketing xmlns:modeler="http://flowable.org/modeler"><![CDATA[Marketing]]></modeler:group-info-name-PROJECT_Marketing>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 859aea401601e5937363e570257bc3ce9d4738cd..696a2bea940ae03c8d6d429f6940d1a20b371598 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -50,7 +50,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -150,8 +150,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -164,8 +164,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -205,7 +205,7 @@
<name>PICTURE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -445,8 +445,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -473,8 +473,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -720,8 +720,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -748,8 +748,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -775,7 +775,7 @@
<name>PICTURE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1092,8 +1092,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1120,8 +1120,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -1175,7 +1175,7 @@
<name>VALIDATION_RESULT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1242,8 +1242,8 @@
<name>ISSTANDARD</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -1283,8 +1283,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1297,8 +1297,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -1406,8 +1406,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1466,8 +1466,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1566,8 +1566,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1585,7 +1585,7 @@
<name>REMARK</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1645,8 +1645,8 @@
<name>ADVERTISING</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -1706,7 +1706,7 @@
<columnType v="12" />
<size v="100" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="true" />
<index v="true" />
<title>Product number</title>
@@ -1822,8 +1822,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1850,8 +1850,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -1877,7 +1877,7 @@
<name>PICTURE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1925,8 +1925,8 @@
<name>OPTIONAL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -1945,8 +1945,8 @@
<name>TAKEPRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -1992,7 +1992,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2092,7 +2092,7 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2112,7 +2112,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2205,8 +2205,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2224,7 +2224,7 @@
<name>FROMQUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2277,8 +2277,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2396,7 +2396,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2417,8 +2417,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2463,8 +2463,8 @@
<name>IN_OUT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -2641,7 +2641,7 @@
<name>FLAG</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -2702,7 +2702,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2728,8 +2728,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2780,10 +2780,10 @@
<name>PROBABILITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
+ <columnType v="3" />
+ <size v="14" />
+ <scale v="2" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title>Probability</title>
@@ -2862,7 +2862,7 @@
<name>NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -2887,7 +2887,7 @@
<name>HEADER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -2949,7 +2949,7 @@
<name>ADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3022,7 +3022,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3044,8 +3044,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3072,8 +3072,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -3127,7 +3127,7 @@
<name>FOOTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3169,35 +3169,7 @@
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DISCOUNTED_NET</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DISCOUNTED_VAT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3298,7 +3270,7 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3318,7 +3290,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3338,7 +3310,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3430,10 +3402,10 @@
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<title>Discount %</title>
@@ -3470,8 +3442,8 @@
<name>OPTIONAL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -3545,7 +3517,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title>Assigned to</title>
<description></description>
<customProperties>
@@ -3580,7 +3552,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3601,8 +3573,8 @@
<name>SHOWPRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3636,8 +3608,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3655,7 +3627,7 @@
<name>VOLUME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -3675,7 +3647,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3696,8 +3668,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3828,7 +3800,7 @@
<columnType v="3" />
<size v="6" />
<scale v="2" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -3904,8 +3876,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3918,8 +3890,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4056,7 +4028,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4113,8 +4085,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -4194,8 +4166,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -4214,7 +4186,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4323,8 +4295,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4351,8 +4323,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -4378,8 +4350,8 @@
<name>RESPONSIBLE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="50" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -4449,7 +4421,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -4470,7 +4442,7 @@
<name>FOOTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4491,7 +4463,7 @@
<name>HEADER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4534,8 +4506,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4608,7 +4580,7 @@
<name>NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -4723,7 +4695,7 @@
<name>NOTICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4745,8 +4717,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4765,8 +4737,8 @@
<name>CANCELLATION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -4792,8 +4764,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4812,7 +4784,7 @@
<name>DUNNINGTEXT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -4860,8 +4832,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -4958,7 +4930,7 @@
<name>PAYMENTADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -5026,7 +4998,7 @@
<name>DELIVERYADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -5047,8 +5019,8 @@
<name>ORDERSTATUS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -5083,39 +5055,11 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DISCOUNTED_VAT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DISCOUNTED_NET</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5188,7 +5132,7 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5209,7 +5153,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5230,7 +5174,7 @@
<name>VAT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -5283,10 +5227,10 @@
<name>DISCOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -5410,7 +5354,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Assigned to</title>
<description></description>
@@ -5461,7 +5405,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -5529,8 +5473,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -5622,7 +5566,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -5724,8 +5668,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -5839,8 +5783,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -5867,8 +5811,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -6011,7 +5955,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -6226,8 +6170,8 @@
<name>ATTRIBUTE_ACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -6310,7 +6254,7 @@
<name>ATTRIBUTE_INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -6401,8 +6345,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -6421,7 +6365,7 @@
<name>NUMBER_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -6541,8 +6485,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -6569,8 +6513,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -6721,8 +6665,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -6735,8 +6679,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -6795,8 +6739,8 @@
<name>ISESSENTIAL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -6900,8 +6844,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -7025,8 +6969,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -7216,8 +7160,8 @@
<name>BOOL_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -7251,7 +7195,7 @@
<name>NUMBER_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -7314,7 +7258,7 @@
<name>LONG_CHAR_VALUE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -7896,8 +7840,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8188,8 +8132,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8208,7 +8152,7 @@
<name>LOCKED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="16" />
+ <columnType v="-7" />
<size v="1" />
<scale v="0" />
<notNull v="true" />
@@ -8297,7 +8241,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -8382,8 +8326,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
@@ -8430,8 +8374,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8479,8 +8423,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8611,8 +8555,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8646,8 +8590,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8743,8 +8687,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8799,8 +8743,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -8896,8 +8840,8 @@
<name>ALL_TICKET_CATEGORIES</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -8930,8 +8874,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -8958,8 +8902,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9048,8 +8992,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9104,8 +9048,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9235,8 +9179,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9277,8 +9221,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9357,8 +9301,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9497,8 +9441,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9664,8 +9608,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9699,8 +9643,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9838,8 +9782,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -9880,8 +9824,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -9907,7 +9851,7 @@
<name>NET</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -10019,7 +9963,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="36" />
+ <size v="63" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -10032,7 +9976,7 @@
<name>FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10209,7 +10153,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -10220,7 +10164,7 @@
<name>SCOREPOINTS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -10310,9 +10254,9 @@
<name>SCOREPERCENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="4" />
<size v="10" />
- <scale v="2" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -10490,8 +10434,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -10503,7 +10447,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10658,7 +10602,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -10732,7 +10676,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10760,7 +10704,7 @@
<name>REASON</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -10775,8 +10719,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -10837,8 +10781,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11043,8 +10987,8 @@
<name>CREATEACTIVITIES</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11085,8 +11029,8 @@
<name>USE_TEMPLATE_ATTACHMENTS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11100,8 +11044,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11156,8 +11100,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11184,8 +11128,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11235,6 +11179,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CAMPAIGN_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -11330,8 +11288,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11371,8 +11329,8 @@
<name>IS_TEST_RECIPIENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -11386,8 +11344,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11400,8 +11358,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11525,8 +11483,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11580,7 +11538,7 @@
<name>EMAIL_DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -11595,8 +11553,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11721,8 +11679,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11744,6 +11702,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -11769,8 +11783,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11783,8 +11797,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11832,8 +11846,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -11983,7 +11997,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12045,7 +12059,7 @@
<name>MAIL</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12060,8 +12074,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12102,8 +12116,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -12143,7 +12157,7 @@
<name>RECIPIENTS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12172,8 +12186,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -12247,8 +12261,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12289,8 +12303,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -12669,7 +12683,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -12722,8 +12736,8 @@
<name>ONSITE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -12736,8 +12750,8 @@
<name>RESPONSIBLE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -12799,8 +12813,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12812,7 +12826,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -12868,8 +12882,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -12896,8 +12910,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -12993,7 +13007,7 @@
<name>SCAN_PATTERN</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -13132,8 +13146,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13188,8 +13202,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13453,8 +13467,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13781,8 +13795,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13907,8 +13921,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -13935,8 +13949,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14011,8 +14025,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14053,8 +14067,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14406,7 +14420,7 @@
<name>OBJECT_FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -14421,8 +14435,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14435,8 +14449,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14594,8 +14608,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14650,8 +14664,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14817,8 +14831,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -14831,8 +14845,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15004,8 +15018,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15032,8 +15046,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -15136,8 +15150,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15205,7 +15219,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -15276,8 +15290,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15304,8 +15318,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15379,7 +15393,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -15442,7 +15456,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="92" />
- <size v="8" />
+ <size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -15456,7 +15470,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="92" />
- <size v="8" />
+ <size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -15581,7 +15595,7 @@
<name>PREPARATION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -15844,8 +15858,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -15872,8 +15886,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -16004,8 +16018,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16046,8 +16060,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16129,7 +16143,7 @@
<name>DISTRICT_FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -16192,8 +16206,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16248,8 +16262,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16318,8 +16332,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16332,8 +16346,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16514,8 +16528,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16528,8 +16542,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16542,8 +16556,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16570,8 +16584,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16672,7 +16686,7 @@
<name>DISCUSSIONTEXT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -16687,8 +16701,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16743,8 +16757,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16819,8 +16833,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16847,8 +16861,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -16937,8 +16951,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17013,7 +17027,7 @@
<name>CONTENTDECODED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -17048,7 +17062,7 @@
<name>CONTENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -17070,8 +17084,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17215,8 +17229,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17257,8 +17271,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17423,8 +17437,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17437,8 +17451,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17513,8 +17527,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17555,8 +17569,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17720,8 +17734,8 @@
<name>IS_ARCHIVED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17809,7 +17823,7 @@
<name>OBJECT_FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -17823,8 +17837,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17913,8 +17927,8 @@
<name>TRIGGEREVENTDELETE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17926,8 +17940,8 @@
<name>TRIGGEREVENTINSERT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17939,8 +17953,8 @@
<name>TRIGGEREVENTUPDATE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -17953,8 +17967,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -17991,7 +18005,7 @@
<name>OBJECT_FIELD</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -18050,8 +18064,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18076,8 +18090,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18187,8 +18201,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18213,8 +18227,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18251,8 +18265,8 @@
<name>AUTO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -18265,7 +18279,7 @@
<name>COND</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -18279,8 +18293,8 @@
<name>FILTER_USED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -18340,8 +18354,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18353,8 +18367,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18433,7 +18447,7 @@
<name>COND</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -18507,8 +18521,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18533,8 +18547,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18598,8 +18612,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18722,8 +18736,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18753,7 +18767,7 @@
<size v="36" />
<scale v="0" />
<notNull v="false" />
- <isUnique v="false" />
+ <isUnique v="true" />
<index v="true" />
<documentation>%aditoprj%/aliasDefinition/Data_alias/aliasdefinitionsub/entitygroup/entities/ab_synccontact/entityfields/asys_favoriteid/documentation.adoc</documentation>
<title></title>
@@ -18792,8 +18806,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18820,8 +18834,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18856,7 +18870,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -18874,16 +18888,23 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>${WEBLINK_SCORE}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18904,14 +18925,20 @@
<documentation></documentation>
<title></title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -18958,8 +18985,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>URL</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
@@ -18986,8 +19020,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Placeholder</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>WORKFLOWPROCESSDEFINITION_KEY</name>
@@ -19000,22 +19041,36 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Workflow</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ISREDIRECT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Redirect</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>WORKFLOWSIGNAL_NAME</name>
@@ -19028,8 +19083,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Signal</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ACTION_TYPE</name>
@@ -19084,8 +19146,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19112,8 +19174,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19201,7 +19263,7 @@
<name>ERRORMESSAGE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -19314,8 +19376,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19418,8 +19480,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19446,8 +19508,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19646,8 +19708,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19660,8 +19722,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -19701,8 +19763,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -19750,8 +19812,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19792,8 +19854,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="true" />
@@ -19924,8 +19986,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -19938,8 +20000,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20056,8 +20118,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20070,8 +20132,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20187,8 +20249,8 @@
<name>IS_DEFAULT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -20202,8 +20264,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20216,8 +20278,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20376,8 +20438,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20390,8 +20452,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20404,8 +20466,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20479,7 +20541,7 @@
<name>MONTH_FACTOR</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="5" />
<scale v="2" />
<notNull v="false" />
@@ -20527,7 +20589,7 @@
<name>FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -20542,8 +20604,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20570,8 +20632,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20693,8 +20755,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -20795,8 +20857,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21116,7 +21178,7 @@
<name>PERSINFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -21481,8 +21543,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21522,7 +21584,7 @@
<name>ORGINFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -21565,8 +21627,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21641,7 +21703,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2004" />
- <size v="2147483647" />
+ <size v="65535" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -21655,7 +21717,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="2004" />
- <size v="2147483647" />
+ <size v="65535" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -21759,8 +21821,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21820,7 +21882,7 @@
<name>FILTER</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -21918,8 +21980,8 @@
<name>ISACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -21947,8 +22009,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -21961,8 +22023,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22050,7 +22112,7 @@
<name>PRICE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -22072,8 +22134,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22085,7 +22147,7 @@
<name>QUANTITY</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -22106,7 +22168,7 @@
<name>INFO</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -22193,7 +22255,7 @@
<name>TARGETAMOUNT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2" />
+ <columnType v="3" />
<size v="14" />
<scale v="2" />
<notNull v="false" />
@@ -22275,8 +22337,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22302,8 +22364,8 @@
<name>SENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -22415,8 +22477,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22469,8 +22531,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22527,7 +22589,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
+ <notNull v="false" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -22573,8 +22635,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22705,8 +22767,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22733,8 +22795,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22836,8 +22898,8 @@
<name>ACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
@@ -22851,8 +22913,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23005,8 +23067,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23081,8 +23143,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23094,7 +23156,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -23123,8 +23185,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23208,20 +23270,6 @@
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
- <entityFieldDb>
- <name>DATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>INBOXFILTERGROUPID</name>
<dbName></dbName>
@@ -23278,64 +23326,58 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>INBOX_EMPLOYEEGROUP_RELATION</name>
- <dbName></dbName>
- <idColumn>INBOX_EMPLOYEEGROUP_RELATIONID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>EMPLOYEEGROUP_ID</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="93" />
+ <size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INBOX_EMPLOYEEGROUP_RELATIONID</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
<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>
</entityFieldDb>
<entityFieldDb>
- <name>INBOX_ID</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -23343,9 +23385,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>EMPLOYEEGROUP_RULEGROUP</name>
+ <name>INBOX_EMPLOYEEGROUP_RELATION</name>
<dbName></dbName>
- <idColumn>EMPLOYEEGROUP_RULEGROUPID</idColumn>
+ <idColumn>INBOX_EMPLOYEEGROUP_RELATIONID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -23361,21 +23403,21 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>DATE</name>
+ <name>EMPLOYEEGROUP_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEEGROUP_RULEGROUPID</name>
+ <name>INBOX_EMPLOYEEGROUP_RELATIONID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
@@ -23389,24 +23431,184 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>STATE</name>
+ <name>INBOX_ID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="1" />
<size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>NAME</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>EMPLOYEEGROUP_RULEGROUP</name>
+ <dbName></dbName>
+ <idColumn>EMPLOYEEGROUP_RULEGROUPID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>EMPLOYEEGROUP_RULEGROUPID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>STATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>NAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
<size v="50" />
<scale v="0" />
<notNull v="false" />
@@ -23506,6 +23708,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -23527,12 +23785,54 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>DATE</name>
+ <name>STATUS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EMPLOYEEGROUPID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>GROUPNAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -23541,7 +23841,69 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>STATUS</name>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>INBOXFILTERGROUP_RELATION</name>
+ <dbName></dbName>
+ <idColumn>INBOXFILTERGROUP_RELATIONID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>INBOXFILTERGROUP_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -23549,27 +23911,83 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEEGROUPID</name>
+ <name>INBOXFILTERGROUP_RELATIONID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>INBOX_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>GROUPNAME</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -23585,9 +24003,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>INBOXFILTERGROUP_RELATION</name>
+ <name>EMPLOYEEGROUP_CONTACT_RELATION</name>
<dbName></dbName>
- <idColumn>INBOXFILTERGROUP_RELATIONID</idColumn>
+ <idColumn>EMPLOYEEGROUP_CONTACT_RELATIONID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -23603,7 +24021,7 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>INBOXFILTERGROUP_ID</name>
+ <name>EMPLOYEEGROUP_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -23617,7 +24035,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INBOXFILTERGROUP_RELATIONID</name>
+ <name>EMPLOYEEGROUP_CONTACT_RELATIONID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
@@ -23631,7 +24049,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INBOX_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -23644,64 +24062,58 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>EMPLOYEEGROUP_CONTACT_RELATION</name>
- <dbName></dbName>
- <idColumn>EMPLOYEEGROUP_CONTACT_RELATIONID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>EMPLOYEEGROUP_ID</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="93" />
+ <size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEEGROUP_CONTACT_RELATIONID</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
<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>
</entityFieldDb>
<entityFieldDb>
- <name>CONTACT_ID</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -23730,8 +24142,8 @@
<name>ACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -23856,7 +24268,7 @@
<name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -23912,8 +24324,8 @@
<name>REVIEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -23964,6 +24376,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -24031,8 +24499,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -24082,6 +24550,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -24176,36 +24700,92 @@
<name>MAIL_ADDRESS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="254" />
+ <columnType v="12" />
+ <size v="254" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DEFAULT_TICKETTEMPLATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>WORKFLOW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DEFAULTSIGNATURE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="-7" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SIGNATURE_DOCUMENTTEMPLATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DEFAULT_TICKETTEMPLATE_ID</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="93" />
+ <size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>WORKFLOW</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="255" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24215,11 +24795,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DEFAULTSIGNATURE</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="93" />
+ <size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -24229,15 +24809,15 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SIGNATURE_DOCUMENTTEMPLATE_ID</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -24380,6 +24960,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -24418,7 +25054,7 @@
<name>COND</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -24456,6 +25092,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -24509,8 +25201,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -24537,8 +25229,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -24599,8 +25291,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -24626,7 +25318,7 @@
<name>CONTENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -24641,8 +25333,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -24668,7 +25360,7 @@
<name>METADATA</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -24788,8 +25480,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -24830,8 +25522,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -25093,6 +25785,111 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>ASYS_VERSIONHISTORY</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn></idColumn>
+ <idGeneratorType v="1" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>TABLE_NAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>VERSION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="23" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OPERATION_DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OPERATION_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
index 7e4ace02479c4e7f671fe5549d3209bcfd08194a..647352ba35dc3be10bc3a57997f06cda91ff1944 100644
--- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
+++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
@@ -2931,20 +2931,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DISCOUNTED_VAT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="3" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>VERSNR</name>
<dbName></dbName>
@@ -3226,27 +3212,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DISCOUNTED_NET</name>
+ <name>PROBABILITY</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="3" />
<size v="14" />
<scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>PROBABILITY</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -3490,7 +3462,7 @@
<columnType v="3" />
<size v="14" />
<scale v="2" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -5785,6 +5757,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -11933,6 +11961,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CAMPAIGN_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -12966,7 +13008,7 @@
<columnType v="3" />
<size v="6" />
<scale v="2" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -15245,20 +15287,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DISCOUNTED_VAT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="3" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>PAYDUEDATE</name>
<dbName></dbName>
@@ -15609,20 +15637,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DISCOUNTED_NET</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="3" />
- <size v="14" />
- <scale v="2" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DELIVERYADDRESS</name>
<dbName></dbName>
@@ -15866,7 +15880,7 @@
<columnType v="3" />
<size v="14" />
<scale v="2" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -20400,20 +20414,6 @@
<syncIds></syncIds>
</auditSyncConfig>
<entityFields>
- <entityFieldDb>
- <name>DATE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="19" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>INBOXFILTERGROUPID</name>
<dbName></dbName>
@@ -20470,6 +20470,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -20533,29 +20589,8 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>EMPLOYEEGROUP_RULEGROUP</name>
- <category></category>
- <dbName></dbName>
- <idColumn>EMPLOYEEGROUP_RULEGROUPID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>DATE</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
@@ -20569,25 +20604,25 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEEGROUP_RULEGROUPID</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
<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>
</entityFieldDb>
<entityFieldDb>
- <name>STATE</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="36" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -20597,7 +20632,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>NAME</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -20613,10 +20648,10 @@
</entityFields>
</entityDb>
<entityDb>
- <name>INBOXFILTER</name>
+ <name>EMPLOYEEGROUP_RULEGROUP</name>
<category></category>
<dbName></dbName>
- <idColumn>INBOXFILTERID</idColumn>
+ <idColumn>EMPLOYEEGROUP_RULEGROUPID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -20632,21 +20667,140 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>INBOXFILTERGROUP_ID</name>
+ <name>EMPLOYEEGROUP_RULEGROUPID</name>
<dbName></dbName>
- <primaryKey v="false" />
+ <primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
+ <notNull v="true" />
+ <isUnique v="true" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>TICKETTEMPLATE_ID</name>
+ <name>STATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>NAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>INBOXFILTER</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn>INBOXFILTERID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>INBOXFILTERGROUP_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TICKETTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -20701,6 +20855,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -20723,7 +20933,49 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>DATE</name>
+ <name>STATUS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EMPLOYEEGROUPID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>GROUPNAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
@@ -20737,7 +20989,70 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>STATUS</name>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>INBOXFILTERGROUP_RELATION</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn>INBOXFILTERGROUP_RELATIONID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>INBOXFILTERGROUP_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -20745,27 +21060,83 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>INBOXFILTERGROUP_RELATIONID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>INBOX_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
<index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEEGROUPID</name>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
<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>
</entityFieldDb>
<entityFieldDb>
- <name>GROUPNAME</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -20781,10 +21152,10 @@
</entityFields>
</entityDb>
<entityDb>
- <name>INBOXFILTERGROUP_RELATION</name>
+ <name>EMPLOYEEGROUP_CONTACT_RELATION</name>
<category></category>
<dbName></dbName>
- <idColumn>INBOXFILTERGROUP_RELATIONID</idColumn>
+ <idColumn>EMPLOYEEGROUP_CONTACT_RELATIONID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -20800,7 +21171,7 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>INBOXFILTERGROUP_ID</name>
+ <name>EMPLOYEEGROUP_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -20814,7 +21185,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INBOXFILTERGROUP_RELATIONID</name>
+ <name>EMPLOYEEGROUP_CONTACT_RELATIONID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="1" />
@@ -20828,7 +21199,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INBOX_ID</name>
+ <name>CONTACT_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -20841,65 +21212,58 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>EMPLOYEEGROUP_CONTACT_RELATION</name>
- <category></category>
- <dbName></dbName>
- <idColumn>EMPLOYEEGROUP_CONTACT_RELATIONID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>EMPLOYEEGROUP_ID</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="93" />
+ <size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>EMPLOYEEGROUP_CONTACT_RELATIONID</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
<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>
</entityFieldDb>
<entityFieldDb>
- <name>CONTACT_ID</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21163,6 +21527,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -21282,6 +21702,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -21360,7 +21836,63 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SIGNATURE_DOCUMENTTEMPLATE_ID</name>
+ <name>SIGNATURE_DOCUMENTTEMPLATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>INBOX_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DEFAULTSIGNATURE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="-7" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>MAILSIGNATUREID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DEFAULT_TICKETTEMPLATE_ID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="1" />
@@ -21374,25 +21906,25 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>INBOX_ID</name>
+ <name>WORKFLOW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="255" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>DEFAULTSIGNATURE</name>
+ <name>DATE_EDIT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="-7" />
- <size v="3" />
+ <columnType v="93" />
+ <size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -21402,39 +21934,39 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>MAILSIGNATUREID</name>
+ <name>USER_EDIT</name>
<dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
<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>
</entityFieldDb>
<entityFieldDb>
- <name>DEFAULT_TICKETTEMPLATE_ID</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="93" />
+ <size v="19" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>WORKFLOW</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="255" />
+ <size v="50" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -21814,6 +22346,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -21891,6 +22479,62 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -22222,6 +22866,111 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>ASYS_VERSIONHISTORY</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn></idColumn>
+ <idGeneratorType v="1" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>TABLE_NAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>VERSION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="23" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OPERATION_DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>OPERATION_TYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="255" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index de6505640c09bff45e08372fe5b76ed266128395..85afd87bb6d1be5e353fbc97fc4b4a248a7be9f8 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -19,8 +19,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="26" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -32,8 +32,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -57,7 +57,7 @@
<name>ICON</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -148,7 +148,7 @@
<name>XMLDATA</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -230,7 +230,7 @@
<name>BINDATA</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -270,8 +270,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -283,8 +283,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -296,7 +296,7 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="127" />
+ <size v="2048" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -373,7 +373,7 @@
<name>PREVIEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -473,8 +473,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -486,8 +486,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -503,7 +503,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
</entityFieldDb>
@@ -512,8 +512,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -564,8 +564,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -616,8 +616,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -667,7 +667,7 @@
<name>VCOMPONENT</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -706,7 +706,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
</entityFieldDb>
@@ -745,7 +745,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
</entityFieldDb>
@@ -814,8 +814,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -827,8 +827,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -883,7 +883,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
</entityFieldDb>
@@ -896,7 +896,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<title></title>
<description></description>
</entityFieldDb>
@@ -904,7 +904,7 @@
<name>PROPVAL_CLOB</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -939,8 +939,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -952,8 +952,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -977,7 +977,7 @@
<name>ICON</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1094,7 +1094,7 @@
<name>XMLDATA</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1220,7 +1220,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1254,7 +1254,7 @@
<name>PARAMETERS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1327,7 +1327,7 @@
<name>CATEGORIES</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1418,7 +1418,7 @@
<name>PARAMETERS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1431,7 +1431,7 @@
<name>PREVIEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1572,8 +1572,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1586,8 +1586,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -1641,7 +1641,7 @@
<name>RECIPIENTUSERIDS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1669,7 +1669,7 @@
<name>BACKPACK</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1748,9 +1748,9 @@
<columnType v="12" />
<size v="255" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -1764,7 +1764,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -1790,9 +1790,9 @@
<columnType v="12" />
<size v="255" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -1866,7 +1866,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -1911,8 +1911,8 @@
<name>CONDTYPE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -1925,7 +1925,7 @@
<name>COND</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -1956,7 +1956,7 @@
<columnType v="1" />
<size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="true" />
<documentation></documentation>
@@ -2063,8 +2063,8 @@
<name>ASSIGNABLE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="5" />
- <size v="5" />
+ <columnType v="-7" />
+ <size v="3" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -2091,7 +2091,7 @@
<name>CHILDREN</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -2153,7 +2153,7 @@
<name>VISUALISATIONCONFIG</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -2284,7 +2284,7 @@
<name>METRICS</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
+ <columnType v="-1" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -2313,8 +2313,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="true" />
@@ -2361,8 +2361,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2423,8 +2423,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="true" />
<isUnique v="false" />
<index v="false" />
@@ -2687,8 +2687,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2700,7 +2700,7 @@
<name>LOCKED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="16" />
+ <columnType v="-7" />
<size v="1" />
<scale v="0" />
<notNull v="true" />
@@ -2791,8 +2791,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2833,8 +2833,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2926,6 +2926,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>TIMEZONE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="64" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -2939,8 +2953,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2952,8 +2966,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -2969,7 +2983,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -2995,7 +3009,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -3008,7 +3022,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -3056,8 +3070,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3082,8 +3096,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="19" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3266,7 +3280,7 @@
<name>BINDATA</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2004" />
+ <columnType v="-4" />
<size v="2147483647" />
<scale v="0" />
<notNull v="false" />
@@ -3281,8 +3295,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="23" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3295,8 +3309,8 @@
<dbName></dbName>
<primaryKey v="false" />
<columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <size v="23" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3377,7 +3391,7 @@
</entityFields>
</entityDb>
<entityDb>
- <name>ASYS_MAILREPOSIT</name>
+ <name>ASYS_CALENDARSYNC</name>
<dbName></dbName>
<idColumn></idColumn>
<idGeneratorType v="0" />
@@ -3395,11 +3409,11 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>FLAGGED</name>
+ <name>LASTMODIFIED</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="93" />
+ <size v="23" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3409,13 +3423,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>FOLDER</name>
+ <name>MASTERUID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="255" />
+ <size v="512" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -3423,25 +3437,59 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ID</name>
+ <name>SLAVEUID</name>
<dbName></dbName>
<primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="12" />
+ <size v="127" />
<scale v="0" />
<notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SUSER</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="12" />
+ <size v="63" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>ASYS_AUDIT</name>
+ <dbName></dbName>
+ <idColumn></idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="0" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
<entityFieldDb>
- <name>MAIL</name>
+ <name>ACOLUMNNAME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
+ <columnType v="12" />
+ <size v="127" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3451,7 +3499,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>MAILUSER</name>
+ <name>ALIAS</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -3459,18 +3507,18 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RECEIVEDATE</name>
+ <name>ATABLENAME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="12" />
+ <size v="127" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3479,25 +3527,25 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RECENT</name>
+ <name>ATIMESTAMP</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="93" />
+ <size v="23" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="true" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>RECIPIENT</name>
+ <name>AUSER</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="2046" />
+ <size v="255" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3507,11 +3555,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SEEN</name>
+ <name>DATASETID</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="12" />
+ <size v="1023" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3521,11 +3569,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SENDER</name>
+ <name>DATASETNEWVALUE_BLOB</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="127" />
+ <columnType v="-4" />
+ <size v="2147483647" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3535,12 +3583,12 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SENTDATE</name>
+ <name>DATASETNEWVALUE_CLOB</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="-1" />
+ <size v="2147483647" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3549,7 +3597,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SUBJECT</name>
+ <name>DATASETNEWVALUE_STRING</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -3562,32 +3610,26 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_MAILREPOSIT_HASH</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>MAILHASH</name>
+ <name>LOGTIME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="31" />
+ <columnType v="93" />
+ <size v="23" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LOGTYPE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3597,15 +3639,29 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>MAILINFO</name>
+ <name>LOGWRITERUID</name>
<dbName></dbName>
- <primaryKey v="true" />
+ <primaryKey v="false" />
<columnType v="12" />
<size v="127" />
<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>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SQLACTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="1" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
<documentation></documentation>
<title></title>
<description></description>
@@ -3613,7 +3669,7 @@
</entityFields>
</entityDb>
<entityDb>
- <name>ASYS_CALENDARSYNC</name>
+ <name>ASYS_SYNCSLAVES</name>
<dbName></dbName>
<idColumn></idColumn>
<idGeneratorType v="0" />
@@ -3631,12 +3687,12 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>LASTMODIFIED</name>
+ <name>ACTIVE</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -3645,97 +3701,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>MASTERUID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="512" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SLAVEUID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SUSER</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_UIDRESOLVER</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>ENTRY_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ENTRY_UID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="512" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ENTRY_USER</name>
+ <name>DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
@@ -3748,32 +3714,12 @@
<title></title>
<description></description>
</entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_FARM</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
<entityFieldDb>
- <name>ADDRESS</name>
+ <name>DEVICEID</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="255" />
+ <size v="40" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3783,7 +3729,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>CLIENTS</name>
+ <name>INTERVALL</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="4" />
@@ -3797,39 +3743,11 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>FARMVERSION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="12" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LICENSE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SENCODING</name>
+ <name>LASTSYNC</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
+ <columnType v="93" />
+ <size v="23" />
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
@@ -3839,7 +3757,7 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SERVERID</name>
+ <name>SLAVEUID</name>
<dbName></dbName>
<primaryKey v="true" />
<columnType v="12" />
@@ -3852,24 +3770,10 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>WORKLOAD</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
- <name>ASYS_FARM_CLIENT</name>
+ <name>ASYS_VERSIONHISTORY</name>
<dbName></dbName>
<idColumn></idColumn>
<idGeneratorType v="0" />
@@ -3887,55 +3791,27 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>CHARACTERISTIC</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CLIENTID</name>
+ <name>DATE_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
+ <columnType v="93" />
+ <size v="23" />
<scale v="0" />
<notNull v="true" />
- <isUnique v="true" />
+ <isUnique v="false" />
<index v="true" />
<documentation></documentation>
<title></title>
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SADDRESS</name>
+ <name>OPERATION_DESCRIPTION</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="255" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -3943,13 +3819,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>SERVERID</name>
+ <name>OPERATION_TYPE</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="255" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -3957,47 +3833,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>USERNAME</name>
+ <name>TABLE_NAME</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
<size v="255" />
<scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_AUDIT</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>ACOLUMNNAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -4005,13 +3847,13 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ALIAS</name>
+ <name>USER_NEW</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="255" />
+ <size v="36" />
<scale v="0" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
@@ -4019,820 +3861,14 @@
<description></description>
</entityFieldDb>
<entityFieldDb>
- <name>ATABLENAME</name>
+ <name>VERSION</name>
<dbName></dbName>
<primaryKey v="false" />
<columnType v="12" />
- <size v="127" />
+ <size v="36" />
<scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ATIMESTAMP</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
+ <notNull v="true" />
<isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>AUSER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATASETID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATASETNEWVALUE_BLOB</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2004" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATASETNEWVALUE_CLOB</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATASETNEWVALUE_STRING</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="1023" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LOGTIME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LOGTYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LOGWRITERUID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SQLACTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="1" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_SYNCSLAVES</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>ACTIVE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DESCRIPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DEVICEID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="40" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>INTERVALL</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>LASTSYNC</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>SLAVEUID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="12" />
- <size v="127" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_XMPP_OFFLINESTANZA</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>ATIMESTAMP</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>JID</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="64" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>STANZA</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_XMPP_HISTORY</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>ATIMESTAMP</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>CHATMARKER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="16" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>JID_FROM</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="64" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>JID_TO</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="64" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>MSGMARKER</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>MSGTYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="16" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>STANZA</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2005" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_VERSIONHISTORY</name>
- <dbName></dbName>
- <idColumn></idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="0" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>DATE_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>OPERATION_DESCRIPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>OPERATION_TYPE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TABLE_NAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>VERSION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_TEST</name>
- <dbName></dbName>
- <idColumn>ID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>DATE_EDIT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATE_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_EDIT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TEST_VARCHAR_1</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="50" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- </entityFields>
- </entityDb>
- <entityDb>
- <name>ASYS_USER</name>
- <dbName></dbName>
- <idColumn>ID</idColumn>
- <idGeneratorType v="0" />
- <idGeneratorInterval v="1" />
- <documentation></documentation>
- <title></title>
- <description></description>
- <auditSyncConfig>
- <name>auditSyncConfig</name>
- <auditMode v="0" />
- <syncActive v="false" />
- <syncComplete v="true" />
- <syncDirection v="1" />
- <syncIds></syncIds>
- </auditSyncConfig>
- <entityFields>
- <entityFieldDb>
- <name>DATE_EDIT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DESCRIPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="255" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>KIND</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>XMLDATA</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2004" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>TITLE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>DATE_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="93" />
- <size v="29" />
- <scale v="9" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ICON</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="2004" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>ID</name>
- <dbName></dbName>
- <primaryKey v="true" />
- <columnType v="1" />
- <size v="36" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
- <index v="true" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_NEW</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>USER_EDIT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
- <entityFieldDb>
- <name>NAME</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="63" />
- <scale v="0" />
- <notNull v="true" />
- <isUnique v="true" />
<index v="true" />
<documentation></documentation>
<title></title>
diff --git a/entity/360Degree_entity/documentation.adoc b/entity/360Degree_entity/documentation.adoc
index b07c00500ceb7ed1fc24f01140cf046eb2f41251..ff20617c53b29d44b7664603bc648e649ddb5aed 100644
--- a/entity/360Degree_entity/documentation.adoc
+++ b/entity/360Degree_entity/documentation.adoc
@@ -1,36 +1,329 @@
+:hardbreaks:
+:toc2: left
+:toclevels: 5
+:sectnums:
+:sectnumlevels: 5
+:toc-title: Index
+:figure-caption: Figure
+:icons: font
+:numbered:
+:source-autofit:
+:table-stripes: odd
= 360Degree_entity
-The 360Degree_entity shows the Connection between data models.
-The entity has two providers for persons and organizations.
+////
+(required only for separate PDF generation)
+////
-The 360Degree_entity shows direct connections, don´t be confused with the ObjectRelation_entity.
+//include::_default_attributes_EN.adoc[]
-== Adding new modules to the 360° view
-You may want to display more modules within the 360degree view (for example after creating and implemeting your own module).
+<<<
-.An Example:
-You added a module called "T-Shirts" to your project. Every person-contact can have _n_ "T-Shirts" and whenever a person owns a T-Shirt you want to
-display it in the 360degree view.
+== Introduction
-Heres is a list of what you need to do whenever you want to do this:
+The 360Degree_entity models the relations between specific Entities and enables the user to work with these dependencies via the 360DegreeFilter_view, which includes the ViewTemplates "Tree" and "Timeline".
-- At first you have to fill/add certain Fields/Processes in your new Context.
- - Add (These have to be written exactly like that, if not already existing):
- - DATE_NEW, this Field has to contain a Date as a Long Value. That will be used as the Date Value you can see in the Timeline View-Template.
- - ACTIVE, in this Field you can specify which Datasets are active or not. You have to declare that in the Value Expression as a Case-When due to the Filter
- - Fill (these can be filled in the specific Entity as a Process)
- - #CONTENTTITLE, this will be the main display Text and the blue Link
- - #CONTENTDESCRIPTION, this will be the smaller, mostly longer, Text beneath the #CONTENTTITLE
-
-- Add an element (with the name of the context you want to add) in the process of the `ObjectType_param` in the *corresponding provider* which is located in the `360Degree_entity`. _We would extend the JSON-Object which is returned in the `PersonObjects`-provider by the name of our t-shirt-context: "TShirt" in our example
+Currently, the 360Degree logic is restricted to relations of Contact_entity (i.e., of companies and persons). This means that
-- In that JSON-Object you can/have to add some Configuration Elements to change the results.
- - connectionField, here you have to declare a Field that writes exactly like the one in your Entity (Standard is CONTACT_ID!!!). The Value of this Field will be used to compare it with the Object_Rowid.
- - setGroupBy: here you can declare a DB-Column that will be used as the new group by of that context. A good example is Order. We want to group by the Ordertype so we have to declare ORDERTYPE as our groupBy.
- - If your DB-Value is related to a Keyword you also have to use groupByKeyword and add the Container as Value
+* the 360Degree View can only be referenced in the MainViews of the Contexts "Organisation" and "Person" (appearing as tab "360 Degree");
+* the 360Degree View can only include datasets (records) of Contexts having a relation to Context "Contact" (directly or via a "junction Context") - such as the Contexts "Salesproject", "Offer", or "Order" do.
-- If you have a Connection of 1:N in your Database Schema (like Task and TaskLink) you have to add specific Properties in your Context Object. Lets take TaskLink as a Example.
- - subContext: the Name of the "Link"-Context -> TaskLink
- - childField: The Field where the LinkID to your Parent is stored -> TASK_ID
- - parentField: The field in your Parent Context where your Connection to your Child is stored -> TASKID
- - contactIdField: The Field in the Link Context where your Contactid is stored -> OBJECT_ROWID
\ No newline at end of file
+[NOTE]
+This documentation requires you to be familiar with the "ADITO xRM" project's data model, especially the data structure for managing datasets of persons and companies (i.e., the function of the database tables PERSON, ORGANISATION, and CONTACT - see chapter "Core tables of the xRM project" of the document "Customizing Manual").
+
+This documentation will
+
+* explain the basics of the 360Degree logic, using examples of the ADITO xRM project;
+* teach you how you can include further Contexts in the existing 360Degree View implementations, using a plain and hands-on example.
+
+This documentation does _not_ include a description of how to implement a 360Degree View in the MainView of Contexts _other_ than Organisation and Person. Nevertheless, in principle, you can customize this by yourself, according to you requirements, using the 360 Degree logic as pattern.
+
+== Basics
+
+To understand how to modify the behavior of the 360DegreeFilter_view in existing implementations or how to add them to further Contexts, you need to be aware of some basics regarding specific mandatory fields as well as the configuration of specific Provider, Consumer, and Parameters.
+
+=== RecordContainer
+
+The core of the 360Degree_entity's logic is the contentProcess of its jDitoRecordContainer. There, a tree (or timeline) structure is created, with
+
+* the Entities' titles as root nodes
+* (if configured, see below:) specific sub-nodes, used for grouping
+* the datasets of the Entities on 2nd or, if a grouping applies, on 3rd level
+
+=== Mandatory settings
+
+The logic of the jDitoRecordContainer's contentProcess requires the Contexts, which are to be included in the 360Degree View, to have specific EntityFields and properties well-configured.
+
+==== EntityFields
+
+The following EntityFields must be present and configured in all Entities whose datasets are to be included in the 360Degree View:
+
+* ACTIVE
++
+The value of this EntityField determines whether or not a dataset will be shown. Often, the value of this EntityField is being calculated in property "expression" of the corresponding RecordFieldMapping (e.g., via a CASE/WHEN SQL statement).
+* DATE_NEW
++
+The value of this EntityField will be used in the ViewTemplate "Timeline". Its calculation follows the standard logic for this EntityField.
+
+Both EntityFields must be present and named exactly as shown above. Otherwise the logic will fail.
+
+==== Properties
+
+The following propertys are not essential, but if they are missing, the appearance of the Context's datasets will be suboptimal:
+
+* Entity properties:
+** contentTitleProcess:
++
+The result of this process will, in this case, appear as "headlines" of the datasets shown in the 360Degree View, including a hyperlink to the datasets' MainView. If this property is not set, the datasets' primary keys will be displayed.
+** contentDescriptionProcess:
++
+The result of this process will, in this case, appear as "sub-headlines" of the datasets shown in the 360Degree View.
+* Context properties:
+** icon/iconProcess: Specifies the icon that will be shown to the left of the headline/sub-headline. Usually, this should be the same icon as the icon of the Entity (i.e., the icon shown in the sidebar, to the left of the client) - except when a grouping (see below) is configured (in this case, the iconProcess should be used, in order to show different icons for each group).
+
+=== Providers and Consumers
+
+The dependencies (relations) between the 360Degree Context and the Contexts referencing the 360Degree View in their MainViews is, as usual in ADITO, established via a Provider and a Consumer (one for each dependency).
+
+==== Providers
+
+The 360Degree Context must have a Provider to for each dependency, named according to the Pattern `<Context name>Objects`. Examples:
+
+* OrganisationObjects, for supplying the 360Degree tab in the OrganisationMain_view
+* PersonObjects, for supplying the 360Degree tab in the PersonMain_view
+
+The following property values need to be set (they are the same for each Provider):
+
+* targetContextField: TARGET_CONTEXT
+* targetidField: TARGET_ID
+* initFilterMergeMode: AND
+
+All other Provider properties should usually remain in default state.
+
+==== Consumers
+
+The above mentioned Providers need to be referenced by Consumers of the Contexts that show the 360Degree View in their MainView (i.e., currently, only the Contexts "Organisation" and "Person").
+
+These Consumers should always be named "360DegreeObjects" (spelling convention, no technical requirement) and have the following properties set:
+
+* entityName: 360Degree_entity
+* fieldName: name of specific provider - e.g., "OrganisationObjects", or "PersonObjects", respectively
+
+All other Consumer properties should usually remain in default state.
+
+==== Parameters
+
+The 360Degree_entity has the following Parameters, each having property "expose" set to true:
+
+* BaseContextId_param
+* ObjectRowId_param
+* ObjectStatus_param
+* ObjectType_param
+
+These Parameters have been predefined by the ADITO xRM developers. Never rename them and never change the configuration of their originals under node "Parameters", but only modify their instances appearing under the nodes of the respective 360Degree_entity's Providers or under the Consumers connected to these Providers, respectively.
+
+===== Provider Parameter settings
+
+The Parameters "ObjectRowId_param" and "ObjectStatus_param" are configured exclusively on _Consumer_ side (see below). Therefore, leave their instances appearing under node "Providers" in default state (do NOT initialize them). This makes sure that their original property "expose" keeps its value "true", which makes them appear on Consumer side.
+
+The Parameters "BaseContextId_param" and "ObjectType_param" are configured exclusively on _Provider_ side. Therefore, their instances under the node "Provider" must be initialized and have their property "expose" set to "false". This overwrites the original setting ("true", see above) and thus makes sure that these Parameters do not appear on Consumer side.
+
+The valueProcesses of the 2 Parameter instances need to be set as follows (all other properties should remain in default state):
+
+====== BaseContextId_param
+
+BaseContextId_param's valueProcess must supply the name of the Context, whose MainView should show the 360Degree View. Example:
+
+.360Degree_entity.OrganisationObjects.BaseContextId_param.valueProcess.js
+[source%autofit, javascript]
+----
+import("system.result");
+
+result.string("Organisation");
+----
+
+====== ObjectType_param
+
+ObjectType_param's valueProcess must supply a JSON String including information about the names of all Contexts to be shown in the 360Degree View.
+
+Example:
+[source%autofit, javascript]
+----
+result.string(JSON.stringify({
+ "Salesproject": {},
+ "Offer": {},
+ "Contract": {}));
+----
+
+(Scroll further down, in order to see the complete example code of a valueProcess. This might help you to understand the following explanations of optional settings better.)
+
+Optionally, the following features can be specified via JSON properties (included in the curly brackets behind the Context name), separately for each Context:
+
+* connectionField: The name of the Context's EntityField that works as foreign key pointing to the other side of the relation, i.e., to EntityField CONTACTID of Context "Contact". Example: `"connectionField":"TASK_REQUESTOR_CONTACT_ID"` (enabling to show datasets of Context "SupportTicket"). This property must only be set if its value is other than "CONTACT_ID".
+* Grouping: If configured, the datasets of the respective Context are grouped into sub-nodes.
+** setGroupBy: This mandatory property specifies the EntityField whose values determine the grouping. Example (belonging to Context "Order"): `"setGroupBy":"ORDERTYPE"` effects a grouping of the "Order" datasets into sub-nodes labelled with the respective value of Order_entity's EntityField ORDERTYPE.
+** groupByKeyword (optional): If (as in the above example) the values of the EntityField specified via `setGroupBy` are KeywordEntry keys, then you can optionally specify the corresponding KeywordCategory via property `groupByKeyword`. The effect will be that the grouping nodes will no longer show the KeywordEntries' keys, but their titles. Example: If you specify `"groupByKeyword":"OrderType"`, then "Invoice" (=TITLE) will be shown instead of "ORDTYPEINVO" (= KEYID).
+* Junction table: You can specify a Context that works as junction between the Context that shows the 360Degree View and the Context that is to be shown in this View. Example: Context "BulkMailRecipient" works as "junction Context" between the Context "BulkMail" and Context "Contact", in order to enable the user to assign a specific contact (person) to a specific bulk mail.
++
+The configuration of a "junction Context" requires 4 properties to be set:
+
+** subContext: The name of the "junction Context". Example: `"subContext":"BulkMailRecipient"`
+** childField: The name of the EntityField of the subContext that includes the foreign key related to the primary key of the "parent" Context (i.e., of "BulkMail", in our example). Example: `"childField":"BULKMAIL_ID"`
+** parentField: The name of the EntityField of the "parent" Context that in cludes the primary key, to which the foreign key of the "child" context relates. Example: `"parentField":"BULKMAILID"`
+** contactIdField: The name of the subContext's EntityField that works as foreign key pointing to the other side of the relation, i.e., to EntityField CONTACTID of Context "Contact" (in our example, this is the CONTACTID of the recipient). Example: `"contactIdField":"CONTACT_ID"`
+
+Example:
+
+.360Degree_entity.OrganisationObjects.ObjectType_param.valueProcess.js
+[source%autofit, javascript]
+----
+import("system.vars");
+import("system.result");
+
+var res = {
+ "Salesproject": {},
+ "Offer": {},
+ "Order": {
+ "setGroupBy":"ORDERTYPE",
+ "groupByKeyword":"OrderType"
+ },
+ "Contract": {},
+ "SupportTicket": {
+ "connectionField":"TASK_REQUESTOR_CONTACT_ID",
+ "setGroupBy":"NameFor360"
+ },
+ "Advertising": {},
+ "BulkMail": {
+ "subContext":"BulkMailRecipient",
+ "childField":"BULKMAIL_ID",
+ "parentField":"BULKMAILID",
+ "contactIdField":"CONTACT_ID"
+ },
+ "SerialLetter": {
+ "subContext":"LetterRecipient",
+ "childField":"SERIALLETTER_ID",
+ "parentField":"SERIALLETTERID",
+ "contactIdField":"CONTACT_ID"
+ }
+}
+
+result.string(JSON.stringify(res))
+----
+
+===== Consumer Parameter settings
+
+If set correctly on Provider side (see above), instances of the Parameters "ObjectRowId_param" and "ObjectStatus_param" will appear under each Consumer "360DegreeObjects" (see above). As mentioned before, currently, there are only 2 Contexts having this Consumer: "Organisation" and "Person".
+
+====== ObjectRowId_param
+
+This Parameter's valueProcess retrieves (in JSON format) the CONTACTIDs of all involved Contact datasets - i.e., all CONTACTIDs to be used for retrieving the related Contexts' datasets, according to their "connectionField" (= foreign key, which is usually named "CONTACT_ID", but can also have a different name - see description of property "connectionField" above).
+
+This means, in Context "Person", the result of this valueProcess is simply a JSON String with the CONTACTID connected to the Person dataset:
+
+.Person_entity.360DegreeObjects.ObjectRowId_param.valueProcess.js
+[source%autofit, javascript]
+----
+import("system.vars");
+import("system.result");
+
+result.string(JSON.stringify([vars.getString("$field.CONTACTID")]));
+----
+
+In Context "Organisation", the result of this valueProcess is a JSON String including the CONTACTIDs of both the selected company and all persons belonging to this company:
+
+.Organisation_entity.360DegreeObjects.ObjectRowId_param.valueProcess.js
+[source%autofit, javascript]
+----
+import("Sql_lib");
+import("system.vars");
+import("system.result");
+
+var contactids = newSelect( "CONTACTID" )
+ .from("CONTACT")
+ .where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
+ .orderBy(new SqlMaskingUtils().isNull("PERSON_ID", "'0'"))
+ .arrayColumn();
+
+result.string(JSON.stringify(contactids));
+----
+
+[NOTE]
+As already mentioned at the beginning of this documentation, currently, the 360Degree logic is restricted to relations of Contact_entity (i.e., of companies and persons). Therefore, the CONTACTID is the central reference here, as it (exlusively) identifies datasets of companies or persons, respectively. If you want to implement a 360Degree View in the MainView of Contexts _other_ than Organisation and Person, you can use the 360 Degree logic as pattern, but you need to find another EntityField as central reference.
+
+
+====== ObjectStatus_param
+
+For both instances of Consumer "360Degree" (= in Contexts "Person" and "Organisation"), the result of this Parameter's valueProcess is simply the value of the EntityField holding the state of the selected person/company:
+
+.Person_entity.360DegreeObjects.ObjectStatus_param.valueProcess.js and Organisation_entity.360DegreeObjects.ObjectStatus_param.valueProcess.js
+[source%autofit, javascript]
+----
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.STATUS"));
+----
+
+This Parameter's value is evaluated in the stateProcess of 360Degree_entity's ActionGroup "newModule", which controls whether or not the 360Degree View shows a button for creating new datasets for the referenced Contexts (Sales Project, Contract, Order, etc.): If the selected person or company is in state "Inactive" or "To Delete" (i.e., if its EntityField "STATUS" has the keyword-related value "CONTACTSTATINACTIVE" or "CONTACTSTATDELETE"), then this button is disabled.
+
+== Example for extending 360Degree View
+
+As a plain and hands-on teaching example, here are the instructions for the task "Include Activity datasets in the 360Degree View of the Contexts Person and Organisation". (By itself, this task is nonsense, of course, because the Activity datasets are already shown in the MainView's tab "Activities". Nevertheless, this task is well-suited to be used for learning purposes.)
+
+The task should also include a grouping of the Activity records according to Activit_entity's keyword-related EntityField "CATEGORY".
+
+=== Activity_entity: Mandatory settings
+
+* Property "contentTitleProcess" is already set: Its result is the value of EntityField "SUBJECT", which perfectly fits for our task. (Beside, you should never change it anyway, as it is also used in other parts of the client.)
+* Set property "contentDescriptionProcess" with a reasonable logic. EntityField "INFO" seems to be suitable to be shown below the contentTitle (see above), so the code to be set here is:
++
+.Activity_entity.contentDescriptionProcess.js
+[source%autofit, javascript]
+----
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.INFO"));
+----
+* EntityField DATE_NEW is already present, so there is nothing to do.
+* Create the new EntityField "ACTIVE". For testing purposes, it is enough to configure the fix value "true", preferably via property "expression" of the respective RecordFieldMapping:
++
+.Activity_entity.db.ACTIVE.value.expression.js
+[source%autofit, javascript]
+----
+import("system.result");
+
+result.string('true');
+----
+* Set the Context's property "icon" to the same icon that appears in the side bar to the left of the client - i.e., in this case, select the icon named "VAADIN:HOURGLASS_END".
+* If a grouping according to Activity_entity's EntityField CATEGORY is applied (see below), you may use propertyIcon process for setting code that enables CATEGORY-specific icons to appear beside the grouped datasets.
+
+=== 360Degree_entity: Extending ObjectType_param
+
+Extend the JSON configured in the valueProcess of Parameter ObjectType_param of Provider, both for Context "Organisation" and "Person":
+
+.360Degree_entity.OrganisationObjects.ObjectType_param.valueProcess.js and .360Degree_entity.PersonObjects.ObjectType_param.valueProcess.js
+[source%autofit, javascript]
+----
+import("system.vars");
+import("system.result");
+
+var res = {
+ "Activity": {
+ "setGroupBy:":"CATEGORY",
+ "groupByKeyword":"ActivityCategory",
+ "subContext":"ActivityLink",
+ "childField":"ACTIVITY_ID",
+ "parentField":"ACTIVITYID",
+ "contactIdField":"OBJECT_ROWID"
+ },
+ "Salesproject": {},
+ "Offer": {},
+
+ (etc...)
+}
+
+result.string(JSON.stringify(res))
+----
+
+Now, our task is completed. All other 360Degree-related settings explained in the chapters further above do not require any changes.
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
index cc537d09a0f68400d1984bf124d36f8968adf16d..295029c2d703ea7e2e97850fa69eac2ac0b7c3c9 100644
--- a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -16,6 +16,12 @@ var res = {
"connectionField":"TASK_REQUESTOR_CONTACT_ID",
"setGroupBy":"NameFor360"
},
+ "Campaign": {
+ "subContext":"CampaignParticipant",
+ "childField":"CAMPAIGN_ID",
+ "parentField":"CAMPAIGNID",
+ "contactIdField":"CONTACT_ID"
+ },
"Advertising": {},
"BulkMail": {
"subContext":"BulkMailRecipient",
diff --git a/entity/Activity_entity/entityfields/infotable/valueProcess.js b/entity/Activity_entity/entityfields/infotable/valueProcess.js
index 54f280282884c70778f950ac3da83d0bb3a0e43d..7366486c34ccb2b31b5286f24d4a4a5f0a7d855d 100644
--- a/entity/Activity_entity/entityfields/infotable/valueProcess.js
+++ b/entity/Activity_entity/entityfields/infotable/valueProcess.js
@@ -2,4 +2,9 @@ import("system.result");
import("system.vars");
import("system.text");
-result.string(text.html2text(vars.get("$field.INFO")));
\ No newline at end of file
+// Remove all linebreaks
+let info = vars.get("$field.INFO").replace(/\n/ig, "");
+// Remove all styles --> styles have no effect on the later text and they and these cause problems when converting
+info = info.replace(/style=\".*\"/ig, "");
+
+result.string(text.html2text(info));
diff --git a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
index 69caf9a126ec1289761f130668acef31d08ee08f..89801f08aa1148b26dd30adda982fb4b8b0601ba 100644
--- a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
+++ b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
@@ -4,6 +4,9 @@
<title>Advertising item</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AdvertisingItem_entity/documentation.adoc</documentation>
+ <grantCreateProcess>%aditoprj%/entity/AdvertisingItem_entity/grantCreateProcess.js</grantCreateProcess>
+ <grantUpdateProcess>%aditoprj%/entity/AdvertisingItem_entity/grantUpdateProcess.js</grantUpdateProcess>
+ <grantDeleteProcess>%aditoprj%/entity/AdvertisingItem_entity/grantDeleteProcess.js</grantDeleteProcess>
<iconId>VAADIN:PACKAGE</iconId>
<titlePlural>Advertising items</titlePlural>
<recordContainer>db</recordContainer>
@@ -87,18 +90,6 @@
<onValueChange>%aditoprj%/entity/AdvertisingItem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValidation>%aditoprj%/entity/AdvertisingItem_entity/entityfields/quantity/onValidation.js</onValidation>
</entityField>
- <entityField>
- <name>SENT</name>
- <title>Sent</title>
- <contentType>BOOLEAN</contentType>
- <mandatory v="false" />
- <valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/sent/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STATUS</name>
- <title>Status</title>
- <mandatory v="false" />
- </entityField>
<entityField>
<name>TARGETAMOUNT</name>
<title>Target amount</title>
@@ -300,14 +291,6 @@
<name>QUANTITY.value</name>
<recordfield>ADVERTISINGITEM.QUANTITY</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SENT.value</name>
- <recordfield>ADVERTISINGITEM.SENT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATUS.value</name>
- <recordfield>ADVERTISINGITEM.STATUS</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TARGETAMOUNT.value</name>
<recordfield>ADVERTISINGITEM.TARGETAMOUNT</recordfield>
diff --git a/entity/AdvertisingItem_entity/entityfields/sent/valueProcess.js b/entity/AdvertisingItem_entity/entityfields/sent/valueProcess.js
deleted file mode 100644
index 15dc711a7f303c8f73c5b27455ffb1e715ae542d..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/sent/valueProcess.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.neon");
-import("system.vars");
-import("system.result");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-{
- var ret = 0;
- //when an item was handover personal the item is already at its destination
- if(vars.get("$field.DELIVERY") == $KeywordRegistry.advertisingDelivery$personal())
- {
- ret = 1;
- }
- result.string(ret);
-}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/grantCreateProcess.js b/entity/AdvertisingItem_entity/grantCreateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09af9c97e016fcfcb42a7d68c063e6a05ad8f2e3
--- /dev/null
+++ b/entity/AdvertisingItem_entity/grantCreateProcess.js
@@ -0,0 +1,5 @@
+import("Advertising_lib");
+import("system.vars");
+import("system.result");
+
+result.string(AdvertisingUtils.isEditable(AdvertisingUtils.getStatus(vars.get("$param.AdvertisingId_param"))));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/grantDeleteProcess.js b/entity/AdvertisingItem_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09af9c97e016fcfcb42a7d68c063e6a05ad8f2e3
--- /dev/null
+++ b/entity/AdvertisingItem_entity/grantDeleteProcess.js
@@ -0,0 +1,5 @@
+import("Advertising_lib");
+import("system.vars");
+import("system.result");
+
+result.string(AdvertisingUtils.isEditable(AdvertisingUtils.getStatus(vars.get("$param.AdvertisingId_param"))));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/grantUpdateProcess.js b/entity/AdvertisingItem_entity/grantUpdateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09af9c97e016fcfcb42a7d68c063e6a05ad8f2e3
--- /dev/null
+++ b/entity/AdvertisingItem_entity/grantUpdateProcess.js
@@ -0,0 +1,5 @@
+import("Advertising_lib");
+import("system.vars");
+import("system.result");
+
+result.string(AdvertisingUtils.isEditable(AdvertisingUtils.getStatus(vars.get("$param.AdvertisingId_param"))));
\ No newline at end of file
diff --git a/entity/Advertising_entity/Advertising_entity.aod b/entity/Advertising_entity/Advertising_entity.aod
index fb973a2464cd62f5b5683e8a575a98bf6555a599..f2b559e6ff143f61e92101d3ff23f57669288c89 100644
--- a/entity/Advertising_entity/Advertising_entity.aod
+++ b/entity/Advertising_entity/Advertising_entity.aod
@@ -262,6 +262,7 @@
<fromClauseProcess>%aditoprj%/entity/Advertising_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Advertising_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Advertising_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBDelete>%aditoprj%/entity/Advertising_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
diff --git a/entity/Advertising_entity/recordcontainers/db/onDBDelete.js b/entity/Advertising_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..81ef885478c2b10078fba72c6d47493ae7ab84aa
--- /dev/null
+++ b/entity/Advertising_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,4 @@
+import("Sql_lib");
+
+newWhere("ADVERTISINGITEM.ADVERTISING_ID", "$field.ADVERTISINGID")
+ .deleteData();
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
index 3e2e63befe862a254f918262148b84b87d920816..367c63ee6d21328baaa09ada35a9f39bcf03c96b 100644
--- a/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/new_tasks/valueProcess.js
@@ -1,14 +1,19 @@
import("Employee_lib");
-import("system.db");
import("system.result");
import("Sql_lib");
import("KeywordRegistry_basic");
-
+
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
var opentask = newSelect("count(TASKID)")
.from("TASK")
- .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
- .and ("TASK.KIND", "TASK")
- .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
- .cell();
+ .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+ .where(
+ newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+ .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+ )
+ .and("TASK.STATUS", $KeywordRegistry.taskStatus$new())
+ .cell();
result.string(opentask || 0);
\ No newline at end of file
diff --git a/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js b/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
index 2f701771cd41a63b1ee8d0d542e23e141308d1d2..a63838ac8189374da23058dc4d75e427d9feea10 100644
--- a/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
+++ b/entity/Analyses_entity/entityfields/opennewtasks/onActionProcess.js
@@ -4,10 +4,17 @@ import("Sql_lib");
import("Employee_lib");
import("system.neon");
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
var taskIds = newSelect("TASKID")
.from("TASK")
- .where("TASK.STATUS", $KeywordRegistry.taskStatus$new())
- .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+ .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+ .where(
+ newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+ .or("TASKATTENDEES.DEPARTMENT_ID", departmentId)
+ )
+ .and("TASK.STATUS", $KeywordRegistry.taskStatus$new())
.arrayColumn();
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(taskIds).toString();
diff --git a/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js b/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
index dfbf3354e41132c7c7cb91e35582ac466f36c00e..43974a54a65d19bfa2ec7026a5564852123b94c8 100644
--- a/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
+++ b/entity/Analyses_entity/entityfields/openoverduetasks/onActionProcess.js
@@ -1,17 +1,23 @@
import("system.neonFilter");
import("system.neon");
-import("system.db");
import("ActivityTask_lib");
import("Employee_lib");
import("system.vars");
import("Sql_lib");
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
+
var overdueTask = newSelect("TASKID")
.from("TASK")
- .where("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
- .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+ .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+ .where(
+ newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+ .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+ )
+ .and("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
.and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
- .array(db.COLUMN)
+ .arrayColumn();
var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist(overdueTask).toString();
neon.openContextWithRecipe("Task", "TaskFilter_view", recipe, neon.OPERATINGSTATE_SEARCH);
diff --git a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
index 98e88dd15849effecdb68f06183c6aedd6498ac2..6d23914c84fced7678383701398a14573540f32f 100644
--- a/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
+++ b/entity/Analyses_entity/entityfields/overdue_tasks/valueProcess.js
@@ -1,15 +1,22 @@
-import("system.vars");
+import("system.result");
+import("system.neon");
+import("ActivityTask_lib");
import("Employee_lib");
+import("system.vars");
import("Sql_lib");
-import("ActivityTask_lib");
-import("system.result");
+
+var contactId = EmployeeUtils.getCurrentContactId();
+var departmentId = EmployeeUtils.getUsersDepartment(contactId, false);
var overdueTaskCount = newSelect("count(TASKID)")
.from("TASK")
- .where("TASK.MATURITY_DATE", "$sys.date", SqlBuilder.LESS())
- .and ("TASK.KIND", "TASK")
- .and("TASK.EDITOR_CONTACT_ID", EmployeeUtils.getCurrentContactId())
+ .join("TASKATTENDEES","TASKATTENDEES.TASK_ID = TASK.TASKID")
+ .where(
+ newWhere("TASKATTENDEES.CONTACT_ID", contactId)
+ .or("TASKATTENDEES.DEPARTMENT_ID",departmentId)
+ )
+ .and("TASK.MATURITY_DATE", vars.get("$sys.date"), SqlBuilder.LESS())
.and("TASK.STATUS", TaskUtils.getEndedStatuses(), SqlBuilder.NOT_IN())
- .cell()
+ .cell();
result.string(overdueTaskCount);
\ No newline at end of file
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index 84782bfc766dc10250946fc6b079858ca9979a08..1c888503beae17f6bba39516c2a630aaf5dc5477 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
<name>AnyContact_entity</name>
- <title>Contact</title>
+ <title>Contact or company</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AnyContact_entity/documentation.adoc</documentation>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js b/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js
index 320ae40ad1ba794b4e759037fa0f382b9af67696..fafd39dbfbd90f5e331af7c561890168e8be4ec5 100644
--- a/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js
+++ b/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js
@@ -1,5 +1,7 @@
+import("system.vars");
import("system.result");
import("Communication_lib");
+import("Contact_lib")
-var res = CommUtil.getStandardSubSqlPhone();
+var res = CommUtil.getStandardSubSqlPhone(undefined, ContactUtils.getContactTypeByContactId(vars.get("$field.CONTACTID")));
result.string(res);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
index 20effae6f92340f071b940437ec00ad1af7db88e..11db39e54492175511a3ae8324e74f76602cdf89 100644
--- a/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
+++ b/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/onActionProcess.js
@@ -1,3 +1,4 @@
+import("system.neonFilter");
import("system.vars");
import("system.neon");
import("Attribute_lib");
@@ -12,4 +13,4 @@ if (vars.exists("$local.rows"))
else if (row[0].ATTRIBUTE_PARENT_ID)
params["ParentId_param"] = row[0].ATTRIBUTE_PARENT_ID;
}
-neon.openContext("Attribute", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
+neon.openContextWithRecipe("Attribute", null, neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString(), neon.OPERATINGSTATE_NEW);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js b/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js
index 20ae8eea182052eb33f1e3bc5a6056d28e7fe2a9..91dcde717777f66d77ffaa0237323f869eddc7a8 100644
--- a/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js
+++ b/entity/Attribute_entity/entityfields/opendetails/onActionProcess.js
@@ -1,3 +1,4 @@
+import("system.neonFilter");
import("Context_lib");
import("system.vars");
import("system.neon");
@@ -9,4 +10,4 @@ var params = {
"ObjectType_param" : vars.get("$param.ObjectType_param")
}
-neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
+neon.openContextWithRecipe("AttributeRelation", "AttributeRelationTreeEdit_view", neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString(), neon.OPERATINGSTATE_NEW);
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
index 741ab92a4d39bc694a37e0ce0b913accdd1cc265..49f6fdde84face75fc6e053c5814c36cd955c6b0 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/contentProcess.js
@@ -127,20 +127,30 @@ attributes.forEach(function ([attributeId, parentId, simpleName, isActive,
]);
});
+var sorter = new AttributeSorter(vars.get("$local.order"));
+
var resultTable = [];
do {
var oldSize = resultTable.length;
+ var layer = [];
attributesById.forEach(function (row, id)
{
- var parentId = row[3];
+ if (!row)
+ {
+ attributesById["delete"](id);
+ return;
+ }
+ var parentId = row[4];
//rows that are already in the result array are removed from the attributesById Map, so if the parentId is in that Map,
//the parent has not been added yet
if (!parentId || !attributesById.has(parentId))
{
- resultTable.push(row);
- attributesById["delete"](id);
+ layer.push(row);
+ attributesById.set(id, null);
}
});
+ sorter.sort(layer);
+ resultTable = resultTable.concat(layer);
} while (oldSize != resultTable.length); //stops the loop when no new items were added so that recursive relations between attributes don't cause an infinite loop
result.object(resultTable);
@@ -217,4 +227,42 @@ function AttributeUsageLoader ()
return ContextUtils.getTitle(usage, true);
}).join(", ");
}
+}
+
+function AttributeSorter (pSortOrder)
+{
+ if (Utils.isNullOrEmpty(pSortOrder))
+ {
+ this.sort = function (pArray) {return pArray;};
+ }
+ else
+ {
+ var fieldIndexes = {
+ "ATTRIBUTE_NAME.value": 1,
+ "TRANSLATED_NAME.value": 2,
+ "ATTRIBUTE_TYPE.displayValue": 7,
+ "ATTRIBUTE_ACTIVE.value": 8,
+ "SORTING.value": 9,
+ "USAGELIST.value": 13
+ };
+ var sortOrder = Utils.objectEntries(vars.get("$local.order"));
+ if (sortOrder.length === 0)
+ {
+ sortOrder = [["ATTRIBUTE_NAME.value", "UP"]]
+ }
+ sortOrder = Utils.objectEntries(vars.get("$local.order")).reduce(function (orderMap, [field, direction])
+ {
+ if (field in fieldIndexes)
+ {
+ orderMap.set(fieldIndexes[field], direction == "DOWN");
+ }
+ return orderMap;
+ }, new Map());
+ var sortFn = ArrayUtils.getMultiSortCompareFn(sortOrder);
+
+ this.sort = function (pArray)
+ {
+ return pArray.sort(sortFn);
+ }
+ }
}
\ No newline at end of file
diff --git a/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod b/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod
index 849768b872a9a9a551be334ff3f16ed8b92177c7..e8c992c273347e435d9d87d211eb52b3c36c64ca 100644
--- a/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod
+++ b/entity/BulkMailAddMosaico_entity/BulkMailAddMosaico_entity.aod
@@ -57,6 +57,7 @@
<name>createAndOpen</name>
<title>Create and open in editor</title>
<onActionProcess>%aditoprj%/entity/BulkMailAddMosaico_entity/entityfields/createandopen/onActionProcess.js</onActionProcess>
+ <iconId>NEON:PENCIL</iconId>
<stateProcess>%aditoprj%/entity/BulkMailAddMosaico_entity/entityfields/createandopen/stateProcess.js</stateProcess>
</entityActionField>
<entityParameter>
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index e120f312fe5e0fabaa1906dcf24fce187a7037f5..6aaedae300b335d1cdc279657ee3f4c28dde3dbd 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -84,6 +84,10 @@
<name>Parameters_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>RecordsRecipe_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<datalessRecordContainer>
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js
index a865018d80dc98523a354ff97ae305e84008d850..275fb1e0e2553ada7caefedf753095fde91ed94f 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/proposedcontactids/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.neonFilter");
import("Context_lib");
import("system.entities");
import("Sql_lib");
@@ -14,12 +15,29 @@ if (bulkMailId)
var filter = vars.get("$param.Filter_param");
var context = vars.getString("$param.ObjectType_param");
var parameters = vars.get("$param.Parameters_param");
+ var recordsRecipe = vars.get("$param.RecordsRecipe_param");
+ if(!Utils.isNullOrEmptyString(recordsRecipe))
+ {
+
+ var loadConfig = entities.createConfigForLoadingRows()
+ .fromEntityRecordsRecipe(recordsRecipe);
+ context = ContextUtils.getContextId(JSON.parse(recordsRecipe).entityName);
+ }
+
switch(context)
{
case "CampaignParticipant":
- if (Utils.isNullOrEmpty(ids) && filter)
+ if (!Utils.isNullOrEmpty(recordsRecipe))
+ {
+ loadConfig.fields(["CONTACT_ID"]);
+ proposedRecipients = entities.getRows(loadConfig).map(function (row)
+ {
+ return row["CONTACT_ID"];
+ });
+ }
+ else if (Utils.isNullOrEmpty(ids) && filter)
{
var filterObject = Utils.isString(filter) ? JSON.parse(filter) : filter;
@@ -55,14 +73,36 @@ if (bulkMailId)
}
break;
case "CampaignStep":
- var proposedIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
+ if (!Utils.isNullOrEmpty(recordsRecipe))
+ {
+ loadConfig.fields(["CAMPAIGNSTEPID"]);
+ proposedIds = entities.getRows(loadConfig).map(function (row)
+ {
+ return row["CAMPAIGNSTEPID"];
+ });
+ }
+ else
+ {
+ var proposedIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
+ }
proposedRecipients = newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
.from("CAMPAIGNPARTICIPANT")
.where("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", proposedIds, SqlBuilder.IN())
.arrayColumn();
break;
default:
- proposedRecipients = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
+ if(!Utils.isNullOrEmpty(recordsRecipe))
+ {
+ loadConfig.fields(["CONTACTID"]);
+ proposedRecipients = entities.getRows(loadConfig).map(function (row)
+ {
+ return row["CONTACTID"];
+ });
+ }
+ else
+ {
+ proposedRecipients = FilterViewActionUtils.getUidsBySelectionOrFilter(context, ids, filter, parameters);
+ }
}
}
diff --git a/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js b/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js
index 2f2efb1a8dcc5ae9296a2d3f91a4cac8c6c3f329..2197f059fce9fe77ca8a6647ddf4f12334ce71ef 100644
--- a/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js
+++ b/entity/BulkMailAddRecipients_entity/entityfields/validcontactids/valueProcess.js
@@ -1,3 +1,4 @@
+import("system.neonFilter");
import("Util_lib");
import("system.result");
import("Bulkmail_lib");
@@ -8,6 +9,7 @@ var bulkMailId = vars.get("$field.BULKMAIL_ID");
var filter = vars.get("$param.Filter_param");
var ids = Utils.parseJSON(vars.get("$param.Ids_param"));
var context = vars.getString("$param.ObjectType_param");
+var recordsRecipe = vars.get("$param.RecordsRecipe_param");
if (Utils.isString(filter))
{
@@ -17,13 +19,17 @@ var validRecipients = [];
if (bulkMailId)
{
- if (Utils.isNullOrEmpty(ids) && filter && filter.condition)
+ if (!Utils.isNullOrEmptyString(recordsRecipe))
+ {
+ validRecipients = BulkMailUtils.filterNewRecipientsByRecordsRecipe(bulkMailId, recordsRecipe);
+ }
+ else if (Utils.isNullOrEmpty(ids) && filter && filter.condition)
{
validRecipients = BulkMailUtils.filterNewRecipientsByCondition(bulkMailId, filter.condition, context)
}
else if (context == "CampaignStep")
{
- validRecipients = BulkMailUtils.filterNewRecipientsByCondition(bulkMailId, newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID", pIds, SqlBuilder.IN()), context);
+ validRecipients = BulkMailUtils.filterNewRecipientsByCondition(bulkMailId, newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID", ids, SqlBuilder.IN()), context);
}
else
{
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index ce1dcd2d2b93817595ec64e9fb98930a9641e821..70f7df7f4ad5bf2715a2454845ee7abdbc065921 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -8,6 +8,7 @@
<siblings>
<element>Communication_entity</element>
</siblings>
+ <recordsRecipeSupported v="true" />
<titlePlural>Recipients</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -116,14 +117,6 @@
<iconId>VAADIN:BAN</iconId>
<tooltipProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/removewithcommrestriction/tooltipProcess.js</tooltipProcess>
</entityActionField>
- <entityActionField>
- <name>startMarketingWorkflows</name>
- <title>Start marketing mailing</title>
- <onActionProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:ENVELOPES</iconId>
- <tooltipProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/tooltipProcess.js</tooltipProcess>
- </entityActionField>
</children>
</entityActionGroup>
<entityField>
@@ -142,6 +135,10 @@
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityProvider>
@@ -157,6 +154,7 @@
<entityActionGroup>
<name>testRunActions</name>
<title>Test Run Actions</title>
+ <iconId>VAADIN:PAPERPLANE_O</iconId>
<stateProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/testrunactions/stateProcess.js</stateProcess>
<children>
<entityActionField>
diff --git a/entity/BulkMailRecipient_entity/entityfields/email_address/dropDownProcess.js b/entity/BulkMailRecipient_entity/entityfields/email_address/dropDownProcess.js
index 9012549e191ebf27386dc8b28309e1cb9463e6e3..de88f91fa9c8d5572ce2ce83a5dbaf140519c48d 100644
--- a/entity/BulkMailRecipient_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/email_address/dropDownProcess.js
@@ -2,6 +2,7 @@ import("Communication_lib");
import("system.result");
import("system.vars");
import("Sql_lib");
+import("Contact_lib");
var contactId = vars.get("$field.CONTACT_ID");
@@ -10,7 +11,7 @@ if (contactId)
var emailAddresses = new SqlBuilder().selectDistinct(["COMMUNICATION.ADDR","COMMUNICATION.ADDR"])
.from("COMMUNICATION")
.where("COMMUNICATION.OBJECT_ROWID",contactId)
- .and("COMMUNICATION.OBJECT_TYPE", CommUtil.defaultObjectType())
+ .and("COMMUNICATION.OBJECT_TYPE", ContactUtils.getContextByContactId(contactId))
.and("COMMUNICATION.MEDIUM_ID",CommUtil.getMediumIdsByCategory("EMAIL"),SqlBuilder.IN())
.table();
result.object(emailAddresses);
diff --git a/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objecttype_param/valueProcess.js b/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..29939e1d47f91ef61efdd53f8fa827bca42689cf
--- /dev/null
+++ b/entity/BulkMailRecipient_entity/entityfields/emailadresses/children/objecttype_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Contact_lib");
+import("system.result");
+
+result.string(ContactUtils.getContextByContactId(vars.get("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/onActionProcess.js b/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/onActionProcess.js
deleted file mode 100644
index 5c87295ed514398e4496a25bb605369cdd9adbe6..0000000000000000000000000000000000000000
--- a/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/onActionProcess.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import("system.neonFilter");
-import("Util_lib");
-import("system.entities");
-import("Context_lib");
-import("system.vars");
-import("system.neon");
-
-var rows = vars.get("$sys.selectionRows");
-var filter = vars.get("$sys.filter").filter;
-var targets = [];
-
-if (Utils.isNullOrEmpty(rows))
-{
- let loadConfig = entities.createConfigForLoadingRows()
- .entity("BulkMailRecipient_entity")
- .provider("BulkMailRecipients")
- .fields(["CONTACT_ID", "TARGETCONTEXT"])
- .addParameter("BulkMailId_param", vars.get("$param.BulkMailId_param"));
-
- if (filter)
- loadConfig.filter(JSON.stringify(filter));
-
- rows = entities.getRows(loadConfig);
-}
-
-rows = rows.map(function (row)
-{
- return [row["CONTACT_ID"], row["TARGETCONTEXT"]];
-});
-
-
-var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
- "ObjectIds_param": JSON.stringify(rows),
- "ObjectType_param": ContextUtils.getCurrentContextId()
-}).toString();
-neon.openContextWithRecipe("MarketingWorkflowLauncher", "MarketingWorkflowLauncherEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
diff --git a/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/tooltipProcess.js b/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/tooltipProcess.js
deleted file mode 100644
index f10ca98d11889935121eb5c675e17e66ff5bf004..0000000000000000000000000000000000000000
--- a/entity/BulkMailRecipient_entity/entityfields/recipientactions/children/startmarketingworkflows/tooltipProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.string(translate.text("Start marketing mailing"));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/recipientstobemailed/children/excludedstatus_param/valueProcess.js b/entity/BulkMailRecipient_entity/entityfields/recipientstobemailed/children/excludedstatus_param/valueProcess.js
index ae0c566f408d9f9a4bd2181699b7fadeab9a02a4..492f4b9cfe105df811d83daafb6e792c09f758b2 100644
--- a/entity/BulkMailRecipient_entity/entityfields/recipientstobemailed/children/excludedstatus_param/valueProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/recipientstobemailed/children/excludedstatus_param/valueProcess.js
@@ -2,5 +2,7 @@ import("KeywordRegistry_basic");
import("system.result");
result.string(JSON.stringify([
- $KeywordRegistry.bulkMailRecipientStatus$sent()
+ $KeywordRegistry.bulkMailRecipientStatus$sent(),
+ $KeywordRegistry.bulkMailRecipientStatus$hardBounce(),
+ $KeywordRegistry.bulkMailRecipientStatus$failed()
]));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js
index b19f093933f83c39b3bca1779f28b1a9240aacd3..99d9e298b993952b4c08ad84f8025c28dc6b947e 100644
--- a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/removetestrecipient/onActionProcess.js
@@ -1,9 +1,21 @@
import("Sql_lib");
import("system.vars");
import("system.neon");
+import("system.entities");
+
+var loadConfig = entities.createConfigForLoadingRows()
+ .fields(["#UID"])
+ .fromEntityRecordsRecipe(vars.get("$sys.selectionsRecordsRecipe"));
+
+var selectedRecords = entities.getRows(loadConfig);
+
+var selectedUids = selectedRecords.map(function (pRecord)
+{
+ return pRecord["#UID"]
+});
+
+newWhere("BULKMAILRECIPIENT.BULKMAILRECIPIENTID",selectedUids,SqlBuilder.IN())
+.updateFields({"IS_TEST_RECIPIENT": 0});
-newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", vars.get("$sys.selection"), SqlBuilder.IN())
- .updateData(true, "BULKMAILRECIPIENT", ["IS_TEST_RECIPIENT"], null, [0]);
-
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js
index 69f831c2f7a1a5dfca2708c9fbee266e552f6773..afda3d26c0b1eaedbf151bce94744b2bf01ccadb 100644
--- a/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/testrunactions/children/settestrecipient/onActionProcess.js
@@ -1,9 +1,22 @@
import("Sql_lib");
import("system.vars");
import("system.neon");
+import("system.entities");
+
+var loadConfig = entities.createConfigForLoadingRows()
+ .fields(["#UID"])
+ .fromEntityRecordsRecipe(vars.get("$sys.selectionsRecordsRecipe"));
+
+var selectedRecords = entities.getRows(loadConfig);
+
+
+var selectedUids = selectedRecords.map(function (pRecord)
+{
+ return pRecord["#UID"]
+});
+
+newWhere("BULKMAILRECIPIENT.BULKMAILRECIPIENTID",selectedUids,SqlBuilder.IN())
+.updateFields({"IS_TEST_RECIPIENT": 1});
-newWhereIfSet("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", vars.get("$sys.selection"), SqlBuilder.IN())
- .updateData(true, "BULKMAILRECIPIENT", ["IS_TEST_RECIPIENT"], null, [1]);
-
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/testrunactions/stateProcess.js b/entity/BulkMailRecipient_entity/entityfields/testrunactions/stateProcess.js
index 0d630e347774ced0b5ea0c83e85ae75c66da1b4a..ce0b4a9880b0510ff70206712e32835462cb7a52 100644
--- a/entity/BulkMailRecipient_entity/entityfields/testrunactions/stateProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/testrunactions/stateProcess.js
@@ -1,8 +1,10 @@
+import("system.logging");
import("system.result");
import("system.vars");
import("system.neon");
-if (vars.get("$sys.selection").length > 0)
+logging.log(vars.get("$sys.selectionsRecordsRecipe"))
+if (vars.get("$sys.selectionsRecordsRecipe"))
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
diff --git a/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod b/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
index d8793c1e6f941850bedaed48e1f0beb418eece39..4b92afe629e8f874dbf56a112bbcd38d31857cfc 100644
--- a/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
+++ b/entity/BulkMailTestRecipient_entity/BulkMailTestRecipient_entity.aod
@@ -4,6 +4,7 @@
<title>Test Recipient</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/BulkMailTestRecipient_entity/documentation.adoc</documentation>
+ <recordsRecipeSupported v="true" />
<titlePlural>Test Recipients</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/BulkMailTestRecipient_entity/entityfields/email_address/dropDownProcess.js b/entity/BulkMailTestRecipient_entity/entityfields/email_address/dropDownProcess.js
index 9012549e191ebf27386dc8b28309e1cb9463e6e3..81a723d766c730a22a59716bcaae547b551b7d8e 100644
--- a/entity/BulkMailTestRecipient_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/BulkMailTestRecipient_entity/entityfields/email_address/dropDownProcess.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
import("Communication_lib");
import("system.result");
import("system.vars");
@@ -10,7 +11,7 @@ if (contactId)
var emailAddresses = new SqlBuilder().selectDistinct(["COMMUNICATION.ADDR","COMMUNICATION.ADDR"])
.from("COMMUNICATION")
.where("COMMUNICATION.OBJECT_ROWID",contactId)
- .and("COMMUNICATION.OBJECT_TYPE", CommUtil.defaultObjectType())
+ .and("COMMUNICATION.OBJECT_TYPE", ContactUtils.getContextByContactId(contactId))
.and("COMMUNICATION.MEDIUM_ID",CommUtil.getMediumIdsByCategory("EMAIL"),SqlBuilder.IN())
.table();
result.object(emailAddresses);
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index 68c3c1099f025c5435770d12262c0624b1e2d767..63924735b1974f4ff7dfebb2bc68e60d6a548c57 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
@@ -53,7 +53,7 @@
<name>testMail</name>
<title>Test email</title>
<onActionProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CLIPBOARD_CHECK</iconId>
+ <iconId>VAADIN:PAPERPLANE_O</iconId>
</entityActionField>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 5a95e209f60d6d026a2f8406f132dc440eaa1b37..7d370947a623fbbc3218d72e73046c7451c00865 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -6,7 +6,6 @@
<documentation>%aditoprj%/entity/BulkMail_entity/documentation.adoc</documentation>
<icon>VAADIN:AT</icon>
<grantUpdateProcess>%aditoprj%/entity/BulkMail_entity/grantUpdateProcess.js</grantUpdateProcess>
- <grantDeleteProcess>%aditoprj%/entity/BulkMail_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/BulkMail_entity/contentTitleProcess.js</contentTitleProcess>
<contentDescriptionProcess>%aditoprj%/entity/BulkMail_entity/contentDescriptionProcess.js</contentDescriptionProcess>
<afterUiInit>%aditoprj%/entity/BulkMail_entity/afterUiInit.js</afterUiInit>
@@ -93,8 +92,9 @@
<entityField>
<name>SENDER</name>
<title>Sender address</title>
+ <consumer>SenderAddressKeyword</consumer>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sender/valueProcess.js</valueProcess>
+ <textInputAllowed v="true" />
<onValidation>%aditoprj%/entity/BulkMail_entity/entityfields/sender/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -161,6 +161,7 @@
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/BulkMail_entity/entityfields/loghistories/children/tablenames_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityConsumer>
@@ -532,6 +533,36 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityField>
+ <name>ISOLANGUAGE</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>dateLastEdit</name>
+ <title>Edited on</title>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>userLastEdit</name>
+ <title>Editor</title>
+ <contentType>TEXT</contentType>
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>BULKMAIL_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
<entityActionGroup>
<name>observeActionoGroup</name>
<children>
@@ -571,12 +602,6 @@
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/tooltipProcess.js</tooltipProcess>
</entityActionField>
- <entityActionField>
- <name>testMail</name>
- <title>Test email</title>
- <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CLIPBOARD_CHECK</iconId>
- </entityActionField>
<entityActionField>
<name>downloadTemplate</name>
<title>Download template</title>
@@ -604,6 +629,12 @@
<iconId>VAADIN:TOOLS</iconId>
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/newmosaicotemplate/stateProcess.js</stateProcess>
</entityActionField>
+ <entityActionField>
+ <name>testMail</name>
+ <title>Test email</title>
+ <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PAPERPLANE_O</iconId>
+ </entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
@@ -612,34 +643,42 @@
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
<entityField>
- <name>ISOLANGUAGE</name>
- <title>Language</title>
- <consumer>Languages</consumer>
- <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>dateLastEdit</name>
- <title>Edited on</title>
- <contentType>DATE</contentType>
- </entityField>
- <entityField>
- <name>userLastEdit</name>
- <title>Editor</title>
- <contentType>TEXT</contentType>
- <groupable v="true" />
- </entityField>
- <entityField>
- <name>BULKMAIL_OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js</valueProcess>
+ <name>CAMPAIGN_ID</name>
+ <title>Campaign</title>
+ <consumer>Campaigns</consumer>
+ <linkedContext>Campaign</linkedContext>
</entityField>
<entityConsumer>
- <name>Languages</name>
+ <name>Campaigns</name>
<dependency>
<name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>Campaigns</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>OnlyActive_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/campaigns/children/onlyactive_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>PresetRecipientsRecordsRecipe_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>SenderAddressKeyword</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
</entityFields>
<recordContainers>
@@ -789,6 +828,14 @@
<expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/firstsenddate.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CAMPAIGN_ID.value</name>
+ <recordfield>BULKMAIL.CAMPAIGN_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CAMPAIGN_ID.displayValue</name>
+ <expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>dateLastEdit.value</name>
<expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js</expression>
diff --git a/entity/BulkMail_entity/entityfields/bulkmailoverviewviews/stateProcess.js b/entity/BulkMail_entity/entityfields/bulkmailoverviewviews/stateProcess.js
index 52e69c9b863cfdfba84eca61fa0fb5af07aba11a..8c591f624cc0225490f9f0d756759d1392594774 100644
--- a/entity/BulkMail_entity/entityfields/bulkmailoverviewviews/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/bulkmailoverviewviews/stateProcess.js
@@ -3,7 +3,7 @@ import("system.result");
import("system.neon");
import("KeywordRegistry_basic");
-if( vars.get("$field.STATUS") == $KeywordRegistry.bulkMailStatus$sent())
+if( vars.get("$field.STATUS") == $KeywordRegistry.bulkMailStatus$sent() || (vars.get("$field.STATUS") == $KeywordRegistry.bulkMailStatus$adHoc() && vars.get("$field.deliveredMailCount") > 0))
{
result.string(neon.COMPONENTSTATE_READONLY);
}
diff --git a/entity/Context_entity/entityfields/salesorderlinkeablet/children/invertblacklist_param/valueProcess.js b/entity/BulkMail_entity/entityfields/campaigns/children/onlyactive_param/valueProcess.js
similarity index 97%
rename from entity/Context_entity/entityfields/salesorderlinkeablet/children/invertblacklist_param/valueProcess.js
rename to entity/BulkMail_entity/entityfields/campaigns/children/onlyactive_param/valueProcess.js
index 40effa0178464da0c7850912345f19c7fa95975a..cda204045d2aba9ae974e0ce2200ba0cc6c852c0 100644
--- a/entity/Context_entity/entityfields/salesorderlinkeablet/children/invertblacklist_param/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/campaigns/children/onlyactive_param/valueProcess.js
@@ -1,3 +1,2 @@
import("system.result");
-
result.string(true);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/content/stateProcess.js b/entity/BulkMail_entity/entityfields/content/stateProcess.js
index 24b49f027ede29dea1a30a25c28aee4b839c0a7f..4a4e1bbf91589ad6fa246608d2facdbfda8dbc09 100644
--- a/entity/BulkMail_entity/entityfields/content/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/content/stateProcess.js
@@ -2,11 +2,19 @@ import("system.result");
import("system.vars");
import("system.neon");
import("DocumentTemplate_lib");
+import("Util_lib");
// in edit mode
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW && vars.get("$field.templateType") == DocumentTemplate.types.EML) // TODO: invisible for html as there are problems with images which are removed by the html-editor
+if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW
+ && ((vars.get("$field.templateType") == DocumentTemplate.types.EML)
+ || (vars.get("$field.templateType") == DocumentTemplate.types.HTML && (!Utils.isNullOrEmptyString(vars.get("$field.DOCUMENTTEMPLATE_ID")) || !Utils.isNullOrEmptyString(vars.get("$field.MOSAICOTEMPLATE_ID"))))))
result.string(neon.COMPONENTSTATE_INVISIBLE);
-else if (vars.get("$field.templateType") == DocumentTemplate.types.EML)
- result.string(neon.COMPONENTSTATE_READONLY);
+else if (vars.get("$field.templateType") == DocumentTemplate.types.EML
+ || (vars.get("$field.templateType") == DocumentTemplate.types.HTML && (!Utils.isNullOrEmptyString(vars.get("$field.DOCUMENTTEMPLATE_ID")) || !Utils.isNullOrEmptyString(vars.get("$field.MOSAICOTEMPLATE_ID")))))
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
else
- result.string(neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
diff --git a/entity/BulkMail_entity/entityfields/emleditinfo/stateProcess.js b/entity/BulkMail_entity/entityfields/emleditinfo/stateProcess.js
index 4c7e406153cf2cf3cf572311262bdbae39f476ce..c53a60c86cbf94fae4bef118a608937a9aee16b5 100644
--- a/entity/BulkMail_entity/entityfields/emleditinfo/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/emleditinfo/stateProcess.js
@@ -1,9 +1,11 @@
+import("Util_lib");
import("system.result");
import("system.vars");
import("system.neon");
import("DocumentTemplate_lib");
-if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW && vars.get("$field.templateType") == DocumentTemplate.types.EML) // TODO: invisible for html as there are problems with images which are removed by the html-editor
+if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_VIEW && (vars.get("$field.templateType") == DocumentTemplate.types.EML
+|| (vars.get("$field.templateType") == DocumentTemplate.types.HTML && (!Utils.isNullOrEmptyString(vars.get("$field.DOCUMENTTEMPLATE_ID")) || !Utils.isNullOrEmptyString(vars.get("$field.MOSAICOTEMPLATE_ID"))))))
result.string(neon.COMPONENTSTATE_READONLY);
else
result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/emleditinfo/valueProcess.js b/entity/BulkMail_entity/entityfields/emleditinfo/valueProcess.js
index 4f595f34a49eae691e8feb852048e96b0893e77c..51e6370a137b781581deed76847ed17a64a5bd0d 100644
--- a/entity/BulkMail_entity/entityfields/emleditinfo/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/emleditinfo/valueProcess.js
@@ -1,4 +1,4 @@
import("system.translate");
import("system.result");
-result.string(translate.text("EML files can't be edited here. You can download, edit and reupload the template to change the content."))
\ No newline at end of file
+result.string(translate.text("File can't be edited here. You can download, edit and reupload the template to change the content."))
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/recipients/stateProcess.js b/entity/BulkMail_entity/entityfields/recipients/stateProcess.js
index 0e2b38fa2ad190ab5224e7a614c678073f0f5093..ad475501f6e7e83a5a7e0e2cfac1cf8cf8c90956 100644
--- a/entity/BulkMail_entity/entityfields/recipients/stateProcess.js
+++ b/entity/BulkMail_entity/entityfields/recipients/stateProcess.js
@@ -3,5 +3,5 @@ import("Bulkmail_lib");
import("system.result");
import("system.neon");
-if (BulkMailUtils.isStatusSendingOrSent(vars.get("$field.STATUS")))
+if (BulkMailUtils.isStatusSendingSentOrAdHoc(vars.get("$field.STATUS")))
result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/sender/valueProcess.js b/entity/BulkMail_entity/entityfields/sender/valueProcess.js
deleted file mode 100644
index 88626d517388be0ae8c0186c2f3729d00b741eb7..0000000000000000000000000000000000000000
--- a/entity/BulkMail_entity/entityfields/sender/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("Communication_lib");
-import("system.result");
-import("Employee_lib");
-
-if(vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
-result.string(CommUtil.getStandardMail(EmployeeUtils.getCurrentContactId()));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js b/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6429e2a55e085b274b35eeabbe613c94741d8b5e
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/senderaddresskeyword/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.bulkMailSenderAddress());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/grantDeleteProcess.js b/entity/BulkMail_entity/grantDeleteProcess.js
deleted file mode 100644
index 28bfe1f78be38012df50953c85c7a033684d3f5e..0000000000000000000000000000000000000000
--- a/entity/BulkMail_entity/grantDeleteProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("Context_lib");
-import("system.vars");
-import("system.result");
-import("Entity_lib");
-
-var rowId = vars.get("$field.BULKMAILID");
-var currentContext = ContextUtils.getCurrentContextId();
-
-var canDelete = new HasLinkedObjectTester()
- .andNoEntityRows("BulkMailRecipient_entity", "BulkMailRecipients", {BulkMailId_param : rowId}) //Recipients
- .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : currentContext, RowId_param : rowId}) //Activities
- .validate();
-
-result.string(canDelete);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js b/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
index aaa02ff8073f59cb12e50e314b8e88b7a39f79cd..104dcc3a1c0d21d885433f28aab40b3993fdf7b2 100644
--- a/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,4 @@
+import("Bulkmail_lib");
import("Document_lib");
import("Context_lib");
import("Workflow_lib");
@@ -9,6 +10,29 @@ DocumentUtil.deleteAllUploadedImages("content_IMAGE_UPLOAD");
newWhere("BULKMAILRECIPIENT.BULKMAIL_ID", "$local.uid").deleteData();
+BulkMailUtils.deleteAllEmlFiles(vars.get("$local.uid"));
+
+newWhere("ACTIVITYLINK.OBJECT_ROWID","$local.uid").and("ACTIVITYLINK.OBJECT_TYPE","BulkMail").deleteData();
+
+newWhere("WEBLINK_CLICK.MAIL_LOG_ID"
+ ,newSelect("MAIL_LOG.MAIL_LOGID")
+ .from("MAIL_LOG")
+ .join("MAIL_RUN","MAIL_LOG.MAIL_RUN_ID = MAIL_RUN.MAIL_RUNID")
+ .where("MAIL_RUN.OBJECT_TYPE","BulkMail")
+ .and("MAIL_RUN.OBJECT_ROWID","$local.uid")
+ ,SqlBuilder.IN())
+ .deleteData(true,"WEBLINK_CLICK");
+
+newWhere("MAIL_LOG.MAIL_RUN_ID",
+ newSelect("MAIL_RUN.MAIL_RUNID")
+ .from("MAIL_RUN")
+ .where("MAIL_RUN.OBJECT_TYPE","BulkMail")
+ .and("MAIL_RUN.OBJECT_ROWID","$local.uid")
+ ,SqlBuilder.IN())
+ .deleteData(true,"MAIL_LOG");
+
+newWhere("MAIL_RUN.OBJECT_TYPE","BulkMail").and("MAIL_RUN.OBJECT_ROWID","$local.uid").deleteData();
+
SingleBinaryUtils.remove("BULKMAIL", "DOCUMENT", vars.get("$local.uid"));
WorkflowSignalSender.deleted();
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js b/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js
index 54931b06e7104406b1df9fa48a117170497f7b17..0fcb3e3f16afbaa4c7be3b0c9fae3fa58a08042f 100644
--- a/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/BulkMail_entity/recordcontainers/db/onDBInsert.js
@@ -100,6 +100,11 @@ else if (vars.getString("$param.PresetRecipientsContext_param") && vars.getStrin
contactIds = contactIds.concat(BulkMailUtils.filterNewRecipientsByCondition(bulkMailId, JSON.parse(vars.getString("$param.PresetRecipientsFilter_param")).condition, vars.getString("$param.PresetRecipientsContext_param")));
}
+if (vars.get("$param.PresetRecipientsRecordsRecipe_param"))
+{
+ contactIds = contactIds.concat(BulkMailUtils.filterNewRecipientsByRecordsRecipe(bulkMailId, vars.get("$param.PresetRecipientsRecordsRecipe_param")));
+}
+
if (contactIds && contactIds.length > 0)
BulkMailUtils.addRecipients(bulkMailId, contactIds);
diff --git a/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js b/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js
index 3c74afcc36fb6b205272bc381bf0a2b025c606c0..837c0929f906f2a682ea55e48e15ac44d7003d70 100644
--- a/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/BulkMail_entity/recordcontainers/db/orderClauseProcess.js
@@ -3,6 +3,6 @@ import("system.db");
import("Sql_lib");
ref = {};
-ref[SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW")] = db.DESCENDING;
+ref[new SqlMaskingUtils().isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW")] = db.DESCENDING;
result.object(ref);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..f189165e8b4a85270490e1f395e0e9f8a5b8fa6a
--- /dev/null
+++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/campaign_id.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Sql_lib");
+
+result.string(newSelect("CAMPAIGN.NAME")
+ .from("CAMPAIGN")
+ .where("BULKMAIL.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
+ .toString())
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js
index e8375af86734ceb2389e24ae3b10720d4f60100b..5ea86d6ad7ce14b9b5456f254a67b6de7d5e0bda 100644
--- a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js
+++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/datelastedit.value/expression.js
@@ -1,6 +1,6 @@
import("system.result");
import("Sql_lib");
-var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW");
+var cond = new SqlMaskingUtils().isNull("BULKMAIL.DATE_EDIT", "BULKMAIL.DATE_NEW");
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js
index 2df0709d0bf778d8b5fd119872866d8fa64896d3..d9c759971c59690e61c616fd4d36788c3df5fbe0 100644
--- a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js
+++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/userlastedit.value/expression.js
@@ -1,6 +1,6 @@
import("system.result");
import("Sql_lib");
-var cond = SqlMaskingUtils.prototype.isNull("BULKMAIL.USER_EDIT", "BULKMAIL.USER_NEW");
+var cond = new SqlMaskingUtils().isNull("BULKMAIL.USER_EDIT", "BULKMAIL.USER_NEW");
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index c14bbf77c06c95747866b02fbaf05a51884d91b9..0c1140dc3ad3a5beb96084aa66cae04e39eafc11 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -168,6 +168,10 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityParameter>
+ <name>campaignParticipantsRecordsRecipe_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
index 6511d5abbe134859e02af1b780da968a76fdd7ba..086f3dd9662482bdbe652235527ef530eaae6ea2 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantcontactids/valueProcess.js
@@ -5,7 +5,8 @@ import("system.vars");
import("system.neon");
import("FilterViewAction_lib");
import("Campaign_lib");
-
+import("system.neonFilter");
+import("system.entities");
if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.CAMPAIGNSTEP_ID"))
{
@@ -13,7 +14,8 @@ if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.CAMPAIGNSTEP_ID"))
var isUpdate = Utils.toBoolean(vars.get("$param.isUpdate_param"));
var comingfrom = vars.getString("$param.dataSourceTableName_param");
var selection = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param"));
-
+ var recordsRecipe = neonFilter.createEntityRecordsRecipeBuilder(vars.get("$param.campaignParticipantsRecordsRecipe_param"));
+
if(vars.exists("$param.campaignParticipantsCondition_param") && vars.get("$param.campaignParticipantsCondition_param") && !isUpdate)
{
selection = JSON.parse(vars.getString("$param.campaignParticipantsCondition_param")).condition;
@@ -27,18 +29,42 @@ if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.CAMPAIGNSTEP_ID"))
}
else if(isUpdate)
{
- if (vars.get("$param.campaignParticipantsCondition_param"))
+ if (vars.get("$param.campaignParticipantsRecordsRecipe_param"))
+ {
+ let parameters = recordsRecipe.getParameters();
+ parameters["$param.OnlyNotInCampaignStepId_param"] = vars.get("$field.CAMPAIGNSTEP_ID");
+ recordsRecipe.parameters(parameters);
+ var loadConfig = entities.createConfigForLoadingRows()
+ .fromEntityRecordsRecipe(recordsRecipe)
+ .fields(["CONTACT_ID"]);
+ contactIds = entities.getRows(loadConfig).map(function (row)
+ {
+ return row["CONTACT_ID"]
+ });
+ }
+ else if (vars.get("$param.campaignParticipantsCondition_param"))
{
-
var contactFilterCondition = JSON.parse(vars.get("$param.campaignParticipantsCondition_param")).condition;
contactIds = CampaignUtils.GetContactIdsNotInCampaignStepByCondition(vars.get("$field.CAMPAIGNSTEP_ID"),vars.get("$field.CAMPAIGN_ID"), contactFilterCondition);
- }
+ }
+
else
{
contactIds = CampaignUtils.GetContactIdsNotInCampaignStepByRowIds(vars.get("$field.CAMPAIGNSTEP_ID"), selection);
}
}
- else
+ else if (vars.get("$param.campaignParticipantsRecordsRecipe_param"))
+ {
+ recordsRecipe.parameters({"$param.OnlyNotInCampaignId_param": vars.get("$field.CAMPAIGN_ID")});
+ let loadConfig = entities.createConfigForLoadingRows()
+ .fromEntityRecordsRecipe(recordsRecipe)
+ .fields(["#UID"]);
+ contactIds = entities.getRows(loadConfig).map(function (row)
+ {
+ return row["#UID"]
+ });
+ }
+ else
{
contactIds = CampaignUtils.GetContactIdsNotInCampaignByRowIds(vars.get("$field.CAMPAIGN_ID"), selection);
}
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
index 50b80a7140e7174360fc74fd7532e1ae3c65d0a2..e6e773d9bc760b3bb1f325fb6d616db622b5abc0 100644
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
+++ b/entity/CampaignAddParticipants_entity/entityfields/campaignparticipantmessage/valueProcess.js
@@ -5,6 +5,7 @@ import("system.vars");
import("Campaign_lib");
import("FilterViewAction_lib");
import("Util_lib");
+import("system.entities");
var res = "";
var resNotAdded = "\n";
@@ -21,8 +22,14 @@ if(vars.get("$field.CAMPAIGN_ID") && vars.get("$field.campaignparticipantContact
if (validCount != 0)
{
res = translate.withArguments("%0 new participants will be added to the campaign.", [validCount]);
-
- if(vars.exists("$param.campaignParticipantsRowIds_param") && vars.getString("$param.campaignParticipantsRowIds_param"))
+ if (vars.get("$param.campaignParticipantsRecordsRecipe_param"))
+ {
+ var loadConfig = entities.createConfigForLoadingRows()
+ .fromEntityRecordsRecipe(vars.get("$param.campaignParticipantsRecordsRecipe_param"))
+ .fields(["#UID"]);
+ selectedIds = entities.getRowCount(loadConfig);
+ }
+ else if(vars.exists("$param.campaignParticipantsRowIds_param") && vars.getString("$param.campaignParticipantsRowIds_param"))
selectedIds = JSON.parse(vars.getString("$param.campaignParticipantsRowIds_param")).length;
else
{
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 56099308c728313324d1b2b7d2fad60c7c578c77..3fe8c57bec141b26cb1c10f0269ef400fa01e46c 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -10,6 +10,7 @@
<element>Campaign_entity</element>
</siblings>
<usePermissions v="false" />
+ <recordsRecipeSupported v="true" />
<titlePlural>Participants</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -170,7 +171,7 @@
<title>Update campaign step</title>
<onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ <iconId>VAADIN:FILE_TREE_SUB</iconId>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/stateProcess.js</stateProcess>
<tooltip>Update campaign step</tooltip>
@@ -181,12 +182,14 @@
<title>Add to Bulkmail</title>
<onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newBulkMail</name>
<title>Write bulk mail</title>
<onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/stateProcess.js</stateProcess>
</entityActionField>
</children>
</entityActionGroup>
@@ -306,6 +309,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>OnlyNotInCampaignStepId_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/onActionProcess.js
index c5e06bc71d9e0872e5ba270940a124d90da8fc2f..5cc017ccec50eef7265bca9ca800100d7cfa69cc 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/onActionProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/onActionProcess.js
@@ -1,5 +1,4 @@
import("Bulkmail_lib");
import("system.vars");
-var parameters = {"CampaignId_param":vars.get("$param.CampaignId_param")};
-BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"), parameters);
\ No newline at end of file
+BulkMailUtils.openAddRecipientViewWithRecipe(vars.get("$sys.selectionsRecordsRecipe"));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/stateProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..339c5c0f0416e7d0dcb6159597e334dcbd197795
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/addtobulkmail/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+if(vars.get("$sys.selectionsRecordsRecipe"))
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/onActionProcess.js
index 7bca6ed54c3f9d4dfc5aa1c56556d2bac6832ed6..290409f7de4e7ea14f511bbabd412b88db3fdc9f 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/onActionProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/onActionProcess.js
@@ -1,21 +1,4 @@
import("system.vars");
-import("Sql_lib");
-import("system.db");
import("Bulkmail_lib");
-
-var selection = vars.get("$sys.selection");
-var filter = vars.get("$sys.filter");
-var recipientsSql = newSelect("CONTACT_ID")
- .from("CAMPAIGNPARTICIPANT")
-
-if(selection.length > 0)
-{
- recipientsSql.where("CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID",selection,SqlBuilder.IN());
- BulkMailUtils.newBulkMail(recipientsSql.arrayColumn());
-}
-else
-{
- BulkMailUtils.newBulkMail(null,vars.getString("$sys.currentcontextname"),filter);
-}
-
+BulkMailUtils.newBulkMailWithRecordsRecipe(vars.get("$sys.selectionsRecordsRecipe"));
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/stateProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..339c5c0f0416e7d0dcb6159597e334dcbd197795
--- /dev/null
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/newbulkmail/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("system.neon");
+import("system.result");
+
+
+if(vars.get("$sys.selectionsRecordsRecipe"))
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
index fbba2db18aa37636d3d3ca5097cccd1c29df51e7..da52348277398320e399c41f241bc67b201c8a46 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js
@@ -1,17 +1,9 @@
import("system.vars");
-import("system.neon");
import("Campaign_lib");
-var sysSelection = vars.get("$sys.selection");
+var sysSelectionsRecordsRecipe = vars.get("$sys.selectionsRecordsRecipe");
var campaignId = vars.get("$field.CAMPAIGN_ID");
-var campaignStepId = vars.get("$field.CAMPAIGNSTEP_ID")
+var campaignStepId = vars.get("$field.CAMPAIGNSTEP_ID");
-if(sysSelection.length > 0) //selektierte IDs als Array
-{
- CampaignUtils.openSetCampaignStepViewByRowIds(JSON.stringify(vars.get("$sys.selection")), campaignId, campaignStepId);
-}
-else
-{
- CampaignUtils.openSetCampaignStepViewByCondition(JSON.stringify(vars.get("$sys.filter")), campaignId, campaignStepId);
-}
\ No newline at end of file
+CampaignUtils.openSetCampaignStepViewByRecordsRecipe(sysSelectionsRecordsRecipe, campaignId, campaignStepId)
\ No newline at end of file
diff --git a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/stateProcess.js b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/stateProcess.js
index 78eb0e84628e8dd7122682d803a8e555c24594a5..339c5c0f0416e7d0dcb6159597e334dcbd197795 100644
--- a/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/stateProcess.js
+++ b/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/stateProcess.js
@@ -1,11 +1,9 @@
-import("Campaign_lib");
import("system.vars");
import("system.neon");
import("system.result");
-var participantCount = vars.get("$sys.datarowcountfull");
-if(participantCount > 0)
+if(vars.get("$sys.selectionsRecordsRecipe"))
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
diff --git a/entity/CampaignParticipant_entity/recordcontainers/db/conditionProcess.js b/entity/CampaignParticipant_entity/recordcontainers/db/conditionProcess.js
index 67d5159a7b988831992b8af18bbaad5ed190c03e..e3f25c18cd7dd6513cced1e3fe52fa11502ff6be 100644
--- a/entity/CampaignParticipant_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/CampaignParticipant_entity/recordcontainers/db/conditionProcess.js
@@ -5,6 +5,7 @@ import("system.vars");
var condition = newWhere()
.andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGN_ID", "$param.CampaignId_param")
.andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID", "$param.CampaignStepId_param")
- .andIfSet("CAMPAIGNPARTICIPANT.CONTACT_ID", "$param.ContactId_param");
+ .andIfSet("CAMPAIGNPARTICIPANT.CONTACT_ID", "$param.ContactId_param")
+ .andIfSet("CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID","$param.OnlyNotInCampaignStepId_param",SqlBuilder.NOT_EQUAL());
result.string(condition.toString());
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 3d40d3531edc1d25041c2b33f962aaf35eef07d3..e7053a5c96711f36b039d5b36996431848d4f7bd 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -344,7 +344,7 @@
<name>newCampaignStep</name>
<title>New step</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
- <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ <iconId>VAADIN:FILE_TREE_SUB</iconId>
</entityActionField>
<entityParameter>
<name>predecessorstepId_param</name>
@@ -403,6 +403,7 @@
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>newBulkMail</name>
@@ -410,6 +411,7 @@
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/stateProcess.js</stateProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/onActionProcess.js b/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/onActionProcess.js
index 3a56d448a8c9b338e7b99dcf92ab7e08d202c6d0..5cc017ccec50eef7265bca9ca800100d7cfa69cc 100644
--- a/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/onActionProcess.js
+++ b/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/onActionProcess.js
@@ -1,5 +1,4 @@
import("Bulkmail_lib");
import("system.vars");
-var parameters = {"campaignId_param":vars.get("$param.campaignId_param")};
-BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"), parameters);
\ No newline at end of file
+BulkMailUtils.openAddRecipientViewWithRecipe(vars.get("$sys.selectionsRecordsRecipe"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/stateProcess.js b/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1b04fd98874d704e41d93d9ce32daca0c5405ac
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/group/children/addtobulkmail/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.vars");
+import("system.neon")
+
+
+if (!vars.get("$sys.selectionsRecordsRecipe"))
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/onActionProcess.js b/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/onActionProcess.js
index 548f568aebb826bfa906f7ba752f12b1a51ad638..290409f7de4e7ea14f511bbabd412b88db3fdc9f 100644
--- a/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/onActionProcess.js
+++ b/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/onActionProcess.js
@@ -1,7 +1,4 @@
import("system.vars");
-import("Sql_lib");
-import("system.db");
import("Bulkmail_lib");
-
-BulkMailUtils.newBulkMail(null,vars.get("$sys.currentcontextname"),{"condition":newWhere("CAMPAIGNSTEP.CAMPAIGNSTEPID","$field.CAMPAIGNSTEPID").toString()});
\ No newline at end of file
+BulkMailUtils.newBulkMailWithRecordsRecipe(vars.get("$sys.selectionsRecordsRecipe"));
\ No newline at end of file
diff --git a/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/stateProcess.js b/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1b04fd98874d704e41d93d9ce32daca0c5405ac
--- /dev/null
+++ b/entity/CampaignStep_entity/entityfields/group/children/newbulkmail/stateProcess.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("system.vars");
+import("system.neon")
+
+
+if (!vars.get("$sys.selectionsRecordsRecipe"))
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index f35660d768204ecac37a730a700fc63dc880eab0..74cdbb1d533ef85d299420270bff5924b8a018a6 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -353,7 +353,7 @@
<name>newCampaignStep</name>
<title>New step</title>
<onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
- <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ <iconId>VAADIN:FILE_TREE_SUB</iconId>
</entityActionField>
<entityConsumer>
<name>CampaignAnalysisConsumer</name>
diff --git a/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
index 2eb878e8a508ae477f8bf474c5a7a8c04dab20c0..7a9e860b678030bcaf498374134bda630b4eaaac 100644
--- a/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
+++ b/entity/ChecklistEntryValue_entity/ChecklistEntryValue_entity.aod
@@ -3,6 +3,7 @@
<name>ChecklistEntryValue_entity</name>
<title>Checklist</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ChecklistEntryValue_entity/documentation.adoc</documentation>
<icon>NEON:MQL</icon>
<titlePlural>Checklists</titlePlural>
<recordContainer>jDito</recordContainer>
@@ -38,9 +39,11 @@
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <contentType>DATE</contentType>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
</entityField>
<entityParameter>
<name>ObjectRowId_param</name>
diff --git a/entity/ChecklistEntryValue_entity/documentation.adoc b/entity/ChecklistEntryValue_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d2bb91e764f3fdea775321deff8e5c57f892aba4
--- /dev/null
+++ b/entity/ChecklistEntryValue_entity/documentation.adoc
@@ -0,0 +1,18 @@
+= ChecklistEntryValue_entity
+
+== Overview
+
+ChecklistEntryValue_entity defines the value of a ChecklistEntry_entity
+
+== Relation to other entities
+
+Every ChecklistEntry corresponds to one row in the Checklist.
+Values of the ChecklistEntry_entity are stored in ChecklistEntryValue_entity.
+
+== Best Practice
+
+- See Checklist_entity documentation
+
+== FAQ
+
+- See Checklist_entity documentation
diff --git a/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod b/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
index eb4a62d98a7ad332797e187d8017588abc33c141..eab4e6a807411b04c5dce632ccbd618afcb4cf85 100644
--- a/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
+++ b/entity/ChecklistEntry_entity/ChecklistEntry_entity.aod
@@ -3,6 +3,7 @@
<name>ChecklistEntry_entity</name>
<title>Checklist entries</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ChecklistEntry_entity/documentation.adoc</documentation>
<icon>NEON:MQL</icon>
<recordContainer>db</recordContainer>
<entityFields>
@@ -46,10 +47,12 @@
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/ChecklistEntry_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
diff --git a/entity/ChecklistEntry_entity/documentation.adoc b/entity/ChecklistEntry_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..173e787e0ea0c3ec4b8ce9ab9428670f28e96d64
--- /dev/null
+++ b/entity/ChecklistEntry_entity/documentation.adoc
@@ -0,0 +1,18 @@
+= ChecklistEntry_entity
+
+== Overview
+
+ChecklistEntry_entity defines an automatic or manual checklist entry.
+
+== Relation to other entities
+
+Every ChecklistEntry corresponds to one row in the Checklist.
+Values of the ChecklistEntry_entity are stored in ChecklistEntryValue.
+
+== Best Practice
+
+- See Checklist_entity documentation
+
+== FAQ
+
+- See Checklist_entity documentation
diff --git a/entity/Checklist_entity/Checklist_entity.aod b/entity/Checklist_entity/Checklist_entity.aod
index 6be48a259796713e7daf96420e286ba28617779c..19c219ceb5145bcedaf5c22861eb0eb4f1076654 100644
--- a/entity/Checklist_entity/Checklist_entity.aod
+++ b/entity/Checklist_entity/Checklist_entity.aod
@@ -3,6 +3,7 @@
<name>Checklist_entity</name>
<title>Checklists</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Checklist_entity/documentation.adoc</documentation>
<icon>NEON:MQC</icon>
<siblings />
<onValidation>%aditoprj%/entity/Checklist_entity/onValidation.js</onValidation>
@@ -29,10 +30,12 @@
</entityField>
<entityField>
<name>DATE_NEW</name>
+ <contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/Checklist_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityProvider>
@@ -64,7 +67,7 @@
</entityField>
<entityField>
<name>CHECKLIST_CONTEXT</name>
- <title>Context</title>
+ <title>${CONTEXT}</title>
<consumer>Contexts</consumer>
<groupable v="true" />
<mandatory v="true" />
diff --git a/entity/Checklist_entity/documentation.adoc b/entity/Checklist_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a432d130213fca1a14f54b397b2108bbcacb15d2
--- /dev/null
+++ b/entity/Checklist_entity/documentation.adoc
@@ -0,0 +1,36 @@
+= Checklist_entity
+
+== Overview
+
+To add a new checklist, simply create a new entry in the Checklist context.
+
+3 types of checklists:
+1. Manuals that only have a title
+2. Automatic via customizing process (ChecklistEntryRegistry)
+3. Automatic by filter
+
+(2 and 3 cannot be set to done by the user but are automatically set to done as soon as the condition applies)
+
+2. have to be implemented once via customizing, almost everything is possible here, you only have to spend the time to implement it once.
+The automatic ones come from the ChecklistEntryRegistry_basic -> you can orientate yourself very well on the existing ones, you only build one object together with name, title, type, objectType and define functions for value and displayvalue.
+3. work in a similar way to 2. except that no customizing effort is necessary here, since the filters can be evaluated dynamically.
+
+== Relation to other entities
+
+The checklist entity is a list of ChecklistEntry_entity rows.
+ChecklistEntryValue_entity saves the values of the checklist.
+
+== Best Practice
+
+- Be careful with automatic checklists, too many automatic checklists slow down the system!
+
+== FAQ
+
+How to add a manual checklist entry:
+Simply add an entry in the Checklist context to the corresponding checklist.
+
+How to add a automatic checklist entry:
+Register the check process (see ChecklistEntryRegistry_basic),
+and choose the process name in the dropdown,
+while adding an entry in the checklist context.
+Also see "Best Practice" when planning to add an automatic checklist entry.
diff --git a/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod b/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
index 70f720c867d5ac532bbb25fbca73b340d4fcb614..16830dac105692dbf6efca3cabe9cbaccdb64e65 100644
--- a/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
+++ b/entity/CommunicationChannel_entity/CommunicationChannel_entity.aod
@@ -44,6 +44,10 @@
<name>CommCategory_param</name>
<valueProcess>%aditoprj%/entity/CommunicationChannel_entity/entityfields/communications/children/commcategory_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/CommunicationChannel_entity/entityfields/communications/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityProvider>
diff --git a/entity/CommunicationChannel_entity/entityfields/communications/children/objecttype_param/valueProcess.js b/entity/CommunicationChannel_entity/entityfields/communications/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..544925f662c3bd2ed0908fd967b15db5ac81c52a
--- /dev/null
+++ b/entity/CommunicationChannel_entity/entityfields/communications/children/objecttype_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Contact_lib");
+import("system.result");
+
+result.string(ContactUtils.getContextByContactId(vars.get("$param.ContactId_param")));
\ No newline at end of file
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index 0126d638c8226a0da9a9dc6b75dbfb340eb3f799..ed4aba4b1de26e36cf2713335d72a7320cb3b6b4 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -221,7 +221,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityField>
<entityParameter>
<name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/objecttype_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
</entityFields>
diff --git a/entity/Communication_entity/entityfields/objecttype_param/valueProcess.js b/entity/Communication_entity/entityfields/objecttype_param/valueProcess.js
deleted file mode 100644
index ba7bafab2a729e4ffb85684eb424dda2712c9bba..0000000000000000000000000000000000000000
--- a/entity/Communication_entity/entityfields/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Communication_lib");
-import("system.result");
-
-result.string(CommUtil.defaultObjectType());
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/db/onDBInsert.js b/entity/Communication_entity/recordcontainers/db/onDBInsert.js
index 5c22aad03c9231c62aa5d1f7f97b87f91edf4b0e..8af8b92b3df7892f9a02ba0f4a748bdaf9383470 100644
--- a/entity/Communication_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Communication_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
import("Communication_lib");
import("Workflow_lib");
import("system.logging");
@@ -10,12 +11,12 @@ import("Util_lib");
var rowdata = vars.get("$local.rowdata");
-var standard = new StandardObject("Communication", vars.get("$local.uid"), "Person", rowdata["COMMUNICATION.OBJECT_ROWID"])
+var standard = new StandardObject("Communication", vars.get("$local.uid"), rowdata["COMMUNICATION.OBJECT_TYPE"], rowdata["COMMUNICATION.OBJECT_ROWID"])
standard.onCommunicationInsert(rowdata["COMMUNICATION.MEDIUM_ID"]);
if(vars.exists("$context.PushDataPrivacyNotification")
&& !Utils.toBoolean(vars.get("$context.PushDataPrivacyNotification"))
- && rowdata["COMMUNICATION.OBJECT_TYPE"] === CommUtil.defaultObjectType())
+ && (rowdata["COMMUNICATION.OBJECT_TYPE"] === "Person" || rowdata["COMMUNICATION.OBJECT_TYPE"] === "Organisation"))
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.OBJECT_ROWID"], vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
@@ -40,7 +41,7 @@ if (vars.exists("$param.AdditionalContactIds_param") && vars.get("$param.Additio
util.getNewUUID(),
rowdata["COMMUNICATION.ADDR"],
contactId,
- CommUtil.defaultObjectType(),
+ ContactUtils.getContextByContactId(contactId),
rowdata["COMMUNICATION.MEDIUM_ID"],
rowdata["COMMUNICATION.ISSTANDARD"],
rowdata["COMMUNICATION.DATE_NEW"],
@@ -51,7 +52,7 @@ if (vars.exists("$param.AdditionalContactIds_param") && vars.get("$param.Additio
db.inserts(commInserts);
commInserts.forEach(function (row)
{
- new StandardObject("Communication", row[3][0], "Person", row[3][2])
+ new StandardObject("Communication", row[3][0], rowdata["COMMUNICATION.OBJECT_TYPE"], row[3][2])
.onCommunicationInsert(row[3][3]);
})
}
diff --git a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
index 674f9c1db922edfa14dca5593bfbe2a7a3d13188..fbdd5b78ee5ba2fed899588f303ad996da3fb4fb 100644
--- a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
@@ -9,13 +9,14 @@ var rowdata = vars.get("$local.rowdata");
if (rowdata["COMMUNICATION.OBJECT_ROWID"] != null)
{
- var standard = new StandardObject("Communication", vars.get("$local.uid"), "Person", rowdata["COMMUNICATION.OBJECT_ROWID"])
+ var standard = new StandardObject("Communication", vars.get("$local.uid"), rowdata["COMMUNICATION.OBJECT_TYPE"], rowdata["COMMUNICATION.OBJECT_ROWID"])
standard.onCommunicationUpdate(rowdata["COMMUNICATION.MEDIUM_ID"]);
}
if(vars.exists("$context.PushDataPrivacyNotification")
&& !Utils.toBoolean(vars.get("$context.PushDataPrivacyNotification"))
- && rowdata["COMMUNICATION.OBJECT_TYPE"] === CommUtil.defaultObjectType())
+ && (rowdata["COMMUNICATION.OBJECT_TYPE"] === "Organisation"
+ || rowdata["COMMUNICATION.OBJECT_TYPE"] === "Person"))
{
DataPrivacyUtils.notifyNeedDataPrivacyUpdate(rowdata["COMMUNICATION.OBJECT_ROWID"], vars.get("$param.ShowDsgvoMessage_param"));
vars.set("$context.PushDataPrivacyNotification", "true");
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 2a213495799d2b98b1d3ca7c2569eac79e2d911e..0ae9fbf3f0af9ec7aa0edd478cfc2171c23e022b 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -114,6 +114,10 @@
<name>ObjectRowId_param</name>
<valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/Contact_entity/entityfields/communications/children/objecttype_param/valueProcess.js b/entity/Contact_entity/entityfields/communications/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f9ce856291eecbfc58d555ab3bd31cf389e011a3
--- /dev/null
+++ b/entity/Contact_entity/entityfields/communications/children/objecttype_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Contact_lib")
+
+result.string(ContactUtils.getContextByPersOrg(vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID")));
\ No newline at end of file
diff --git a/entity/Contact_entity/recordcontainers/db/onDBDelete.js b/entity/Contact_entity/recordcontainers/db/onDBDelete.js
index dea6143a4c1da8648de07ce651ac1e8609d017eb..fdb6a383ada6740454d92c23f04c11a1caa1a325 100644
--- a/entity/Contact_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Contact_entity/recordcontainers/db/onDBDelete.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
import("Communication_lib");
import("Sql_lib");
import("Attribute_lib");
@@ -12,7 +13,7 @@ DuplicateScannerUtils.deleteHasDuplicateEntries("Organisation_entity", [contactI
new AttributeRelationQuery(contactId, null, "Person")
.deleteAllAttributes();
-newWhere("COMMUNICATION.OBJECT_ROWID", contactId).and("COMMUNICATION.OBJECT_TYPE", CommUtil.defaultObjectType()).deleteData();
+newWhere("COMMUNICATION.OBJECT_ROWID", contactId).and("COMMUNICATION.OBJECT_TYPE", ContactUtils.getContextByPersOrg(vars.get("$field.PERSON_ID"), vars.get("$field.ORGANISATION_ID"))).deleteData();
newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
newWhere("COMMRESTRICTION.CONTACT_ID", contactId).deleteData();
diff --git a/entity/Context_entity/entityfields/salesorderlinkeablet/children/blacklist_param/valueProcess.js b/entity/Context_entity/entityfields/salesorderlinkeablet/children/blacklist_param/valueProcess.js
deleted file mode 100644
index 1322527cbbdb3bdc8b39b9b566f8c82dc67b33e9..0000000000000000000000000000000000000000
--- a/entity/Context_entity/entityfields/salesorderlinkeablet/children/blacklist_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object(["Salesproject", "Salesorder"]);
\ No newline at end of file
diff --git a/entity/DistrictChangeField_entity/DistrictChangeField_entity.aod b/entity/DistrictChangeField_entity/DistrictChangeField_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1fec39e5d5d5bf3e2dd4729f47e4ed31d8071f6f
--- /dev/null
+++ b/entity/DistrictChangeField_entity/DistrictChangeField_entity.aod
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
+ <name>DistrictChangeField_entity</name>
+ <title>Serial action</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/DistrictChangeField_entity/documentation.adoc</documentation>
+ <siblings>
+ <element>District_entity</element>
+ </siblings>
+ <recordContainer>jDito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>PARENTDISTRICT_DISTRICTID</name>
+ <title>{$DISTRICT_PARENT_DISTRICT}</title>
+ <consumer>ParentDistricts</consumer>
+ <stateProcess>%aditoprj%/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DISTRICT_AUTOADD</name>
+ <title>Auto assignment</title>
+ <contentType>BOOLEAN</contentType>
+ <stateProcess>%aditoprj%/entity/DistrictChangeField_entity/entityfields/district_autoadd/stateProcess.js</stateProcess>
+ </entityField>
+ <entityParameter>
+ <name>Field_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityConsumer>
+ <name>ParentDistricts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>District_entity</entityName>
+ <fieldName>ValidParentDistricts</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedDistrictIds_param</name>
+ <valueProcess>%aditoprj%/entity/DistrictChangeField_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>Ids_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jDito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <onInsert>%aditoprj%/entity/DistrictChangeField_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DistrictChangeField_entity/documentation.adoc b/entity/DistrictChangeField_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..c63f3bc5babe1e043230837823e4fe0292d5bb6a
--- /dev/null
+++ b/entity/DistrictChangeField_entity/documentation.adoc
@@ -0,0 +1,18 @@
+= DistrictChangeField_entity
+
+== Overview
+
+Serial action entity to update specific fields of the District_entity at once.
+
+== Relation to other entities
+
+Used to update multiple rows of the District_entity at once.
+
+== Best Practice
+
+== FAQ
+
+How to update a new field:
+- Add a constant in the District_lib.
+- Add the field to this entity.
+- Fill in the corresponding entityfield processes (stateProcess, mandatoryProcess, etc..).
diff --git a/entity/DistrictChangeField_entity/entityfields/district_autoadd/stateProcess.js b/entity/DistrictChangeField_entity/entityfields/district_autoadd/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c272032fd4cc55d433efe06375848393c7476f5
--- /dev/null
+++ b/entity/DistrictChangeField_entity/entityfields/district_autoadd/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("District_lib");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if(vars.get("$param.Field_param") == DistrictChangeField.autoadd())
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+result.string(state);
diff --git a/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/displayValueProcess.js b/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..af36b01bff21f1b99573a67d243558792c534607
--- /dev/null
+++ b/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("Context_lib");
+
+result.string(ContextUtils.loadContentTitle("District_entity", vars.get("$this.value")));
diff --git a/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/stateProcess.js b/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..82b5b85f3b06b1bc3b4dd85c92ec267f5acf6a64
--- /dev/null
+++ b/entity/DistrictChangeField_entity/entityfields/parentdistrict_districtid/stateProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("District_lib");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if(vars.get("$param.Field_param") == DistrictChangeField.parent())
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+result.string(state);
diff --git a/entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js b/entity/DistrictChangeField_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
similarity index 52%
rename from entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js
rename to entity/DistrictChangeField_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
index 16c85500b5355a72548030867e3d300661e9d4aa..1e51a2584f8f4106a4a2f7c60eaba629b7d11f03 100644
--- a/entity/QuickEntry_entity/entityfields/supporttickets/children/taskrequestorcontactid_param/valueProcess.js
+++ b/entity/DistrictChangeField_entity/entityfields/parentdistricts/children/excludeddistrictids_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
import("system.result");
+import("system.vars");
-result.string(vars.get("$field.UID"));
\ No newline at end of file
+result.string(vars.get("$param.Ids_param"));
diff --git a/entity/DistrictChangeField_entity/recordcontainers/jdito/onInsert.js b/entity/DistrictChangeField_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e1b31ed479dc53ea50ae73fee146728c8841220
--- /dev/null
+++ b/entity/DistrictChangeField_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,15 @@
+import("system.vars");
+import("system.entities");
+import("Sql_lib");
+
+var ids = JSON.parse(vars.get("$param.Ids_param"));
+var field = vars.get("$param.Field_param");
+
+var data = {}; // TODO: use ES6 'ComputedPropertyName'
+data[field] = vars.get("$field." + field);
+
+newWhere("DISTRICT.DISTRICTID", ids, SqlBuilder.IN()).updateFields(data);
+// invalidate the District db recordContainer cache,
+// needed since we dont use write entity
+// and thus the cache doesnt get refreshed automatically
+entities.invalidateCache("District_entity", "db");
diff --git a/entity/DistrictChangeValidityDates_entity/onValidation.js b/entity/DistrictChangeValidityDates_entity/onValidation.js
index 11ff32f6ed97d0f204bf0bc4c368bf38317aa0c3..ece25072947b140d07ecb0a771aa190cef9cebef 100644
--- a/entity/DistrictChangeValidityDates_entity/onValidation.js
+++ b/entity/DistrictChangeValidityDates_entity/onValidation.js
@@ -1,8 +1,9 @@
+import("system.translate");
import("system.result");
import("system.vars");
var count = vars.get("$field.count");
if(count == 0)
{
- result.string("No Datasets selected");
+ result.string(translate.text("No Datasets selected"));
}
\ No newline at end of file
diff --git a/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js b/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js
index 1ba1dceffbacbc53b63b0fe55412dd2b9d4f2da2..756059093ddcae5d7471939e45d69125a8dd843e 100644
--- a/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js
+++ b/entity/DistrictContact_entity/entityfields/filterviewactiongroup/children/changevalidity/onActionProcess.js
@@ -8,7 +8,7 @@ import("system.vars");
var districtContactIds;
var currentContext = ContextUtils.getCurrentContextId();
-if (vars.get("$sys.selection").length > 0)
+if (vars.get("$sys.selection") && vars.get("$sys.selection").length > 0)
{
districtContactIds = vars.get("$sys.selection");
}
diff --git a/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
index cd35681842d8c289c2ee2ba1c460101807f63719..6b5b6a7e8f88fd46f3b264475fbd64db26ce8364 100644
--- a/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
+++ b/entity/DistrictContact_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
@@ -6,6 +6,6 @@ import("Sql_lib");
if (vars.get("$sys.presentationmode") != neon.CONTEXT_PRESENTATIONMODE_FILTER)
{
- var excludedIds = $KeywordRegistry.contactStatus$inReview();
+ var excludedIds = [$KeywordRegistry.contactStatus$inReview(), $KeywordRegistry.contactStatus$markToDelete()];
result.string(JSON.stringify(excludedIds));
}
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js b/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js
index e8e04e223262820933a9e8ee95ed98788acc7c18..a57e172e388ba75755553f08aca66c1ad47b09bc 100644
--- a/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js
+++ b/entity/DistrictResponsible_entity/entityfields/adviserstates/children/blacklistids_param/valueProcess.js
@@ -1,5 +1,5 @@
import("system.result");
import("KeywordRegistry_basic");
-var excludedIds = [$KeywordRegistry.contactStatus$inReview()];
+var excludedIds = [$KeywordRegistry.contactStatus$inReview(), $KeywordRegistry.contactStatus$markToDelete()];
result.string(JSON.stringify(excludedIds));
\ No newline at end of file
diff --git a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
index ce31b16dbba0412075b7f8f2d5376fe163ed868a..533e32edbd0fcc36cbb7b030015af30272659c01 100644
--- a/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
+++ b/entity/DistrictResponsible_entity/recordcontainers/db/recordfieldmappings/phone.value/expression.js
@@ -1,3 +1,5 @@
+import("system.vars");
+import("Contact_lib");
import("system.result");
import("Communication_lib");
diff --git a/entity/District_entity/District_entity.aod b/entity/District_entity/District_entity.aod
index d55ee865239d02f2a41998c96309f43819488a7e..d91597148d82a93f21055fc4a22c09bcf0143aa1 100644
--- a/entity/District_entity/District_entity.aod
+++ b/entity/District_entity/District_entity.aod
@@ -5,6 +5,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/District_entity/documentation.adoc</documentation>
<icon>VAADIN:GLOBE</icon>
+ <siblings>
+ <element>DistrictChangeField_entity</element>
+ </siblings>
<grantDelete v="true" />
<grantDeleteProcess>%aditoprj%/entity/District_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/District_entity/contentTitleProcess.js</contentTitleProcess>
@@ -265,6 +268,18 @@
<onActionProcess>%aditoprj%/entity/District_entity/entityfields/actiongroup/children/assignallactivedistricts/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
</entityActionField>
+ <entityActionField>
+ <name>setAutoAssignment</name>
+ <title>Set auto assignment</title>
+ <onActionProcess>%aditoprj%/entity/District_entity/entityfields/actiongroup/children/setautoassignment/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ </entityActionField>
+ <entityActionField>
+ <name>setParentDistrict</name>
+ <title>Set parent district</title>
+ <onActionProcess>%aditoprj%/entity/District_entity/entityfields/actiongroup/children/setparentdistrict/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ </entityActionField>
</children>
</entityActionGroup>
<entityProvider>
diff --git a/entity/District_entity/entityfields/actiongroup/children/setautoassignment/onActionProcess.js b/entity/District_entity/entityfields/actiongroup/children/setautoassignment/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff2b90597992bd69703ab199ae40acd749146de0
--- /dev/null
+++ b/entity/District_entity/entityfields/actiongroup/children/setautoassignment/onActionProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.neonFilter");
+import("system.vars");
+import("District_lib");
+
+neon.openContextWithRecipe("DistrictChangeField", null,
+ neonFilter.createEntityRecordsRecipeBuilder().parameters({
+ Ids_param: JSON.stringify(vars.get("$sys.selection")),
+ Field_param: DistrictChangeField.autoadd()
+ }), neon.OPERATINGSTATE_NEW);
diff --git a/entity/District_entity/entityfields/actiongroup/children/setparentdistrict/onActionProcess.js b/entity/District_entity/entityfields/actiongroup/children/setparentdistrict/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d6e37260b01ae757d68dbfda06d68d400d9c995
--- /dev/null
+++ b/entity/District_entity/entityfields/actiongroup/children/setparentdistrict/onActionProcess.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("system.neonFilter");
+import("system.vars");
+import("District_lib");
+
+neon.openContextWithRecipe("DistrictChangeField", null,
+ neonFilter.createEntityRecordsRecipeBuilder().parameters({
+ Ids_param: JSON.stringify(vars.get("$sys.selection")),
+ Field_param: DistrictChangeField.parent()
+ }), neon.OPERATINGSTATE_NEW);
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
index 664501b0a72d2311cda8a0c0f435b5a9cdf2c087..410591c8047c2b4a82f31f24f8f37697bdb924ee 100644
--- a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
@@ -1,3 +1,3 @@
import("system.result");
-result.object(["SupportTicket","Person", "Organisation", "Offer", "MarketingWorkflowLauncher", "Advertising"]);
\ No newline at end of file
+result.object(["SupportTicket","Person", "Organisation", "Offer", "Advertising"]);
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 28282a213de8c608abf44e08dfff6c21ca0ed590..83929ce1e780a18979c94cd5716189833be06e38 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -273,7 +273,6 @@
<entityConsumer>
<name>DocumentTemplatePlaceOfUse</name>
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/stateProcess.js</stateProcess>
- <onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/onValidation.js</onValidation>
<dependency>
<name>dependency</name>
<entityName>DocumentTemplatePlaceOfUse_entity</entityName>
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/mandatoryProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/mandatoryProcess.js
index 1e11aa4b73da895b54394e7f285fb7b764ba4d45..8c477a892b4c4c5e81b84c2da1521727fdc0ac5a 100644
--- a/entity/DocumentTemplate_entity/entityfields/classification/mandatoryProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/classification/mandatoryProcess.js
@@ -3,4 +3,5 @@ import("system.vars");
import("system.result");
result.object(vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$attachment()
- && vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$signature());
\ No newline at end of file
+ && vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$signature()
+ && (vars.get("$field.KIND") != $KeywordRegistry.documentTemplateType$download()));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
index 6fcf14fa75d5ac836bd68df2ee8fed4bbc6835ae..21886f62d11471181e830471fc4dc5d9e4dcecb1 100644
--- a/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js
@@ -5,6 +5,7 @@ import("system.result");
import("system.neon");
if((vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$attachment()
+ || (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$download())
|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$signature()
|| vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$replymail())
|| (vars.get("$field.KIND") == $KeywordRegistry.documentTemplateType$letter()
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/onValidation.js b/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/onValidation.js
deleted file mode 100644
index a40be7eb7d8e21b088a3cf4683b41849239e35ee..0000000000000000000000000000000000000000
--- a/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/onValidation.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Entity_lib");
-
-var usages = EntityConsumerRowsHelper.getCurrentConsumerRows("DocumentTemplatePlaceOfUse", ["PLACEOFUSE"]);
-var hasMarketingWorkflowUsage = usages.some(function (usage)
-{
- return usage["PLACEOFUSE"] == "MarketingWorkflowLauncher";
-});
-if (hasMarketingWorkflowUsage && !vars.get("$field.Content").includes("{@workflowActionLink@}"))
-{
- result.string(translate.text("The template must contain the placeholder for the worklow-link to use it with the marketing workflow"));
-}
diff --git a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js
deleted file mode 100644
index 95bb87fdb7da82091fea21a32071d38935f6f94c..0000000000000000000000000000000000000000
--- a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/onActionProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.neonFilter");
-import("system.logging");
-import("system.vars");
-import("DocumentTemplate_lib");
-import("system.neon");
-
-var recipe = neonFilter.createEntityRecordsRecipeBuilder().uidsIncludelist([vars.get("$field.DOCUMENTTEMPLATEID")]).toString();
-neon.openContextWithRecipe("DocumentTemplate", "DocumentTemplateHtmlEdit_view", recipe, neon.OPERATINGSTATE_EDIT);
diff --git a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js b/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js
deleted file mode 100644
index 718a96109027807c05614a94925ff71302ec524c..0000000000000000000000000000000000000000
--- a/entity/DocumentTemplate_entity/entityfields/openhtmleditor/stateProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("KeywordRegistry_basic");
-import("system.result");
-import("system.vars");
-import("DocumentTemplate_lib");
-import("system.neon");
-
-var template = DocumentTemplateUtils.getTemplate(vars.get("$field.DOCUMENTTEMPLATEID"), false);
-var kind = vars.get("$field.KIND");
-
-if (template)
-{
- if(template.type == DocumentTemplate.types.HTML &&
- kind == $KeywordRegistry.documentTemplateType$textModular() ||
- kind == $KeywordRegistry.documentTemplateType$mail())
- {
- result.string(neon.COMPONENTSTATE_EDITABLE);
- }
-}
diff --git a/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod b/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod
index e395e37ec6c1f4cc81394011b1962de7700eebd6..8e71c5aa25be1a8748d011b85415f5efe9da95ed 100644
--- a/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod
+++ b/entity/EmailFilterHandlingSetWorkflow_entity/EmailFilterHandlingSetWorkflow_entity.aod
@@ -30,20 +30,17 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
- <entityParameter>
- <name>Selection_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Filter_param</name>
- <expose v="true" />
- </entityParameter>
<entityActionField>
<name>SetWorkflow</name>
<title>Set workflow</title>
<onActionProcess>%aditoprj%/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/setworkflow/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:AUTOMATION</iconId>
<tooltipProcess>%aditoprj%/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/setworkflow/tooltipProcess.js</tooltipProcess>
</entityActionField>
+ <entityParameter>
+ <name>RecordsRecipe_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<datalessRecordContainer>
diff --git a/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/emailfilterhandling_ids/valueProcess.js b/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/emailfilterhandling_ids/valueProcess.js
index 3e11a5f4ad618b1476e572870a2eeb6b60380aee..7b03969847eb3c2262da852414f874e53b0711a0 100644
--- a/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/emailfilterhandling_ids/valueProcess.js
+++ b/entity/EmailFilterHandlingSetWorkflow_entity/entityfields/emailfilterhandling_ids/valueProcess.js
@@ -1,15 +1,14 @@
-import("Util_lib");
-import("FilterViewAction_lib");
import("system.result");
import("system.vars");
+import("system.entities");
-var emailFilterHandlingIds = [];
-
-var selection = Utils.parseJSON(vars.get("$param.Selection_param"));
-var filter = vars.get("$param.Filter_param");
-var context = "EmailFilterHandling";
-
-emailFilterHandlingIds = FilterViewActionUtils.getUidsBySelectionOrFilter(context, selection, filter);
+var loadConfig = entities.createConfigForLoadingRows()
+ .fromEntityRecordsRecipe(vars.get("$param.RecordsRecipe_param"))
+ .fields(["#UID"]);
+var emailFilterHandlingIds = entities.getRows(loadConfig).map(function (row)
+{
+ return row["#UID"];
+});
result.string(JSON.stringify(emailFilterHandlingIds));
\ No newline at end of file
diff --git a/entity/EmailFilterHandling_entity/EmailFilterHandling_entity.aod b/entity/EmailFilterHandling_entity/EmailFilterHandling_entity.aod
index c19d078351c9e6797a7dfd3e210001eae9021dc9..53f1200d7116fa19d98f4d3812371c82c7c8fca5 100644
--- a/entity/EmailFilterHandling_entity/EmailFilterHandling_entity.aod
+++ b/entity/EmailFilterHandling_entity/EmailFilterHandling_entity.aod
@@ -5,6 +5,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/EmailFilterHandling_entity/documentation.adoc</documentation>
<iconId>VAADIN:INBOX</iconId>
+ <recordsRecipeSupported v="true" />
<titlePlural>Email Filter</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
@@ -123,6 +124,7 @@
<title>Set workflow</title>
<onActionProcess>%aditoprj%/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/onActionProcess.js</onActionProcess>
<iconId>VAADIN:PLAY</iconId>
+ <stateProcess>%aditoprj%/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
diff --git a/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/increasepriority/stateProcess.js b/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/increasepriority/stateProcess.js
index feaf9fc2c6832f235d8f3425eb23854ebccb34f3..ccc413c432dc982e5e33bf5f00dc68328e1f98b3 100644
--- a/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/increasepriority/stateProcess.js
+++ b/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/increasepriority/stateProcess.js
@@ -5,12 +5,13 @@ import("system.neon");
var priority = parseInt(vars.get("$field.PRIORITY"));
-
-if (priority != 1)
+if (vars.get("$sys.selectionsRecordsRecipe") && priority > 1)
{
+
result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
+
result.string(neon.COMPONENTSTATE_DISABLED);
}
\ No newline at end of file
diff --git a/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/onActionProcess.js b/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/onActionProcess.js
index 535c3584bb352512b843f264d4ddcc40b700f16b..973fbf9adccfed92dab5e9f393059ed7945b1176 100644
--- a/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/onActionProcess.js
+++ b/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/onActionProcess.js
@@ -2,11 +2,9 @@ import("system.neonFilter");
import("system.vars");
import("system.neon");
-var selection = JSON.stringify(vars.get("$sys.selection"));
-var filter = JSON.stringify(vars.get("$sys.filter"));
+var recordsRecipe = vars.get("$sys.selectionsRecordsRecipe")
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
- "Selection_param": selection,
- "Filter_param": filter
+ "RecordsRecipe_param": recordsRecipe
}).toString();
neon.openContextWithRecipe("EmailFilterHandlingSetWorkflow", "EmailFilterHandlingSetWorkflowEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
diff --git a/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/stateProcess.js b/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..221f0d1a3171a6a9ac80e629edb140fa8c78d884
--- /dev/null
+++ b/entity/EmailFilterHandling_entity/entityfields/filterviewactiongroup/children/setworkflow/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+if(vars.get("$sys.selectionsRecordsRecipe"))
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_DISABLED);
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
index 29bbc97d4b53dc1fd5470f0b7f70c944417fe838..a91cccbcc302c8aa4605b6feb90573b10f3d21b3 100644
--- a/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
+++ b/entity/EmployeeGroupContactRelation_entity/EmployeeGroupContactRelation_entity.aod
@@ -71,6 +71,24 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupContactRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -102,6 +120,22 @@
<recordfield>EMPLOYEEGROUP_CONTACT_RELATION.EMPLOYEEGROUP_ID</recordfield>
<isLookupFilter v="true" />
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_CONTACT_RELATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_CONTACT_RELATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_CONTACT_RELATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_CONTACT_RELATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js b/entity/EmployeeGroupContactRelation_entity/entityfields/date_edit/valueProcess.js
similarity index 65%
rename from entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js
rename to entity/EmployeeGroupContactRelation_entity/entityfields/date_edit/valueProcess.js
index 688912b6eb834a02c9d13067b823f8a32929797a..2af46a8e46789056c6c341a8e4e087f8e1edc0c4 100644
--- a/entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js
+++ b/entity/EmployeeGroupContactRelation_entity/entityfields/date_edit/valueProcess.js
@@ -1,8 +1,8 @@
+import("system.result");
import("system.neon");
import("system.vars");
-import("system.result");
-if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/date/valueProcess.js b/entity/EmployeeGroupContactRelation_entity/entityfields/date_new/valueProcess.js
similarity index 100%
rename from entity/EmployeeGroup_entity/entityfields/date/valueProcess.js
rename to entity/EmployeeGroupContactRelation_entity/entityfields/date_new/valueProcess.js
diff --git a/entity/EmployeeGroupContactRelation_entity/entityfields/user_edit/valueProcess.js b/entity/EmployeeGroupContactRelation_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupContactRelation_entity/entityfields/user_new/valueProcess.js b/entity/EmployeeGroupContactRelation_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/EmployeeGroupContactRelation_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/EmployeeGroupRuleGroupRelation_entity.aod b/entity/EmployeeGroupRuleGroupRelation_entity/EmployeeGroupRuleGroupRelation_entity.aod
index 032e43988fcd22bb8221a5c9a3abdbb44692f319..9e50a6dabeb63ed49f42e7aa9867e2a7ae4b628a 100644
--- a/entity/EmployeeGroupRuleGroupRelation_entity/EmployeeGroupRuleGroupRelation_entity.aod
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/EmployeeGroupRuleGroupRelation_entity.aod
@@ -50,6 +50,24 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -69,6 +87,22 @@
<name>EMPLOYEEGROUP_RULEGROUP_RELATIONID.value</name>
<recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.EMPLOYEEGROUP_RULEGROUP_RELATIONID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP_RELATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_edit/valueProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_new/valueProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_edit/valueProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_new/valueProcess.js b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroupRelation_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
index 2d96b5aaf88b57df50d9a2aa00d84db3d68502d4..19c69d6d54acb2c18471767ab08b70140b70fb7e 100644
--- a/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
+++ b/entity/EmployeeGroupRuleGroup_entity/EmployeeGroupRuleGroup_entity.aod
@@ -16,10 +16,11 @@
<name>EMPLOYEEGROUP_RULEGROUPID</name>
</entityField>
<entityField>
- <name>DATE</name>
+ <name>DATE_NEW</name>
<title>Date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>STATE</name>
@@ -69,6 +70,19 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -76,8 +90,8 @@
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
- <name>DATE.value</name>
- <recordfield>EMPLOYEEGROUP_RULEGROUP.DATE</recordfield>
+ <name>DATE_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NAME.value</name>
@@ -97,6 +111,18 @@
<name>STATE.displayValue</name>
<expression>%aditoprj%/entity/EmployeeGroupRuleGroup_entity/recordcontainers/db/recordfieldmappings/state.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_RULEGROUP.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/date_edit/valueProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/date_new/valueProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/user_edit/valueProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRuleGroup_entity/entityfields/user_new/valueProcess.js b/entity/EmployeeGroupRuleGroup_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/EmployeeGroupRuleGroup_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod b/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
index f53e3460a1c2478956099f11a8bb0c2109c89f9d..c203996b512d225069370ac0944355311361056f 100644
--- a/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
+++ b/entity/EmployeeGroupRule_entity/EmployeeGroupRule_entity.aod
@@ -42,6 +42,24 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRule_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRule_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRule_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroupRule_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -65,6 +83,22 @@
<name>NAME.value</name>
<recordfield>EMPLOYEEGROUP_RULE.NAME</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_RULE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_RULE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP_RULE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP_RULE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/EmployeeGroupRule_entity/entityfields/date_edit/valueProcess.js b/entity/EmployeeGroupRule_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/entityfields/date_new/valueProcess.js b/entity/EmployeeGroupRule_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/entityfields/user_edit/valueProcess.js b/entity/EmployeeGroupRule_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroupRule_entity/entityfields/user_new/valueProcess.js b/entity/EmployeeGroupRule_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/EmployeeGroupRule_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
index da7a223f92849ab3bb95a659ecd53f8f30845bd7..6a0ce98b05da425a642bf31cbc43abfc4b0add37 100644
--- a/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
+++ b/entity/EmployeeGroup_entity/EmployeeGroup_entity.aod
@@ -55,12 +55,11 @@
</children>
</entityConsumer>
<entityField>
- <name>DATE</name>
+ <name>DATE_NEW</name>
<title>Date</title>
<contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/date/valueProcess.js</valueProcess>
+ <state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>EmployeesForGroup</name>
@@ -98,6 +97,19 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/EmployeeGroup_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -126,8 +138,20 @@
<expression>%aditoprj%/entity/EmployeeGroup_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>DATE.value</name>
- <recordfield>EMPLOYEEGROUP.DATE</recordfield>
+ <name>DATE_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EMPLOYEEGROUP.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EMPLOYEEGROUP.USER_NEW</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
diff --git a/entity/EmployeeGroup_entity/entityfields/date_edit/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/date_new/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/user_edit/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/EmployeeGroup_entity/entityfields/user_new/valueProcess.js b/entity/EmployeeGroup_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/EmployeeGroup_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/Employee_entity/recordcontainers/jdito/onDelete.js b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
index 24ad2b0487705801548cc6654fe9a82e0bdb4322..876381fb501a07aef95ed8946195bd1593c012a4 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onDelete.js
@@ -5,14 +5,60 @@ import("system.neon");
import("system.vars");
import("system.tools");
import("Employee_lib");
+import("system.tag");
//the current user should not delete himself
if (EmployeeUtils.getCurrentUserName() != vars.get("$field.TITLE") && !EmployeeUtils.hasRelations(vars.get("$field.CONTACT_ID")))
{
- tools.deleteUser(vars.get("$field.TITLE"));
-
- new AttributeRelationQuery(EmployeeUtils.sliceUserId(vars.get("$field.UID")), null, ContextUtils.getCurrentContextId())
- .deleteAllAttributes();
+ var targetUserTitle = vars.get("$field.TITLE");
+ if (targetUserTitle)
+ {
+ untagAllPrivateTaggedObjects(targetUserTitle);
+ tools.deleteUser(targetUserTitle);
+
+ new AttributeRelationQuery(EmployeeUtils.sliceUserId(vars.get("$field.UID")), null, ContextUtils.getCurrentContextId())
+ .deleteAllAttributes();
- WorkflowSignalSender.deleted();
+ WorkflowSignalSender.deleted();
+ }
+}
+
+/*
+ * Untags all private tagged objects (default favorites and favorite groups) of the provided user.
+ */
+function untagAllPrivateTaggedObjects(pTargetUserTitle)
+{
+ var privateTags = [];
+ var targetUser = tools.getUser([pTargetUserTitle], tools.PROFILE_DEFAULT);
+
+ var config = tag.createGetTaggedObjectsConfig();
+ config.setUserId(targetUser.name);
+
+ // get all objects tagged as default favorite
+ config.setTagType(tag.DEFAULT_FAVORITE_GROUP);
+ privateTags = privateTags.concat(getAllTaggedObjectIds(config));
+
+ // get all objects tagged as favorite group
+ config.setTagType(tag.FAVORITE_GROUP);
+ privateTags = privateTags.concat(getAllTaggedObjectIds(config));
+
+ // untag all private tags
+ config = tag.createUntagMultipleByIdConfig();
+ config.setTaggedObjectsRecordIds(privateTags);
+ tag.untag(config);
+}
+
+/*
+ * Returns an array containing all ids of private tagged objects (ID of ASYS_RECORD).
+ */
+function getAllTaggedObjectIds(pConfig)
+{
+ var allTaggedObjectIds = [];
+
+ tag.getTaggedObjects(pConfig).forEach(function(taggedObject) {
+ if (taggedObject.id)
+ allTaggedObjectIds.push(taggedObject.id);
+ });
+
+ return allTaggedObjectIds;
}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
index 657050d20ec94a04c0eff6c74a61d1c7e04bb17e..0b07d9c4f2dee35bdee85f29ad4d896927dcc7e4 100644
--- a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -97,7 +97,6 @@
<title>Place of Use</title>
<consumer>ExportTemplatePlacesOfUse</consumer>
<mandatory v="true" />
- <onValueChange>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplateplaceofuse_id/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>placeOfUse</name>
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc b/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc
deleted file mode 100644
index 7ff3082082e4138fb3e2b25da143e3099646eb9e..0000000000000000000000000000000000000000
--- a/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc
+++ /dev/null
@@ -1,9 +0,0 @@
-= ExportTemplate_entity
-
-Entity to store all the ExportTemplates.
-Exporttemplates are used to give the user an easy way to export Data from an table.
-
-linked via the ExportTemplateId to:
--ExportTemplateField_entity to make it possible to store multiple fields for one template
--ExportTemplatePlaceOfUse_entity to make it possible to store multiple places of usage for one template
--ExportTemplateSelection_entity entity for the selection of the template
\ No newline at end of file
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
index d56cb3894f86ae4685f92c30e4c0b8fc960bab69..3ef61931f62ff67cee90be6f63d99ba300de0d96 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.tag");
import("system.translate");
import("system.project");
import("system.logging");
@@ -16,8 +17,8 @@ if(vars.get("$local.idvalues") && vars.get("$local.idvalues").length != 0)
var seekedByCore = vars.get("$local.idvalues");
var seekedByCoreFavos = [];
- var config = favorite.createGetFavoriteByIdConfig().setIds(seekedByCore);
- seekedByCoreFavos = buildFavoritesForDeletion(favorite.getFavorites(config));
+ var config = tag.createGetTaggedObjectByIdConfig().setIds(seekedByCore);
+ seekedByCoreFavos = buildFavoritesForDeletion(tag.getTaggedObjects(config));
result.object(seekedByCoreFavos);
}
@@ -45,7 +46,7 @@ else
* load all contexts and all favorites
*/
var allContexts = getAllFavoriteEnabledContexts();
- var allFavorites = favorite.getFavorites(favorite.createGetFavoritesConfig().setUserId(tools.getCurrentUser()[tools.NAME]));
+ var allFavorites = tag.getTaggedObjects(tag.createGetTaggedObjectsConfig().setUserId(tools.getCurrentUser()[tools.NAME]));
/*
* complete-load (in buildFavorites) favorites by one context at a time
@@ -174,20 +175,20 @@ function getFavoriteWith(loadedRow, builtFavos, favoriten, pRowid, objecttype)
if(favoriten[b]["rowid"].equals(pRowid))
{
- var groupid = favoriten[b]["group"]["groupid"];
- var grouptitle = favoriten[b]["group"]["grouptitle"];
- var grouptype = favoriten[b]["group"]["grouptype"];
+ var tagid = favoriten[b]["tag"]["tagid"];
+ var tagtitle = favoriten[b]["tag"]["tagtitle"];
+ var tagtype = favoriten[b]["tag"]["tagtype"];
var image = loadedRow["#IMAGE"];
var rowid = favoriten[b]["rowid"];
var title = loadedRow["#CONTENTTITLE"];
var description = loadedRow["#CONTENTDESCRIPTION"];
var id = favoriten[b]["id"];
- var user = favoriten[b]["group"]["groupuser"];
+ var user = favoriten[b]["tag"]["taguser"];
builtFavos.push([
- groupid,
- grouptitle,
- grouptype,
+ tagid,
+ tagtitle,
+ tagtype,
objecttype,
image,
rowid,
@@ -226,21 +227,21 @@ function buildFavoritesForDeletion(favos)
for(i = 0; i < favos.length; i++)
{
- var groupid = favos[i]["group"]["groupid"];
- var grouptitle = favos[i]["group"]["grouptitle"];
- var grouptype = favos[i]["group"]["grouptype"];
+ var tagid = favos[i]["tag"]["tagid"];
+ var tagtitle = favos[i]["tag"]["tagtitle"];
+ var tagtype = favos[i]["tag"]["tagtype"];
var objecttype = favos[i]["objecttype"];
var image = "";
var rowid = favos[i]["rowid"];
var title = "";
var description = "";
var id = favos[i]["id"];
- var user = favos[i]["group"]["groupuser"];
+ var user = favos[i]["tag"]["taguser"];
results.push([
- groupid,
- grouptitle,
- grouptype,
+ tagid,
+ tagtitle,
+ tagtype,
objecttype,
image,
rowid,
diff --git a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
index 70ac8f02ca1518b3ce375c2f4c5901d08d2c1d4f..9fe0434086d41cf2e95618911ba8d0f003b6fd89 100644
--- a/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
+++ b/entity/Favorite_entity/recordcontainers/jditorecordcontainer/onDelete.js
@@ -1,5 +1,5 @@
+import("system.tag");
import("system.vars");
-import("system.favorite");
var selected = vars.get("$local.uid");
-favorite.remove(favorite.createRemoveMultipleByIdConfig().setFavoriteRecordIds([selected]));
\ No newline at end of file
+tag.untag(tag.createUntagMultipleByIdConfig().setFavoriteRecordIds([selected]));
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod b/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
index bf862f146661c7997f952d398ddf0b1060464017..970c97f35acd4ce381663e63242101229ac025f3 100644
--- a/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
+++ b/entity/InboxEmployeegroupRelation_entity/InboxEmployeegroupRelation_entity.aod
@@ -71,6 +71,24 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/InboxEmployeegroupRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -108,6 +126,22 @@
<name>INBOX_ID.value</name>
<recordfield>INBOX_EMPLOYEEGROUP_RELATION.INBOX_ID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>INBOX_EMPLOYEEGROUP_RELATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>INBOX_EMPLOYEEGROUP_RELATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>INBOX_EMPLOYEEGROUP_RELATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>INBOX_EMPLOYEEGROUP_RELATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/date_edit/valueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/date_new/valueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/user_edit/valueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InboxEmployeegroupRelation_entity/entityfields/user_new/valueProcess.js b/entity/InboxEmployeegroupRelation_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/InboxEmployeegroupRelation_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod b/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
index bc52ff958a5b667ab02683c038b38a9e23ab1619..6b47f1c324f6806d932b25f29f524bf3771c91c5 100644
--- a/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
+++ b/entity/InboxFilterGroupRelation_entity/InboxFilterGroupRelation_entity.aod
@@ -59,6 +59,24 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroupRelation_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -81,6 +99,22 @@
<dbRecordFieldMapping>
<name>INBOXFILTERGROUP_ID.displayValue</name>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>INBOXFILTERGROUP_RELATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>INBOXFILTERGROUP_RELATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>INBOXFILTERGROUP_RELATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>INBOXFILTERGROUP_RELATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/date_edit/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/date_new/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/user_edit/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroupRelation_entity/entityfields/user_new/valueProcess.js b/entity/InboxFilterGroupRelation_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/InboxFilterGroupRelation_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
index e5c6a604f7c1fc270baf9f25ad5de3bd3df6b99f..400aa32baecc9022559f558df4819c2cb44474f8 100644
--- a/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
+++ b/entity/InboxFilterGroup_entity/InboxFilterGroup_entity.aod
@@ -29,12 +29,11 @@
<onValidation>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/name/onValidation.js</onValidation>
</entityField>
<entityField>
- <name>DATE</name>
+ <name>DATE_NEW</name>
<title>Date</title>
<contentType>DATE</contentType>
- <resolution>DAY</resolution>
<stateProcess></stateProcess>
- <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/date/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
<name>InboxFilters</name>
@@ -99,6 +98,19 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/InboxFilterGroup_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -107,8 +119,8 @@
<alias>Data_alias</alias>
<recordFieldMappings>
<dbRecordFieldMapping>
- <name>DATE.value</name>
- <recordfield>INBOXFILTERGROUP.DATE</recordfield>
+ <name>DATE_NEW.value</name>
+ <recordfield>INBOXFILTERGROUP.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INBOXFILTERGROUPID.value</name>
@@ -126,6 +138,18 @@
<name>PRIORITY.value</name>
<recordfield>INBOXFILTERGROUP.PRIORITY</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>INBOXFILTERGROUP.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>INBOXFILTERGROUP.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>INBOXFILTERGROUP.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/InboxFilterGroup_entity/entityfields/date_edit/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/date_new/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/user_edit/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilterGroup_entity/entityfields/user_new/valueProcess.js b/entity/InboxFilterGroup_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/InboxFilterGroup_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/InboxFilter_entity.aod b/entity/InboxFilter_entity/InboxFilter_entity.aod
index cdd385f811b6ce55210bff0e99dc1e7f89cc28f7..802a6ae4da1189177cfe1efb1ad5ee3af7b77242 100644
--- a/entity/InboxFilter_entity/InboxFilter_entity.aod
+++ b/entity/InboxFilter_entity/InboxFilter_entity.aod
@@ -69,6 +69,25 @@
<fieldName>SupportTicketTemplates</fieldName>
</dependency>
</entityConsumer>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <tooltip></tooltip>
+ <valueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/InboxFilter_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -101,6 +120,22 @@
<name>TICKETTEMPLATE_ID.value</name>
<recordfield>INBOXFILTER.TICKETTEMPLATE_ID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>INBOXFILTER.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>INBOXFILTER.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>INBOXFILTER.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>INBOXFILTER.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/InboxFilter_entity/entityfields/date_edit/valueProcess.js b/entity/InboxFilter_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/entityfields/date_new/valueProcess.js b/entity/InboxFilter_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/entityfields/user_edit/valueProcess.js b/entity/InboxFilter_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InboxFilter_entity/entityfields/user_new/valueProcess.js b/entity/InboxFilter_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/InboxFilter_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/Inbox_entity.aod b/entity/Inbox_entity/Inbox_entity.aod
index 40918ab17a08543a1133feb0e3b085b96b8ab04f..11b9a8dbeee580d487efb1059ea90abf8bdd13c2 100644
--- a/entity/Inbox_entity/Inbox_entity.aod
+++ b/entity/Inbox_entity/Inbox_entity.aod
@@ -219,6 +219,24 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Inbox_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -271,6 +289,22 @@
<name>ReopenDelayPreview.value</name>
<recordfield>INBOX.REOPEN_DELAY</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>INBOX.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>INBOX.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>INBOX.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>INBOX.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/Inbox_entity/entityfields/date_edit/valueProcess.js b/entity/Inbox_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/date_new/valueProcess.js b/entity/Inbox_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/user_edit/valueProcess.js b/entity/Inbox_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/Inbox_entity/entityfields/user_new/valueProcess.js b/entity/Inbox_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/Inbox_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/InterestLink_entity/InterestLink_entity.aod b/entity/InterestLink_entity/InterestLink_entity.aod
index 1ac1a55774b454a22e668a39ab4966681a519086..c77a7c854919994c9024a228a06076dbe41f00d5 100644
--- a/entity/InterestLink_entity/InterestLink_entity.aod
+++ b/entity/InterestLink_entity/InterestLink_entity.aod
@@ -123,12 +123,10 @@
<dbRecordFieldMapping>
<name>INTEREST_ID.value</name>
<recordfield>INTERESTLINK.INTEREST_ID</recordfield>
- <expression>%aditoprj%/entity/InterestLink_entity/recordcontainers/db/recordfieldmappings/interest_id.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>INTERESTLINKID.value</name>
<recordfield>INTERESTLINK.INTERESTLINKID</recordfield>
- <expression>%aditoprj%/entity/InterestLink_entity/recordcontainers/db/recordfieldmappings/interestlinkid.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.value</name>
diff --git a/entity/KeywordCategory_entity/entityfields/sortingby/dropDownProcess.js b/entity/KeywordCategory_entity/entityfields/sortingby/dropDownProcess.js
index 7857949a704707c91123e2f9d922b23fcfc1bef0..864f12458a9ae4d40c62a2cc85b43ab948b67d8e 100644
--- a/entity/KeywordCategory_entity/entityfields/sortingby/dropDownProcess.js
+++ b/entity/KeywordCategory_entity/entityfields/sortingby/dropDownProcess.js
@@ -3,7 +3,7 @@ import("system.translate");
result.object([
- ["0", translate.text("by sorting")],
- ["1", translate.text("by name")],
- ["2", translate.text("by translated name")],
+ ["0", translate.text("manually")],
+ ["1", translate.text("by title")],
+ ["2", translate.text("by translated title")],
]);
\ No newline at end of file
diff --git a/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js b/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js
index a7755c7c8e3817c1c4ce2b06c5aed3bf161cccf1..d9df7da703268b6eabb241600751a489d537c699 100644
--- a/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js
+++ b/entity/KnowledgeManagement_entity/entityfields/tagsbyknowledgeid/onValidation.js
@@ -11,10 +11,10 @@ var tagRows = EntityConsumerRowsHelper.getCurrentConsumerRows("TagsByKnowledgeId
var tagSet = new Set();
var hasDuplicate = tagRows.some(function (row)
{
- var tag = row["TAG"].trim();
- if (tagSet.has(tag))
+ var tagName = row["TAG"].trim();
+ if (tagSet.has(tagName))
return true;
- tagSet.add(tag);
+ tagSet.add(tagName);
return false;
});
diff --git a/entity/MailLog_entity/MailLog_entity.aod b/entity/MailLog_entity/MailLog_entity.aod
index d11a302c48876f498a97e30720bbbe741e33095f..125056661935e1fdbfbcea4038d9d3997b1897e1 100644
--- a/entity/MailLog_entity/MailLog_entity.aod
+++ b/entity/MailLog_entity/MailLog_entity.aod
@@ -103,6 +103,7 @@
<isMenuAction v="true" />
<isObjectAction v="true" />
<selectionType>MULTI</selectionType>
+ <iconId>VAADIN:DOWNLOAD</iconId>
<tooltipProcess>%aditoprj%/entity/MailLog_entity/entityfields/recipientactions/children/downloademl/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
diff --git a/entity/MailSignature_entity/MailSignature_entity.aod b/entity/MailSignature_entity/MailSignature_entity.aod
index c27ae60584c397820f38d9634c1a4a9c42dfdbba..3c49acc7b6edba394966dc75f53dc265a3f1e7f0 100644
--- a/entity/MailSignature_entity/MailSignature_entity.aod
+++ b/entity/MailSignature_entity/MailSignature_entity.aod
@@ -182,6 +182,24 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/MailSignature_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -247,6 +265,22 @@
<name>SIGNATURE.displayValue</name>
<expression>%aditoprj%/entity/MailSignature_entity/recordcontainers/db/recordfieldmappings/signature.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>MAILSIGNATURE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>MAILSIGNATURE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>MAILSIGNATURE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>MAILSIGNATURE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/MailSignature_entity/entityfields/date_edit/valueProcess.js b/entity/MailSignature_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/date_new/valueProcess.js b/entity/MailSignature_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/user_edit/valueProcess.js b/entity/MailSignature_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/MailSignature_entity/entityfields/user_new/valueProcess.js b/entity/MailSignature_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/MailSignature_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod b/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
deleted file mode 100644
index 9980732627b5b44ff362c0ddaa369015d83c5ac6..0000000000000000000000000000000000000000
--- a/entity/MarketingWorkflowLauncher_entity/MarketingWorkflowLauncher_entity.aod
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
- <name>MarketingWorkflowLauncher_entity</name>
- <title>Marketing workflow</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>dataLess</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityProvider>
- <name>#PROVIDER_AGGREGATES</name>
- <useAggregates v="true" />
- </entityProvider>
- <entityField>
- <name>DOCUMENTTEMPLATE_ID</name>
- <title>Document Template</title>
- <consumer>EmailTemplates</consumer>
- <mandatory v="true" />
- <state>EDITABLE</state>
- </entityField>
- <entityConsumer>
- <name>WorkflowLauncherIntegration</name>
- <isOneToOneRelationship v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>WorkflowLauncher_entity</entityName>
- <fieldName>Integration</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Validationerrors_param</name>
- <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/validationerrors_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ProcessVariables_param</name>
- <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/processvariables_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>Targets_param</name>
- <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targets_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>TargetContext_param</name>
- <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectFilter_param</name>
- <expose v="true" />
- </entityParameter>
- <entityConsumer>
- <name>EmailTemplates</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ComingFrom_param</name>
- <valueProcess>%aditoprj%/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <datalessRecordContainer>
- <name>dataLess</name>
- <alias>Data_alias</alias>
- </datalessRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/documenttemplatetype_param/valueProcess.js b/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/documenttemplatetype_param/valueProcess.js
deleted file mode 100644
index 28aacde92d62b929b1e883596dc7fbefc8adc604..0000000000000000000000000000000000000000
--- a/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/documenttemplatetype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.documentTemplateType$mail());
\ No newline at end of file
diff --git a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/processvariables_param/valueProcess.js b/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/processvariables_param/valueProcess.js
deleted file mode 100644
index cea637a710a0e3e0903248241654aec944c88137..0000000000000000000000000000000000000000
--- a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/processvariables_param/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.vars");
-import("system.result");
-
-var variables = {
- documentTemplateId: vars.get("$field.DOCUMENTTEMPLATE_ID"),
- originUrl: vars.get("$sys.origin")
-};
-result.string(JSON.stringify(variables));
\ No newline at end of file
diff --git a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js b/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js
deleted file mode 100644
index cc6924394ae950c43386275dda2c8db5d7a9c0ed..0000000000000000000000000000000000000000
--- a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targetcontext_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("Context_lib");
-import("system.result");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targets_param/valueProcess.js b/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targets_param/valueProcess.js
deleted file mode 100644
index 1bfc02a3f326e8e82420c38d5f60d1faee9cdf6b..0000000000000000000000000000000000000000
--- a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/targets_param/valueProcess.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import("Sql_lib");
-import("Util_lib");
-import("system.vars");
-import("system.result");
-import("FilterViewAction_lib");
-
-var context = vars.get("$param.ObjectType_param");
-var targets = Utils.parseJSON(vars.get("$param.ObjectIds_param"));
-var filter = Utils.parseJSON(vars.get("$param.ObjectFilter_param"));
-
-var personContactIds = [];
-
-targets = FilterViewActionUtils.getUidsBySelectionOrFilter(context, targets, filter).map(function (target)
-{
- if (Utils.isString(target))
- target = [target, context];
- if (target[1] == "Person")
- personContactIds.push(target[0]);
- return target;
-});
-
-if (personContactIds.length !== 0)
-{
- var orgContactIds = newSelect(["anyContact.CONTACTID", "orgContact.CONTACTID"])
- .from("CONTACT", "orgContact")
- .join("CONTACT", "anyContact.ORGANISATION_ID = orgContact.ORGANISATION_ID and orgContact.PERSON_ID is null", "anyContact")
- .where(["CONTACT", "CONTACTID", "anyContact"], personContactIds, SqlBuilder.IN())
- .table();
- var contactIdMap = new Map(orgContactIds);
- targets.forEach(function ([targetId, targetContext, variables], i, allTargets)
- {
- if (contactIdMap.has(targetId))
- {
- if (!variables)
- variables = {};
- variables.attributeRowId = contactIdMap.get(targetId);
- variables.attributeContext = "Organisation";
- allTargets[i][2] = variables;
- }
- });
-}
-
-result.string(JSON.stringify(targets));
\ No newline at end of file
diff --git a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/validationerrors_param/valueProcess.js b/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/validationerrors_param/valueProcess.js
deleted file mode 100644
index 30356844f1b46d5f02bf716149cdc80470bc01d6..0000000000000000000000000000000000000000
--- a/entity/MarketingWorkflowLauncher_entity/entityfields/workflowlauncherintegration/children/validationerrors_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$sys.validationerrors"));
\ No newline at end of file
diff --git a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
index 2c49610b8c55425f97cbd86bba7e78f36ee03d6e..c383fde4ead08761a0ef434c3febd2abee411964 100644
--- a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
+++ b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
@@ -97,31 +97,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionField>
- <name>OpenInMosaico</name>
- <title>Open in mosaico</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/onActionProcess.js</onActionProcess>
- <iconId>NEON:WRENCH</iconId>
- <tooltipProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>CopyTemplate</name>
- <title>Copy template</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:COPY</iconId>
- </entityActionField>
- <entityActionField>
- <name>newBulkMail</name>
- <title>Write bulk mail</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newbulkmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:AT</iconId>
- </entityActionField>
- <entityActionField>
- <name>newDocumentTemplate</name>
- <title>New document template</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newdocumenttemplate/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:FILE_FONT</iconId>
- </entityActionField>
<entityParameter>
<name>CopyMosaicoTemplateIdParam</name>
<expose v="true" />
@@ -165,6 +140,31 @@
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityActionField>
+ <name>newBulkMail</name>
+ <title>Write bulk mail</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newbulkmail/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:AT</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newDocumentTemplate</name>
+ <title>New document template</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newdocumenttemplate/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_FONT</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>OpenInMosaico</name>
+ <title>Open in mosaico</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/onActionProcess.js</onActionProcess>
+ <iconId>NEON:WRENCH</iconId>
+ <tooltipProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>CopyTemplate</name>
+ <title>Copy template</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:COPY</iconId>
+ </entityActionField>
<entityActionField>
<name>openAdminView</name>
<documentation>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openadminview/documentation.adoc</documentation>
diff --git a/entity/Observation_entity/Observation_entity.aod b/entity/Observation_entity/Observation_entity.aod
index 42aa711708f462f3261b1c663e7a67a14545e0b2..94c246c8b0020bd5deeac8479ed5aad7fbef0453 100644
--- a/entity/Observation_entity/Observation_entity.aod
+++ b/entity/Observation_entity/Observation_entity.aod
@@ -60,7 +60,6 @@
<stateProcess>%aditoprj%/entity/Observation_entity/entityfields/object_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Observation_entity/entityfields/object_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Observation_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Observation_entity/entityfields/object_type/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>OBJECT_ID</name>
@@ -142,6 +141,7 @@
<name>OBJECT_FIELD</name>
<title>Fields</title>
<contentType>TEXT</contentType>
+ <mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/Observation_entity/entityfields/object_field/dropDownProcess.js</dropDownProcess>
<selectionMode>MULTI</selectionMode>
<stateProcess>%aditoprj%/entity/Observation_entity/entityfields/object_field/stateProcess.js</stateProcess>
diff --git a/entity/Observation_entity/entityfields/object_type/onValueChange.js b/entity/Observation_entity/entityfields/object_type/onValueChange.js
deleted file mode 100644
index 9bcd9261bdd4b363f261de9b5e1edad733a7b9ea..0000000000000000000000000000000000000000
--- a/entity/Observation_entity/entityfields/object_type/onValueChange.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.neon");
-import("Observation_lib");
-import("system.vars");
-
-if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
- vars.set("$field.OBJECT_FIELD",null);
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 06b6177b7a122c6ded0204523f6d5d37f01a3cae..cb2ee6a3d7e85708b970f87601b79e2c8b32e9df 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -56,6 +56,7 @@
<minValue v="0" />
<outputFormat>0'%'</outputFormat>
<groupable v="true" />
+ <mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="false" />
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/stateProcess.js</stateProcess>
@@ -948,16 +949,12 @@
</entityField>
<entityField>
<name>DISCOUNT</name>
- <title>Discount</title>
<contentType>NUMBER</contentType>
<outputFormat>0.00'%'</outputFormat>
<inputFormat>0.00</inputFormat>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discount/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/discount/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/discount/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/discount/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
<onValidation>%aditoprj%/entity/Offer_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -966,7 +963,6 @@
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/titleProcess.js</titleProcess>
</entityField>
@@ -1142,6 +1138,17 @@
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Offer_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
</entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/observeactiongroup/children/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/observeactiongroup/children/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
</children>
</entityActionGroup>
<entityActionField>
@@ -1257,6 +1264,24 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>DISCOUNT_NET</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discount_net/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/discount_net/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/discount_net/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>GROSS</name>
+ <title>Total gross</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/gross/displayValueProcess.js</displayValueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1324,13 +1349,13 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ORG_ID.value</name>
- <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+ <recordfield>CONTACT.CONTACTID</recordfield>
<isFilterable v="true" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_PERSON_ID.value</name>
- <recordfield>CONTACT.PERSON_ID</recordfield>
+ <recordfield>CONTACT.CONTACTID</recordfield>
<isFilterable v="true" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
@@ -1459,16 +1484,12 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNTED_NET.value</name>
- <recordfield>OFFER.DISCOUNTED_NET</recordfield>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNT.value</name>
<recordfield>OFFER.DISCOUNT</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISCOUNTED_VAT.value</name>
- <recordfield>OFFER.DISCOUNTED_VAT</recordfield>
- </dbRecordFieldMapping>
<aggregateFieldDbMapping>
<name>PROBABILITY_aggregate.value</name>
<recordfield>OFFER.PROBABILITY</recordfield>
@@ -1482,6 +1503,14 @@
<name>APPROVAL.value</name>
<recordfield>OFFER.APPROVAL</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT_NET.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/net_discount.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROSS.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js</expression>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CURRENCYRATE_ID.value</name>
<recordfield>OFFER.CURRENCYRATE_ID</recordfield>
diff --git a/entity/Offer_entity/contentDescriptionProcess.js b/entity/Offer_entity/contentDescriptionProcess.js
index 486660210e860440486fbfea0ec23e8b76ccdb24..0bdc8b7bcd5061a640d9605b7134e7631aeb8287 100644
--- a/entity/Offer_entity/contentDescriptionProcess.js
+++ b/entity/Offer_entity/contentDescriptionProcess.js
@@ -1,6 +1,5 @@
import("Currency_lib");
import("Util_lib");
-import("system.eMath");
import("system.translate");
import("system.datetime");
import("system.vars");
@@ -11,4 +10,4 @@ var res = [translate.text("Total gross") + ": " + formattedGross,
translate.text("Probability") + ": " + vars.get("$field.PROBABILITY") + "%",
translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy"))];
-result.string(res.join(" | "));
\ No newline at end of file
+result.string(res.join(" | "));
diff --git a/entity/Offer_entity/entityfields/attributes/stateProcess.js b/entity/Offer_entity/entityfields/attributes/stateProcess.js
index 0a6a6c21d28963cf2bf06df2749337986db749b5..0fbe4590d5cc1f3881ba963a4c4e9f61cd9837d2 100644
--- a/entity/Offer_entity/entityfields/attributes/stateProcess.js
+++ b/entity/Offer_entity/entityfields/attributes/stateProcess.js
@@ -1,20 +1,17 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
import("Context_lib");
import("Attribute_lib");
import("Offer_lib");
-import("Sql_lib");
-import("system.vars");
-import("system.db");
-import("system.neon");
-import("system.result");
-if (OfferUtils.isEditable(vars.get("$field.STATUS")))
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if(AttributeUtil.hasAttributes(ContextUtils.getCurrentContextId()))
{
- if (AttributeUtil.hasAttributes(ContextUtils.getCurrentContextId()))
- result.string(neon.COMPONENTSTATE_EDITABLE);
- else
- result.string(neon.COMPONENTSTATE_INVISIBLE);
+ state = neon.COMPONENTSTATE_READONLY;
+ if(OfferUtils.isEditable(vars.get("$field.STATUS")))
+ {
+ state = neon.COMPONENTSTATE_EDITABLE;
+ }
}
-else
-{
- result.string(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
+result.string(state);
diff --git a/entity/Offer_entity/entityfields/discount/onValueChange.js b/entity/Offer_entity/entityfields/discount/onValueChange.js
deleted file mode 100644
index 5fc7651884946ad0f59a3f5c51b5bb93f0505c30..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/discount/onValueChange.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.neon");
-import("system.vars");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon. OPERATINGSTATE_EDIT){
- neon.setFieldValue("$field.DiscountChanged", "true");
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discount/titleProcess.js b/entity/Offer_entity/entityfields/discount/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e31d4834c9c6aaafaaf857dc05c695f3825ccf49
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Discount in %0", ["%"]));
diff --git a/entity/Offer_entity/entityfields/discount_net/displayValueProcess.js b/entity/Offer_entity/entityfields/discount_net/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount_net/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Offer_entity/entityfields/discount_net/stateProcess.js b/entity/Offer_entity/entityfields/discount_net/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a6fb24db9fc6226b60e8f57ea8560234976c17a
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount_net/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if((vars.get("$field.DISCOUNT") || 0) > 0)
+{
+ state = neon.COMPONENTSTATE_READONLY;
+}
+result.string(state);
diff --git a/entity/Offer_entity/entityfields/discount_net/titleProcess.js b/entity/Offer_entity/entityfields/discount_net/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1fcc19648ab8c254dec9adf3ea45bf4bd12c7480
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discount_net/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY"));
+result.string(translate.withArguments("Discount in %0", [currency]));
diff --git a/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js b/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Offer_entity/entityfields/discounted_net/stateProcess.js b/entity/Offer_entity/entityfields/discounted_net/stateProcess.js
index 7443b0c0dcb6c9e38045968ddaa64b5763dfd85e..5a6fb24db9fc6226b60e8f57ea8560234976c17a 100644
--- a/entity/Offer_entity/entityfields/discounted_net/stateProcess.js
+++ b/entity/Offer_entity/entityfields/discounted_net/stateProcess.js
@@ -1,10 +1,10 @@
-import("system.vars");
-import("system.neon");
import("system.result");
+import("system.neon");
+import("system.vars");
-var discount = vars.get("$field.DISCOUNT");
-
-if(parseInt(discount) == parseInt("0") || !discount)
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-else
- result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if((vars.get("$field.DISCOUNT") || 0) > 0)
+{
+ state = neon.COMPONENTSTATE_READONLY;
+}
+result.string(state);
diff --git a/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js b/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js
deleted file mode 100644
index 7443b0c0dcb6c9e38045968ddaa64b5763dfd85e..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.vars");
-import("system.neon");
-import("system.result");
-
-var discount = vars.get("$field.DISCOUNT");
-
-if(parseInt(discount) == parseInt("0") || !discount)
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-else
- result.string(neon.COMPONENTSTATE_READONLY);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/gross/displayValueProcess.js b/entity/Offer_entity/entityfields/gross/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Offer_entity/entityfields/gross/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Offer_entity/entityfields/net/displayValueProcess.js b/entity/Offer_entity/entityfields/net/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Offer_entity/entityfields/net/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Offer_entity/entityfields/export/onActionProcess.js b/entity/Offer_entity/entityfields/observeactiongroup/children/export/onActionProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/export/onActionProcess.js
rename to entity/Offer_entity/entityfields/observeactiongroup/children/export/onActionProcess.js
diff --git a/entity/Offer_entity/entityfields/export/stateProcess.js b/entity/Offer_entity/entityfields/observeactiongroup/children/export/stateProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/export/stateProcess.js
rename to entity/Offer_entity/entityfields/observeactiongroup/children/export/stateProcess.js
diff --git a/entity/Offer_entity/entityfields/export/tooltipProcess.js b/entity/Offer_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js
similarity index 100%
rename from entity/Offer_entity/entityfields/export/tooltipProcess.js
rename to entity/Offer_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js
diff --git a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
index c9be3c889870754bed49436e6818a86aebc8ca22..32834d7795ed019a1dc794be35c67e45640c47ae 100644
--- a/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/offerreportdispatch/children/dispatchofferreport/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.db");
import("system.vars");
import("system.question");
@@ -20,13 +21,18 @@ var additionalPlaceholders = [
new Placeholder("offerCode", Placeholder.types.FIXEDVALUE, vars.get("$field.FullOfferCode"))
];
-if (vars.get("$field.CONTACT_ID") == null || "") contactId = vars.get("$field.CONTACT_ORG_ID");
+if (Utils.isNullOrEmptyString(vars.get("$field.CONTACT_ID")))
+{
+ contactId = vars.get("$field.CONTACT_ORG_ID");
+}
offerReport.content = arrayReport[1];
offerReport.mimeType = MimeTypes.PDF();
-offerReport.filename = translate.text("Offer No.") + vars.get("$field.#CONTENTTITLE") + ".pdf";
+offerReport.filename = translate.text("Offer No.") + vars.get("$field.OfferCode_VersNr_fieldgroup") + ".pdf";
attachmentArray[0] = offerReport;
-EmailWritingUtils.sendReportAsMail(contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements,
- $KeywordRegistry.documentTemplateTypeCategory$single());
+EmailWritingUtils.sendReportAsMail(
+ contactId, attachmentArray, "Offer", notificationMsg, emailFilename, additionalPlaceholders, updateStatements,
+ $KeywordRegistry.documentTemplateTypeCategory$single()
+);
diff --git a/entity/Offer_entity/entityfields/startworkflow/onActionProcess.js b/entity/Offer_entity/entityfields/startworkflow/onActionProcess.js
index 287769a40ca72c10ec841bc2c7366cc2f5fc40df..b13e936fab92793b1f47bfad5fd3545bc86f3944 100644
--- a/entity/Offer_entity/entityfields/startworkflow/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/startworkflow/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("Workflow_lib");
-WorkflowUtils.openNewInstance({sum : Number(vars.get("$field.TotalGross"))});
\ No newline at end of file
+WorkflowUtils.openNewInstance({sum : Number(vars.get("$field.GROSS"))});
diff --git a/entity/Offer_entity/entityfields/totalgross/documentation.adoc b/entity/Offer_entity/entityfields/totalgross/documentation.adoc
deleted file mode 100644
index c727abed66886d38bd46c6df6e1045b82666eb30..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/totalgross/documentation.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-= TotalGross
-:hardbreaks:
-
-Contains the total gross of the offer (net).
-This is calculated as follows: _NET_ + _VAT_.
-Both are calculated in *_Offeritem_entity_* at _onDBInsert_, _onDBUpdate_ and _onDBDelete_.
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/totalgross/valueProcess.js b/entity/Offer_entity/entityfields/totalgross/valueProcess.js
deleted file mode 100644
index 9d6a6c9330d2fd3eb57fa5f5102e55ad5eb0ef3b..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/totalgross/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.eMath");
-
-var discount = vars.get("$field.DISCOUNT");
-var netValue = discount && parseInt(discount) != parseInt("0") ? vars.get("$field.DISCOUNTED_NET") : vars.get("$field.NET")
-var vatValue = discount && parseInt(discount) != parseInt("0") ? vars.get("$field.DISCOUNTED_VAT") : vars.get("$field.VAT");
-
-result.string( eMath.addDec(netValue, vatValue) );
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
index 866c488632bc1e0629e2bfd4b4681a8f3baad6a5..8045dda78ef88bd99de81a46f827aec85311ec1c 100644
--- a/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offer_entity/recordcontainers/db/onDBUpdate.js
@@ -1,38 +1,3 @@
-import("system.entities");
-import("Offer_lib");
-import("system.vars");
import("Workflow_lib");
-var rowdata = vars.get("$local.rowdata");
-var oid = rowdata["OFFER.OFFERID"];
-if(vars.get("$field.DiscountChanged") == "true" && oid){
- var discount = rowdata["OFFER.DISCOUNT"];
- var oiUtils = new OfferItemUtils(oid);
-
- var vals = oiUtils.getNetAndVat();
- var discountedVals = OfferItemUtils.getDiscountedNet(null, oid, discount);
-
- let config = entities.createConfigForUpdatingRows();
- config.entity("Offer_entity");
- if(discountedVals){
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1],
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else
- {
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1]
- });
- }
-
- config.uid(oid);
- entities.updateRow(config);
-
-}
-
-WorkflowSignalSender.updated();
\ No newline at end of file
+WorkflowSignalSender.updated();
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..50031b03c6b4cf95b293045da409ebae2c7b1748
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("OFFER.NET - OFFER.NET * OFFER.DISCOUNT / 100");
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..43238579d431632de698df46f09e494c01ac606b
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+
+var maskingUtils = new SqlMaskingUtils();
+var discount = maskingUtils.isNull("OFFER.DISCOUNT", "0");
+result.string("OFFER.NET - OFFER.NET * " + discount + " / 100 + OFFER.VAT - OFFER.VAT * " + discount + " / 100");
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 1f2ff0dbafb04de96e308dfdfc3c66a24b47c616..749e2e7a87a2c06fb392e164eb85ee001325e5ea 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -23,10 +23,11 @@
</entityField>
<entityField>
<name>DISCOUNT</name>
- <title>Discount</title>
<contentType>NUMBER</contentType>
<outputFormat>0.00'%'</outputFormat>
<inputFormat>0.00</inputFormat>
+ <mandatory v="true" />
+ <titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/discount/titleProcess.js</titleProcess>
<onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
diff --git a/entity/Offeritem_entity/afterSave.js b/entity/Offeritem_entity/afterSave.js
index 7c2d55dd966eddba21d0bbc81d5202578886f64f..c86d9898de8a5388deacce5b0b72ff50200d49fb 100644
--- a/entity/Offeritem_entity/afterSave.js
+++ b/entity/Offeritem_entity/afterSave.js
@@ -1,10 +1,44 @@
import("system.neon");
+import("system.entities");
import("system.vars");
-import("Offer_lib");
+import("Sql_lib");
-if(vars.get("$local.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$local.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
- oiUtils.reOrgItems();
- neon.refreshAll();
+ var offerId = vars.get("$field.OFFER_ID");
+ var offerItemUtils = new OfferItemUtils(offerId);
+ offerItemUtils.initItemTree();
+ var childIds = new Set();
+ function _traverseChilds(pId)
+ {
+ if(!childIds.has(pId))
+ {
+ childIds.add(pId);
+ if(pId in offerItemUtils.ItemTree)
+ {
+ // catch errors if the item tree got calculated while inserting / deleting items
+ offerItemUtils.ItemTree[pId].ids.forEach(_traverseChilds);
+ }
+ }
+ }
+ _traverseChilds(vars.get("$sys.uid"));
+ newWhere("OFFERITEM.OFFERITEMID", Array.from(childIds), SqlBuilder.IN())
+ .updateFields({"SHOWPRICE": vars.get("$field.SHOWPRICE")});
+
+ if(!vars.get("$field.ITEMPOSITION").includes("."))//only the topItems affect the Offer price
+ {
+ var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
+ var cols = ["NET", "VAT"];
+ var vals = offerItemUtils.getNetAndVat();
+ var fieldValues = {
+ NET: vals[0].toString(),
+ VAT: vals[1].toString()
+ };
+
+ var config = entities.createConfigForUpdatingRows();
+ config.entity("Offer_entity");
+ config.uid(offerId);
+ config.fieldValues(fieldValues);
+ entities.updateRow(config);
+ }
}
diff --git a/entity/Offeritem_entity/entityfields/discount/titleProcess.js b/entity/Offeritem_entity/entityfields/discount/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e31d4834c9c6aaafaaf857dc05c695f3825ccf49
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/discount/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Discount in %0", ["%"]));
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js b/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
index 5d2691b811b6ad90eecd496864b50433947b30f6..88a3c5757231d8f78f72faa41d529ee97397c189 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js
@@ -16,19 +16,10 @@ if(oid != "")
oiUtils.reOrgItems();
var vals = oiUtils.getNetAndVat(deletedIds);
- var discountedVals = OfferItemUtils.getDiscountedNet(deletedIds, oid, discount);
-
var fieldValues = {
NET: vals[0].toString(),
VAT: vals[1].toString()
};
- if(discountedVals)
- {
- Object.assign(fieldValues, {
- DISCOUNTED_NET: discountedVals[0].toString(),
- DISCOUNTED_VAT: discountedVals[1].toString()
- });
- }
var config = entities.createConfigForUpdatingRows();
config.entity("Offer_entity");
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
index 52e5779595bbd95dea595795bca84d45130a3292..5a02db4f37aed6f50518823f220499af44fe47e5 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js
@@ -6,87 +6,39 @@ import("system.neon");
import("Offer_lib");
import("Sql_lib");
-var offerId = vars.get("$field.OFFER_ID");
-if(offerId != "")
+// this processs get's executed for every child of this offerItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children
+var newQuanitity = parseFloat(vars.get("$field.QUANTITY"));
+var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["OFFERITEM.QUANTITY"]);
+var offerItemId = vars.get("$field.OFFERITEMID");
+if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly
{
- var offerItemUtils = new OfferItemUtils(offerId);
- offerItemUtils.initItemTree();
- var childIds = new Set();
- function _traverseChilds(pId)
- {
- if(!childIds.has(pId))
- {
- childIds.add(pId);
- offerItemUtils.ItemTree[pId].ids.forEach(_traverseChilds);
- }
- }
- _traverseChilds(vars.get("$sys.uid"));
- newWhere("OFFERITEM.OFFERITEMID", Array.from(childIds), SqlBuilder.IN())
- .updateFields({"SHOWPRICE": vars.get("$field.SHOWPRICE")});
-
- if(!vars.get("$field.ITEMPOSITION").includes("."))//only the topItems affect the Offer price
- {
- var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
- var cols = ["NET", "VAT"];
- var vals = offerItemUtils.getNetAndVat();
- var discountedVals = OfferItemUtils.getDiscountedNet(null, offerId, discount);
-
- var fieldValues = {
- NET: vals[0].toString(),
- VAT: vals[1].toString()
- };
- if(discountedVals)
- {
- Object.assign(fieldValues, {
- DISCOUNTED_NET: discountedVals[0].toString(),
- DISCOUNTED_VAT: discountedVals[1].toString()
- });
- }
-
- var config = entities.createConfigForUpdatingRows();
- config.entity("Offer_entity");
- config.uid(offerId);
- config.fieldValues(fieldValues);
- entities.updateRow(config);
- }
-
- //this process get's executed for every child of this offerItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children
- if(vars.getString("$param.IgnoreOnUpdateProcess_param") != "true")
- {
- var newQuanitity = parseFloat(vars.get("$field.QUANTITY"));
- var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["OFFERITEM.QUANTITY"]);
- var offerItemId = vars.get("$field.OFFERITEMID");
- if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly
- {
- var multiplier = newQuanitity/oldQuantity;
+ var multiplier = newQuanitity/oldQuantity;
- var loadConfig = entities.createConfigForLoadingRows().entity("Offeritem_entity").addParameter("OfferId_param", offerId).fields(["OFFERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"])
+ var loadConfig = entities.createConfigForLoadingRows().entity("Offeritem_entity").addParameter("OfferId_param", vars.get("$field.OFFER_ID")).fields(["OFFERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"])
- var rows = entities.getRows(loadConfig);
- var potentialAsignees = {};
- var offerItemsToUpdate = {};
- var statements = [];
- var stop = false;
- while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees
+ var rows = entities.getRows(loadConfig);
+ var potentialAsignees = {};
+ var offerItemsToUpdate = {};
+ var statements = [];
+ var stop = false;
+ while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees
+ {
+ stop = true;
+ for(var offeritem in rows)//loop trough all the rows and build offerItemsToUpdate
+ {
+ if(!(rows[offeritem]["OFFERITEMID"] in offerItemsToUpdate) &&(rows[offeritem]["ASSIGNEDTO"] == offerItemId || rows[offeritem]["ASSIGNEDTO"] in potentialAsignees))
{
- stop = true;
- for(var offeritem in rows)//loop trough all the rows and build offerItemsToUpdate
- {
- if(!(rows[offeritem]["OFFERITEMID"] in offerItemsToUpdate) &&(rows[offeritem]["ASSIGNEDTO"] == offerItemId || rows[offeritem]["ASSIGNEDTO"] in potentialAsignees))
- {
- statements.push(
- newWhere("OFFERITEM.OFFERITEMID", rows[offeritem]["OFFERITEMID"]).buildUpdateStatement({
- "QUANTITY": parseInt(rows[offeritem]["QUANTITY"])*multiplier
- })
- );
- offerItemsToUpdate[rows[offeritem]["OFFERITEMID"]] = parseInt(rows[offeritem]["QUANTITY"])*multiplier;
- potentialAsignees[rows[offeritem]["OFFERITEMID"]] = "";
+ statements.push(
+ newWhere("OFFERITEM.OFFERITEMID", rows[offeritem]["OFFERITEMID"]).buildUpdateStatement({
+ "QUANTITY": parseInt(rows[offeritem]["QUANTITY"])*multiplier
+ })
+ );
+ offerItemsToUpdate[rows[offeritem]["OFFERITEMID"]] = parseInt(rows[offeritem]["QUANTITY"])*multiplier;
+ potentialAsignees[rows[offeritem]["OFFERITEMID"]] = "";
- stop = false;
- }
- }
+ stop = false;
}
- db.execute(statements);// no write entity -> performance reason
}
}
+ db.execute(statements);// no write entity -> performance reason
}
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index fef56936bc0d0c5e0241e0ae663909110d97b368..b008568573c44a4de8ec448b1464bbef521037f5 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1090,10 +1090,64 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityConsumer>
+ <name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Products</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OrderOfferInformations_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ShownInOrderMainView_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/showninordermainview_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>DISCOUNT</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>0.00'%'</outputFormat>
+ <inputFormat>0.00</inputFormat>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/discount/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/discount/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Order_entity/entityfields/discount/onValidation.js</onValidation>
+ </entityField>
<entityField>
<name>paidForeignCurrency</name>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>Discount_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>Links</name>
+ <refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>OrderLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>SalesorderId_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/links/children/salesorderid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>Links_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Order_entity/entityfields/links_param/documentation.adoc</documentation>
+ </entityParameter>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paidforeigncurrency/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Order_entity/entityfields/paidforeigncurrency/titleProcess.js</titleProcess>
</entityField>
@@ -1111,6 +1165,29 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>DISCOUNT_NET</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discount_net/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/discount_net/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/discount_net/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>GROSS</name>
+ <title>Total gross</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/gross/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityAggregateField>
+ <name>NET_aggregate</name>
+ <parentField>NET</parentField>
+ <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/net_aggregate/displayValueProcess.js</displayValueProcess>
+ </entityAggregateField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1166,15 +1243,17 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_ORG_ID.value</name>
- <recordfield>CONTACT.ORGANISATION_ID</recordfield>
- <isFilterable v="false" />
- <isLookupFilter v="false" />
+ <recordfield>CONTACT.CONTACTID</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONTACT_PERSON_ID.value</name>
- <recordfield>CONTACT.PERSON_ID</recordfield>
- <isFilterable v="false" />
- <isLookupFilter v="false" />
+ <recordfield>CONTACT.CONTACTID</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCY.displayValue</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OFFER_ID.value</name>
@@ -1319,12 +1398,21 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DISCOUNTED_NET.value</name>
- <recordfield>SALESORDER.DISCOUNTED_NET</recordfield>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>DISCOUNTED_VAT.value</name>
- <recordfield>SALESORDER.DISCOUNTED_VAT</recordfield>
+ <name>DISCOUNT_NET.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/discount_net.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROSS.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <aggregateFieldDbMapping>
+ <name>NET_aggregate.value</name>
+ <recordfield>SALESORDER.NET</recordfield>
+ <aggregateType>SUM</aggregateType>
+ </aggregateFieldDbMapping>
<dbRecordFieldMapping>
<name>TotalGross.value</name>
<expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js</expression>
diff --git a/entity/Order_entity/contentDescriptionProcess.js b/entity/Order_entity/contentDescriptionProcess.js
index bd351d26e62473bda001b51a8393d3ed4f2cdb19..a51df75a71aa69923680945f967a6146113234e7 100644
--- a/entity/Order_entity/contentDescriptionProcess.js
+++ b/entity/Order_entity/contentDescriptionProcess.js
@@ -7,13 +7,16 @@ import("KeywordRegistry_basic");
var orderstatus = vars.get("$field.ORDERSTATUS") == "1" ? translate.text("Yes"): translate.text("No")
-var res = [translate.text("Sent") + ": " + orderstatus,
- translate.text("Total gross") + ": " + vars.get("$field.TotalGross.displayValue")]
+var res = [
+ translate.text("Sent") + ": " + orderstatus,
+ translate.text("Total gross") + ": " + vars.get("$field.GROSS.displayValue")
+];
if(vars.get("$field.PAYDATE"))
- res.push(translate.text("Pay date") + ": " + datetime.toDate(vars.get("$field.PAYDATE"), translate.text("dd.MM.yyyy")))
-
+{
+ res.push(translate.text("Pay date") + ": " + datetime.toDate(vars.get("$field.PAYDATE"), translate.text("dd.MM.yyyy")));
+}
res.push(translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy")));
-result.string(res.join(" | "));
\ No newline at end of file
+result.string(res.join(" | "));
diff --git a/entity/Order_entity/entityfields/discount/onValueChange.js b/entity/Order_entity/entityfields/discount/onValueChange.js
deleted file mode 100644
index 5fc7651884946ad0f59a3f5c51b5bb93f0505c30..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/discount/onValueChange.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.neon");
-import("system.vars");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon. OPERATINGSTATE_EDIT){
- neon.setFieldValue("$field.DiscountChanged", "true");
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discount/titleProcess.js b/entity/Order_entity/entityfields/discount/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e31d4834c9c6aaafaaf857dc05c695f3825ccf49
--- /dev/null
+++ b/entity/Order_entity/entityfields/discount/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Discount in %0", ["%"]));
diff --git a/entity/Order_entity/entityfields/discount_net/displayValueProcess.js b/entity/Order_entity/entityfields/discount_net/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Order_entity/entityfields/discount_net/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Order_entity/entityfields/discount_net/stateProcess.js b/entity/Order_entity/entityfields/discount_net/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5a6fb24db9fc6226b60e8f57ea8560234976c17a
--- /dev/null
+++ b/entity/Order_entity/entityfields/discount_net/stateProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if((vars.get("$field.DISCOUNT") || 0) > 0)
+{
+ state = neon.COMPONENTSTATE_READONLY;
+}
+result.string(state);
diff --git a/entity/Order_entity/entityfields/discount_net/titleProcess.js b/entity/Order_entity/entityfields/discount_net/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1fcc19648ab8c254dec9adf3ea45bf4bd12c7480
--- /dev/null
+++ b/entity/Order_entity/entityfields/discount_net/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY"));
+result.string(translate.withArguments("Discount in %0", [currency]));
diff --git a/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js b/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Order_entity/entityfields/discounted_net/stateProcess.js b/entity/Order_entity/entityfields/discounted_net/stateProcess.js
index 73fcdafe7c5bd47935d3f961a106bd995308316b..5a6fb24db9fc6226b60e8f57ea8560234976c17a 100644
--- a/entity/Order_entity/entityfields/discounted_net/stateProcess.js
+++ b/entity/Order_entity/entityfields/discounted_net/stateProcess.js
@@ -1,14 +1,10 @@
-import("system.vars");
-import("system.neon");
import("system.result");
+import("system.neon");
+import("system.vars");
-var discount = vars.get("$field.DISCOUNT");
-
-if(parseInt(discount) == 0 || !discount)
+var state = neon.COMPONENTSTATE_INVISIBLE;
+if((vars.get("$field.DISCOUNT") || 0) > 0)
{
- result.string(neon.COMPONENTSTATE_INVISIBLE);
+ state = neon.COMPONENTSTATE_READONLY;
}
-else
-{
- result.string(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
+result.string(state);
diff --git a/entity/Order_entity/entityfields/discounted_vat/stateProcess.js b/entity/Order_entity/entityfields/discounted_vat/stateProcess.js
deleted file mode 100644
index 73fcdafe7c5bd47935d3f961a106bd995308316b..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/discounted_vat/stateProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.vars");
-import("system.neon");
-import("system.result");
-
-var discount = vars.get("$field.DISCOUNT");
-
-if(parseInt(discount) == 0 || !discount)
-{
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
-else
-{
- result.string(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/gross/displayValueProcess.js b/entity/Order_entity/entityfields/gross/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Order_entity/entityfields/gross/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Order_entity/entityfields/net/displayValueProcess.js b/entity/Order_entity/entityfields/net/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f086986db455cffe066461c5b6575072f69915f
--- /dev/null
+++ b/entity/Order_entity/entityfields/net/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
diff --git a/entity/Order_entity/entityfields/net_aggregate/displayValueProcess.js b/entity/Order_entity/entityfields/net_aggregate/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f5588525c87828da34ddfda75321416af6420a8
--- /dev/null
+++ b/entity/Order_entity/entityfields/net_aggregate/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("system.translate");
+import("Util_lib");
+import("KeywordRegistry_basic");
+
+// TODO: add multicurrency support
+result.string(NumberUtils.formatWithCurrency(vars.get("$this.value"), translate.text("#,##0.00"), $KeywordRegistry.currency$eur()));
diff --git a/entity/Order_entity/entityfields/totalgross/documentation.adoc b/entity/Order_entity/entityfields/totalgross/documentation.adoc
deleted file mode 100644
index ef4fe9e600767286a8bca167aedd6c70c33530b3..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/totalgross/documentation.adoc
+++ /dev/null
@@ -1,6 +0,0 @@
-= TotalGross
-:hardbreaks:
-
-Contains the total gross of the order (net).
-This is calculated as follows: _NET_ + _VAT_.
-Both are calculated in *_Orderitem_entity_* at _onDBInsert_, _onDBUpdate_ and _onDBDelete_.
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/totalgross/valueProcess.js b/entity/Order_entity/entityfields/totalgross/valueProcess.js
deleted file mode 100644
index 2177ad85cf1f90944d9ef3dc5f5f546dda75c990..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/totalgross/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.eMath");
-
-var discount = vars.get("$field.DISCOUNT");
-var netValue = discount && parseInt(discount) != 0 ? vars.get("$field.DISCOUNTED_NET") : vars.get("$field.NET");
-var vatValue = discount && parseInt(discount) != 0 ? vars.get("$field.DISCOUNTED_VAT") : vars.get("$field.VAT");
-
-result.string(eMath.addDec(netValue, vatValue));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/vat/stateProcess.js b/entity/Order_entity/entityfields/vat/stateProcess.js
deleted file mode 100644
index 58cd7c749ad71ae22fb4df03fbd71aed82ed7b6e..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/vat/stateProcess.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-var discount = vars.get("$field.DISCOUNT");
-
-if(discount && parseInt(discount) != 0)
-{
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
-else
-{
- result.string(neon.COMPONENTSTATE_READONLY);
-}
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/onDBUpdate.js b/entity/Order_entity/recordcontainers/db/onDBUpdate.js
index 6775ae5411e9caadfbe13314c618d96468da8fee..8045dda78ef88bd99de81a46f827aec85311ec1c 100644
--- a/entity/Order_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Order_entity/recordcontainers/db/onDBUpdate.js
@@ -1,46 +1,3 @@
-import("Entity_lib");
-import("Order_lib");
-import("system.entities");
-import("system.vars");
import("Workflow_lib");
-var rowdata = vars.get("$local.rowdata");
-var oid = rowdata["SALESORDER.SALESORDERID"];
-
-if(vars.exists("$field.Links.deletedRows"))
-{
- // only if Links are aviable (e.g. if the Order is updated via write entities)
- var links = EntityConsumerRowsHelper.getCurrentConsumerRows("Links", ["OBJECT_ROWID", "OBJECT_TYPE", "SALESORDER_ID"]);
- OrderLinkUtils.handleLinks(links, oid, vars.get("$field.Links.deletedRows"));
-}
-
-if(vars.get("$field.DiscountChanged") == "true" && oid){
- var discount = rowdata["SALESORDER.DISCOUNT"];
- var oiUtils = new OrderItemUtils(oid);
-
- var vals = oiUtils.getNetAndVat();
- var discountedVals = OrderItemUtils.getDiscountedNet(null, oid, discount);
-
- let config = entities.createConfigForUpdatingRows();
- config.entity("Order_entity");
- if(discountedVals){
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1],
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else
- {
- config.fieldValues({
- "NET": vals[0],
- "VAT": vals[1]
- });
- }
-
- config.uid(oid);
- entities.updateRow(config);
-
-}
-WorkflowSignalSender.updated();
\ No newline at end of file
+WorkflowSignalSender.updated();
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/discount_net.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discount_net.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..21cd95654920bf164a41412ed2dc949af725fee6
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discount_net.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESORDER.NET * SALESORDER.DISCOUNT / 100");
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..f95e110f7ba8ca5a4dbf5d0dab191e3a17ef0ec6
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_net.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESORDER.NET - SALESORDER.NET * SALESORDER.DISCOUNT / 100");
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..d6de5c1251bb9360b79ed76acee49864dada78b3
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/gross.value/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+
+var maskingUtils = new SqlMaskingUtils();
+var discount = maskingUtils.isNull("SALESORDER.DISCOUNT", "0");
+result.string("SALESORDER.NET - SALESORDER.NET * " + discount + " / 100 + SALESORDER.VAT - SALESORDER.VAT * " + discount + " / 100");
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 331038500ab79b72c614ba764d1e0131baf93561..8dd222adc4a844ca934b63a4048abca7ca064880 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -23,9 +23,11 @@
</entityField>
<entityField>
<name>DISCOUNT</name>
- <title>Discount</title>
<contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
+ <outputFormat>0.00'%'</outputFormat>
+ <inputFormat>0.00</inputFormat>
+ <mandatory v="true" />
+ <titleProcess>%aditoprj%/entity/Orderitem_entity/entityfields/discount/titleProcess.js</titleProcess>
<onValidation>%aditoprj%/entity/Orderitem_entity/entityfields/discount/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -75,6 +77,8 @@
<title>Article</title>
<consumer>Products</consumer>
<linkedContext>Product</linkedContext>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
<onValueChangeTypes>
@@ -89,6 +93,7 @@
<contentType>NUMBER</contentType>
<minValue v="1" />
<outputFormat>#</outputFormat>
+ <mandatory v="true" />
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValueChangeTypes>
diff --git a/entity/Orderitem_entity/afterSave.js b/entity/Orderitem_entity/afterSave.js
index 7526b591eca1914fe359f020220ef00400c153af..b8fa6201ca83ed655de5d146734aaba9ae4d89de 100644
--- a/entity/Orderitem_entity/afterSave.js
+++ b/entity/Orderitem_entity/afterSave.js
@@ -1,10 +1,24 @@
import("system.neon");
import("system.vars");
+import("system.entities");
import("Order_lib");
-if(vars.get("$local.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$local.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
- oiUtils.reOrgItems();
- neon.refreshAll();
+ var oid = vars.get("$field.SALESORDER_ID");
+ var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
+ var cols = ["NET", "VAT"];
+ var oiUtils = new OrderItemUtils(oid);
+ var vals = oiUtils.getNetAndVat();
+
+ var fieldValues = {
+ NET: vals[0].toString(),
+ VAT: vals[1].toString()
+ };
+
+ var config = entities.createConfigForUpdatingRows();
+ config.entity("Order_entity");
+ config.uid(oid);
+ config.fieldValues(fieldValues);
+ entities.updateRow(config);
}
diff --git a/entity/Orderitem_entity/entityfields/discount/titleProcess.js b/entity/Orderitem_entity/entityfields/discount/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e31d4834c9c6aaafaaf857dc05c695f3825ccf49
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/discount/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Discount in %0", ["%"]));
diff --git a/entity/Orderitem_entity/entityfields/product_id/stateProcess.js b/entity/Orderitem_entity/entityfields/product_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d4ab30958b8f234408d03764ffba47d7264cf491
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/product_id/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js b/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
index f6df71bd95d805f8e687e7a99178f850456e0266..840086da698df0c69533689af55707871d2d5ac5 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js
@@ -15,20 +15,11 @@ if(oid != "")
deletedIds.push(oiid);
oiUtils.reOrgItems();
- var vals = oiUtils.getNetAndVat(deletedIds);
- var discountedVals = OrderItemUtils.getDiscountedNet(deletedIds, oid, discount);
-
+ var vals = oiUtils.getNetAndVat(deletedIds);
var fieldValues = {
NET: vals[0].toString(),
VAT: vals[1].toString()
};
- if(discountedVals)
- {
- Object.assign(fieldValues, {
- DISCOUNTED_NET: discountedVals[0].toString(),
- DISCOUNTED_VAT: discountedVals[1].toString()
- });
- }
var config = entities.createConfigForUpdatingRows();
config.entity("Order_entity");
diff --git a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
index d55c98c32667c0ecdbf17276410e01ff5a087553..b895f0d7cd0bd3edbf0cdc28a900204644013cd3 100644
--- a/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js
@@ -5,74 +5,43 @@ import("system.db");
import("system.neon");
import("Order_lib");
import("Sql_lib");
-
-var oid = vars.get("$field.SALESORDER_ID");
-if(oid != "")
-{
- if(!vars.get("$field.ITEMPOSITION").includes("."))//only the topItems affect the Order price
- {
- var discount = vars.exists("$param.Discount_param") ? vars.get("$param.Discount_param"): "";
- var cols = ["NET", "VAT"];
- var oiUtils = new OrderItemUtils(oid);
- var vals = oiUtils.getNetAndVat();
- var discountedVals = OrderItemUtils.getDiscountedNet(null, oid, discount);
-
- var fieldValues = {
- NET: vals[0].toString(),
- VAT: vals[1].toString()
- };
- if(discountedVals)
- {
- Object.assign(fieldValues, {
- DISCOUNTED_NET: discountedVals[0].toString(),
- DISCOUNTED_VAT: discountedVals[1].toString()
- });
- }
- var config = entities.createConfigForUpdatingRows();
- config.entity("Order_entity");
- config.uid(oid);
- config.fieldValues(fieldValues);
- entities.updateRow(config);
- }
-
- //this process get's executed for every child of this orderItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children
- if(vars.getString("$param.IgnoreOnUpdateProcess_param") != "true")
+//this process get's executed for every child of this orderItem since we use writeEntiy, so we use the param to make sure we don't execute it for the children
+if(vars.getString("$param.IgnoreOnUpdateProcess_param") != "true")
+{
+ var newQuanitity = parseFloat(vars.get("$field.QUANTITY"));
+ var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["SALESORDERITEM.QUANTITY"]);
+ var orderItemId = vars.get("$field.SALESORDERITEMID");
+ if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly
{
- var newQuanitity = parseFloat(vars.get("$field.QUANTITY"));
- var oldQuantity = parseFloat(vars.get("$local.initialRowdata")["SALESORDERITEM.QUANTITY"]);
- var orderItemId = vars.get("$field.SALESORDERITEMID");
- if(newQuanitity != oldQuantity) //quantity changed -> change quantities of the childitems accordingly
- {
- var multiplier = newQuanitity/oldQuantity;
+ var multiplier = newQuanitity/oldQuantity;
- var loadConfig = entities.createConfigForLoadingRows().entity("Orderitem_entity").addParameter("OrderId_param", oid).fields(["SALESORDERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"])
+ var loadConfig = entities.createConfigForLoadingRows().entity("Orderitem_entity").addParameter("OrderId_param", vars.get("$field.SALESORDER_ID")).fields(["SALESORDERITEMID", "ASSIGNEDTO", "PRODUCT_ID", "QUANTITY"])
- var rows = entities.getRows(loadConfig);
- var potentialAsignees = {};
- var orderItemsToUpdate = {};
- var statements = [];
- var stop = false;
- while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees
+ var rows = entities.getRows(loadConfig);
+ var potentialAsignees = {};
+ var orderItemsToUpdate = {};
+ var statements = [];
+ var stop = false;
+ while(stop == false)//we have too loop for all the rows for each row that needs updating, since those are also pontially asignees
+ {
+ stop = true;
+ for(var orderitem in rows)//loop trough all the rows and build orderItemsToUpdate
{
- stop = true;
- for(var orderitem in rows)//loop trough all the rows and build orderItemsToUpdate
+ if(!(rows[orderitem]["SALESORDERITEMID"] in orderItemsToUpdate) &&(rows[orderitem]["ASSIGNEDTO"] == orderItemId || rows[orderitem]["ASSIGNEDTO"] in potentialAsignees))
{
- if(!(rows[orderitem]["SALESORDERITEMID"] in orderItemsToUpdate) &&(rows[orderitem]["ASSIGNEDTO"] == orderItemId || rows[orderitem]["ASSIGNEDTO"] in potentialAsignees))
- {
- statements.push(
- newWhere("SALESORDERITEM.SALESORDERITEMID", rows[orderitem]["SALESORDERITEMID"]).buildUpdateStatement({
- "QUANTITY": parseInt(rows[orderitem]["QUANTITY"])*multiplier
- })
- );
- orderItemsToUpdate[rows[orderitem]["SALESORDERITEMID"]] = parseInt(rows[orderitem]["QUANTITY"])*multiplier;
- potentialAsignees[rows[orderitem]["SALESORDERITEMID"]] = "";
+ statements.push(
+ newWhere("SALESORDERITEM.SALESORDERITEMID", rows[orderitem]["SALESORDERITEMID"]).buildUpdateStatement({
+ "QUANTITY": parseInt(rows[orderitem]["QUANTITY"])*multiplier
+ })
+ );
+ orderItemsToUpdate[rows[orderitem]["SALESORDERITEMID"]] = parseInt(rows[orderitem]["QUANTITY"])*multiplier;
+ potentialAsignees[rows[orderitem]["SALESORDERITEMID"]] = "";
- stop = false;
- }
+ stop = false;
}
}
- db.execute(statements);// no write entity -> performance reason
}
+ db.execute(statements);// no write entity -> performance reason
}
}
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 2fd9e315e940660e3c243f9dee2285989548e27f..827bb80525331d0b4afdec30b9985622b26a8691 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -199,6 +199,10 @@
<name>ContactsMainCountry_param</name>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/contactsmaincountry_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/communications/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -795,7 +799,7 @@
</entityParameter>
<entityField>
<name>Information</name>
- <title>Commrestrictions</title>
+ <title>Information</title>
<color>$priority-high-color</color>
<valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/information/valueProcess.js</valueProcess>
</entityField>
@@ -1172,13 +1176,6 @@
<tooltip>Export fields of this table</tooltip>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
</entityActionField>
- <entityActionField>
- <name>startMarketingWorkflows</name>
- <title>Start marketing mailing</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:ENVELOPES</iconId>
- </entityActionField>
<entityActionField>
<name>addPlanningToOrganisations</name>
<title>Create planning</title>
@@ -1336,6 +1333,7 @@
</entityConsumer>
<entityConsumer>
<name>ContactCommunicationSettings</name>
+ <refreshParent v="true" />
<dependency>
<name>dependency</name>
<entityName>CommunicationSettings_entity</entityName>
@@ -1477,6 +1475,10 @@
<name>IsQuickEntry_param</name>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>OnlyNotInCampaignId_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js b/entity/Organisation_entity/entityfields/communications/children/objecttype_param/valueProcess.js
similarity index 100%
rename from entity/MarketingWorkflowLauncher_entity/entityfields/emailtemplates/children/comingfrom_param/valueProcess.js
rename to entity/Organisation_entity/entityfields/communications/children/objecttype_param/valueProcess.js
diff --git a/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js b/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
index 3649d90dc86045fca17c5a8d484118829f83119e..5cd5a05861692bafe1781c2751a6741148c8cdf4 100644
--- a/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/customercode_display_fieldgroup/valueProcess.js
@@ -1,4 +1,5 @@
import("system.vars");
import("system.result");
+import("system.translate");
-result.string("Kdnr: " + vars.getString("$field.CUSTOMERCODE"));
\ No newline at end of file
+result.string(translate.text("Cust.-No.") + ": " + vars.getString("$field.CUSTOMERCODE"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index 328ef725e8d1c646a39e15a2dfaa78a626b2a424..0f92e5c7591e73ac10824c67c770ef9bac2f92aa 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,4 +1,11 @@
import("Bulkmail_lib");
import("system.vars");
-BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
\ No newline at end of file
+if(vars.get("$sys.selectionsRecordsRecipe"))
+{
+ BulkMailUtils.openAddRecipientViewWithRecipe(vars.get("$sys.selectionsRecordsRecipe"));
+}
+else
+{
+ BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
+}
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
index d2b26e842b85f3da742191e8163d45b5078e3317..502b816a33188e51a2dead147cef66751ce19108 100644
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -2,11 +2,11 @@ import("system.vars");
import("system.neon");
import("Campaign_lib");
-var sysSelection = vars.get("$sys.selection");
+var selectionsRecordsRecipe = vars.get("$sys.selectionsRecordsRecipe");
-if(sysSelection.length > 0) //if data selected -> use selected data
+if(selectionsRecordsRecipe) //if data selected -> use selected data
{
- CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
+ CampaignUtils.addParticipantsByRecordsRecipe(selectionsRecordsRecipe, vars.get("$sys.currentcontextname"));
}
else //else -> use Filtercondition
{
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js
deleted file mode 100644
index 4fed7407fa53f2786ea2a229ed6414667217bf53..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.neonFilter");
-import("Context_lib");
-import("system.vars");
-import("system.neon");
-
-var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
- "ObjectIds_param": JSON.stringify(vars.get("$sys.selection")),
- "ObjectFilter_param": JSON.stringify(vars.get("$sys.filter")),
- "ObjectType_param": ContextUtils.getCurrentContextId()
-}).toString();
-neon.openContextWithRecipe("MarketingWorkflowLauncher", "MarketingWorkflowLauncherEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
diff --git a/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
index 0b40c848fa60b7da8c8d595cb20d5588634d897b..d96a095d6b79ce429fd23cf569cbf657be1c69ab 100644
--- a/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
@@ -1,4 +1,5 @@
-import("KeywordRegistry_basic");
import("system.result");
+import("KeywordRegistry_basic");
-result.object([]);
\ No newline at end of file
+var excludedIds = [$KeywordRegistry.contactStatus$markToDelete()];
+result.string(JSON.stringify(excludedIds));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js b/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js
deleted file mode 100644
index 17dc629c2371efc399be5f7d143f3533fae661e1..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/newsupportticket/onActionProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("Ticket_lib");
-
-
-TicketUtils.openNewSupportticketWithLinks( [["Organisation", vars.get( "$field.CONTACTID")]]);
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
index 2d3417abfe5d5281f33a0b8ae7fffa39676ff853..c890b789cc923bfcc43a22af3ba89a4ab352cf24 100644
--- a/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Organisation_entity/recordcontainers/db/conditionProcess.js
@@ -61,4 +61,14 @@ if (vars.exists("$param.OnlyOwnSupervised_param") && vars.get("$param.OnlyOwnSup
SqlBuilder.EXISTS()
);
}
+
+if (vars.get("$param.OnlyNotInCampaignId_param"))
+{
+ cond.and(null,newSelect("1")
+ .from("CAMPAIGNPARTICIPANT")
+ .where("CAMPAIGNPARTICIPANT.CONTACT_ID = CONTACT.CONTACTID")
+ .and("CAMPAIGNPARTICIPANT.CAMPAIGN_ID","$param.OnlyNotInCampaignId_param"),
+ SqlBuilder.NOT_EXISTS()
+ );
+}
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
index cb4a6f482b82a7f0c2b321145999397dd7dfd9d2..6679d8361ac6d15934afa444aac083479043fe83 100644
--- a/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Organisation_entity/recordcontainers/db/onDBDelete.js
@@ -13,7 +13,7 @@ new AttributeRelationQuery(contactId, null, ContextUtils.getCurrentContextId())
.deleteAllAttributes();
newWhere("COMMUNICATION.OBJECT_ROWID", contactId)
-.and("COMMUNICATION.OBJECT_TYPE", "Contact").deleteData();
+.and("COMMUNICATION.OBJECT_TYPE", "Organisation").deleteData();
newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
newWhere("COMMUNICATIONSETTINGS.CONTACT_ID", contactId).deleteData();
newWhere("CLASSIFICATIONSTORAGE.OBJECT_ROWID", contactId).deleteData();
diff --git a/entity/Organisation_entity/recordcontainers/index/affectedIds.js b/entity/Organisation_entity/recordcontainers/index/affectedIds.js
index d605d80d16194756cff26954cce949d3cf19232f..dc7777632a4e49c6ca644d58e27f029da8c34a81 100644
--- a/entity/Organisation_entity/recordcontainers/index/affectedIds.js
+++ b/entity/Organisation_entity/recordcontainers/index/affectedIds.js
@@ -50,7 +50,7 @@ switch (tableName)
return newSelect("COMMUNICATION.OBJECT_ROWID")
.from("COMMUNICATION")
.where("COMMUNICATION.COMMUNICATIONID", id)
- .and("COMMUNICATION.OBJECT_TYPE", "Contact")
+ .and("COMMUNICATION.OBJECT_TYPE", "Organisation")
.arrayColumn();
});
break;
diff --git a/entity/Organisation_entity/recordcontainers/index/query.js b/entity/Organisation_entity/recordcontainers/index/query.js
index c97df73e43f9f97668daf56e63a85231203c4dd1..b13427fde54d1b867866f3431d59c18a075a6416 100644
--- a/entity/Organisation_entity/recordcontainers/index/query.js
+++ b/entity/Organisation_entity/recordcontainers/index/query.js
@@ -1,3 +1,4 @@
+import("system.translate");
import("Organisation_lib");
import("KeywordRegistry_basic");
import("system.translate");
@@ -47,19 +48,19 @@ var querySelect = newSelect([
.join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
.leftJoin("ADDRESS", "standardAddress.ADDRESSID = CONTACT.ADDRESS_ID", "standardAddress")
.leftJoin("COMMUNICATION", newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID")
- .and("COMMUNICATION.OBJECT_TYPE", "Contact")
+ .and("COMMUNICATION.OBJECT_TYPE", "Organisation")
)
//standardMail is not multi valued and can only old one value (the standard email address)
.leftJoin("COMMUNICATION", newWhere("standardEmail.OBJECT_ROWID = CONTACT.CONTACTID")
.and(["COMMUNICATION", "MEDIUM_ID", "standardEmail"], commMediumMailIds, SqlBuilder.IN())
.and(["COMMUNICATION", "ISSTANDARD", "standardEmail"], "1")
- .and(["COMMUNICATION", "OBJECT_TYPE", "standardEmail"], "Contact")
+ .and(["COMMUNICATION", "OBJECT_TYPE", "standardEmail"], "Organisation")
, "standardEmail")
//standardPhone is not multi valued and can only old one value (the standard phone number)
.leftJoin("COMMUNICATION", newWhere("standardPhone.OBJECT_ROWID = CONTACT.CONTACTID")
.and(["COMMUNICATION", "MEDIUM_ID", "standardPhone"], commMediumPhoneIds, SqlBuilder.IN())
.and(["COMMUNICATION", "ISSTANDARD", "standardPhone"], "1")
- .and(["COMMUNICATION", "OBJECT_TYPE", "standardPhone"], "Contact")
+ .and(["COMMUNICATION", "OBJECT_TYPE", "standardPhone"], "Organisation")
, "standardPhone")
.where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
.and("ORGANISATION.ORGANISATIONID", OrgUtils.getPrivateOrganisationId(), SqlBuilder.NOT_EQUAL())
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 0a84080c9f8896c00a574db0773b24eb31f3db2b..482f939243f6babf1f4767cefb2e68a17b2cf774 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -405,7 +405,6 @@
<name>STANDARD_PHONE_COMMUNICATION</name>
<title>Phone</title>
<consumer>PhoneCommunications</consumer>
- <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/displayValueProcess.js</displayValueProcess>
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
@@ -1141,13 +1140,6 @@
<iconId>VAADIN:PLAY</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/startmultipleworkflows/stateProcess.js</stateProcess>
</entityActionField>
- <entityActionField>
- <name>startMarketingWorkflows</name>
- <title>Start marketing mailing</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:ENVELOPES</iconId>
- </entityActionField>
<entityActionField>
<name>addToContactSync</name>
<title>add Contact to Sync</title>
@@ -1393,6 +1385,10 @@
<name>contenttitle</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/contenttitle/valueProcess.js</valueProcess>
</entityField>
+ <entityParameter>
+ <name>OnlyNotInCampaignId_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/communications/children/objecttype_param/valueProcess.js b/entity/Person_entity/entityfields/communications/children/objecttype_param/valueProcess.js
index ba7bafab2a729e4ffb85684eb424dda2712c9bba..cc6924394ae950c43386275dda2c8db5d7a9c0ed 100644
--- a/entity/Person_entity/entityfields/communications/children/objecttype_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/communications/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("Communication_lib");
+import("Context_lib");
import("system.result");
-result.string(CommUtil.defaultObjectType());
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/emailcommunications/children/objecttype_param/valueProcess.js b/entity/Person_entity/entityfields/emailcommunications/children/objecttype_param/valueProcess.js
index ba7bafab2a729e4ffb85684eb424dda2712c9bba..cc6924394ae950c43386275dda2c8db5d7a9c0ed 100644
--- a/entity/Person_entity/entityfields/emailcommunications/children/objecttype_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/emailcommunications/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("Communication_lib");
+import("Context_lib");
import("system.result");
-result.string(CommUtil.defaultObjectType());
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
index 328ef725e8d1c646a39e15a2dfaa78a626b2a424..7584ac5f5fc439abe65a7deddfdffa92ef354bdd 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -1,4 +1,11 @@
import("Bulkmail_lib");
import("system.vars");
-BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
\ No newline at end of file
+if(vars.get("$sys.selectionsRecordsRecipe"))
+{
+ BulkMailUtils.openAddRecipientViewWithRecipe(vars.get("$sys.selectionsRecordsRecipe"));
+}
+else
+{
+ BulkMailUtils.openAddRecipientView(vars.get("$sys.currentcontextname"), vars.get("$sys.selection"), vars.get("$sys.filter"));
+}
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
index dec741db1e10a5a36746e87da2b3496c02665940..44e828e62b4d1a991ddc4b8ba805ec44db8d64b8 100644
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
@@ -2,13 +2,11 @@ import("system.vars");
import("system.neon");
import("Campaign_lib");
-var sysSelection = vars.get("$sys.selection");
-
-if(sysSelection.length > 0) //if data selected -> use selected data
+if (vars.get("$sys.selectionsRecordsRecipe"))
{
- CampaignUtils.addParticipantsByRowIds(JSON.stringify(sysSelection), vars.get("$sys.currentcontextname"));
+ CampaignUtils.addParticipantsByRecordsRecipe(vars.get("$sys.selectionsRecordsRecipe"));
}
-else //else -> use Filtercondition
+else
{
let sysFilter = vars.get("$sys.filter");//todo change name
CampaignUtils.addParticipantsByCondition(JSON.stringify(sysFilter), vars.get("$sys.currentcontextname"));
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js
deleted file mode 100644
index 4fed7407fa53f2786ea2a229ed6414667217bf53..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/filterviewactiongroup/children/startmarketingworkflows/onActionProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.neonFilter");
-import("Context_lib");
-import("system.vars");
-import("system.neon");
-
-var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
- "ObjectIds_param": JSON.stringify(vars.get("$sys.selection")),
- "ObjectFilter_param": JSON.stringify(vars.get("$sys.filter")),
- "ObjectType_param": ContextUtils.getCurrentContextId()
-}).toString();
-neon.openContextWithRecipe("MarketingWorkflowLauncher", "MarketingWorkflowLauncherEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
diff --git a/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js b/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
index 0b40c848fa60b7da8c8d595cb20d5588634d897b..d96a095d6b79ce429fd23cf569cbf657be1c69ab 100644
--- a/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/keywordcontactstates/children/blacklistids_param/valueProcess.js
@@ -1,4 +1,5 @@
-import("KeywordRegistry_basic");
import("system.result");
+import("KeywordRegistry_basic");
-result.object([]);
\ No newline at end of file
+var excludedIds = [$KeywordRegistry.contactStatus$markToDelete()];
+result.string(JSON.stringify(excludedIds));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/phonecommunications/children/objecttype_param/valueProcess.js b/entity/Person_entity/entityfields/phonecommunications/children/objecttype_param/valueProcess.js
index ba7bafab2a729e4ffb85684eb424dda2712c9bba..cc6924394ae950c43386275dda2c8db5d7a9c0ed 100644
--- a/entity/Person_entity/entityfields/phonecommunications/children/objecttype_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/phonecommunications/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("Communication_lib");
+import("Context_lib");
import("system.result");
-result.string(CommUtil.defaultObjectType());
\ No newline at end of file
+result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js b/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
index 5ba71cce2110bd392449f73860814559c1df7017..aadd79eaa5afa639bf65d9acf9db4c2f166a41fc 100644
--- a/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
+++ b/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("Entity_lib");
diff --git a/entity/Person_entity/recordcontainers/db/conditionProcess.js b/entity/Person_entity/recordcontainers/db/conditionProcess.js
index c24eb7b7e0e4ffb85e6660796fabfe866ec6129d..3947bd9538e6db4495a9f9627b3ff477a746ff70 100644
--- a/entity/Person_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/conditionProcess.js
@@ -8,6 +8,9 @@ import("system.vars");
import("system.db");
import("system.result");
import("Sql_lib");
+import("system.neonFilter");
+
+var myEntityRecordsRecipe = neonFilter.createEntityRecordsRecipeBuilder()
var cond = newWhereIfSet("CONTACT.ORGANISATION_ID", "$param.OrgId_param")
.andIfSet("CONTACT.CONTACTID", "$param.ContactId_param");
@@ -45,4 +48,14 @@ if (vars.exists("$param.OnlyOwnSupervised_param") && vars.get("$param.OnlyOwnSup
);
}
+if (vars.get("$param.OnlyNotInCampaignId_param"))
+{
+ cond.and(null,newSelect("1")
+ .from("CAMPAIGNPARTICIPANT")
+ .where("CAMPAIGNPARTICIPANT.CONTACT_ID = CONTACT.CONTACTID")
+ .and("CAMPAIGNPARTICIPANT.CAMPAIGN_ID","$param.OnlyNotInCampaignId_param"),
+ SqlBuilder.NOT_EXISTS()
+ );
+}
+
result.string(cond.toString());
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBDelete.js b/entity/Person_entity/recordcontainers/db/onDBDelete.js
index 601012d832f38f2d49b844fce4072fa9c21f8c9b..57f264aa7f27abcdf7fd9d599c7d9d3ce8d0ff2c 100644
--- a/entity/Person_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Person_entity/recordcontainers/db/onDBDelete.js
@@ -14,7 +14,7 @@ new AttributeRelationQuery(contactId, null, context)
.deleteAllAttributes();
newWhere("COMMUNICATION.OBJECT_ROWID", contactId)
- .and("COMMUNICATION.OBJECT_TYPE", "Contact").deleteData();
+ .and("COMMUNICATION.OBJECT_TYPE", "Person").deleteData();
newWhere("ADDRESS.CONTACT_ID", contactId).deleteData();
newWhere("COMMUNICATIONSETTINGS.CONTACT_ID", contactId).deleteData();
newWhere("AB_APPOINTMENTLINK.OBJECT_TYPE", context)
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/campaigns/filterConditionProcess.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/campaigns/filterConditionProcess.js
index 7217d840fee842a5ba7e90b24829446b93fcf038..84ffbb8761e7072c71878d0329e90ab1d4262bc1 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/campaigns/filterConditionProcess.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/campaigns/filterConditionProcess.js
@@ -3,10 +3,11 @@ import("Sql_lib");
import("system.result");
result.string(newWhere("CONTACT.PERSON_ID",
- newSelect("SALESORDER.CONTACT_ID")
+ newSelect("CAMPAIGNPARTICIPANT.CONTACT_ID")
.from("CONTACT")
- .join("SALESORDER",
- newWhere("CONTACT.CONTACTID = SALESORDER.CONTACT_ID"))
+ .join("CAMPAIGNPARTICIPANT",
+ newWhere("CONTACT.CONTACTID = CAMPAIGNPARTICIPANT.CONTACT_ID"))
+ .join("CAMPAIGN", "CAMPAIGNPARTICIPANT.CAMPAIGN_ID = CAMPAIGN.CAMPAIGNID")
.whereIfSet(vars.get("$local.condition")),
SqlBuilder.IN())
.toString());
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/index/affectedIds.js b/entity/Person_entity/recordcontainers/index/affectedIds.js
index 24d86887247c81d2a48a5b189c80b61384483c19..a56089a0a676f3faad2d9e39bbf4b48d69c81788 100644
--- a/entity/Person_entity/recordcontainers/index/affectedIds.js
+++ b/entity/Person_entity/recordcontainers/index/affectedIds.js
@@ -61,7 +61,7 @@ switch (tableName)
return newSelect("COMMUNICATION.OBJECT_ROWID")
.from("COMMUNICATION")
.where("COMMUNICATION.COMMUNICATIONID", id)
- .and("COMMUNICATION.OBJECT_TYPE", "Contact")
+ .and("COMMUNICATION.OBJECT_TYPE", "Person")
.arrayColumn();
});
break;
diff --git a/entity/Person_entity/recordcontainers/index/query.js b/entity/Person_entity/recordcontainers/index/query.js
index 81e9797bc67ff2beab69793070af4c9febe6e61c..3d0ce5dab69a32dfc745c66730a2130f0e48ead4 100644
--- a/entity/Person_entity/recordcontainers/index/query.js
+++ b/entity/Person_entity/recordcontainers/index/query.js
@@ -48,11 +48,11 @@ var querySelect = newSelect([
.leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
.leftJoin("COMMUNICATION", newWhere("email.OBJECT_ROWID = CONTACT.CONTACTID")
.and(["COMMUNICATION", "MEDIUM_ID", "email"], commMediumEmailIds, SqlBuilder.IN())
- .and(["COMMUNICATION", "OBJECT_TYPE", "email"], "Contact")
+ .and(["COMMUNICATION", "OBJECT_TYPE", "email"], "Person")
.and(["COMMUNICATION", "ISSTANDARD", "email"], "1"), "email")
.leftJoin("COMMUNICATION", newWhere("phone.OBJECT_ROWID = CONTACT.CONTACTID")
.and(["COMMUNICATION", "MEDIUM_ID", "phone"], commMediumPhoneIds, SqlBuilder.IN())
- .and(["COMMUNICATION", "OBJECT_TYPE", "phone"], "Contact")
+ .and(["COMMUNICATION", "OBJECT_TYPE", "phone"], "Person")
.and(["COMMUNICATION", "ISSTANDARD", "phone"], "1"), "phone")
.where("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 2cc4ae001df0fc3f0c49ca346d6ff4fdab3b273c..ead47cfc2b7ce1a9f304350248ad64201065a2a0 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -124,16 +124,6 @@
<title>Unit</title>
<state>READONLY</state>
</entityField>
- <entityField>
- <name>currentPurchasePrice</name>
- <title>Curr. purchase price</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>currentSalesPrice</name>
- <title>Curr. sales price</title>
- <state>READONLY</state>
- </entityField>
<entityField>
<name>PARENT_ID</name>
</entityField>
@@ -144,6 +134,16 @@
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
+ <entityField>
+ <name>currentSalesPrice</name>
+ <title>Curr. sales price</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>currentPurchasePrice</name>
+ <title>Curr. purchase price</title>
+ <state>READONLY</state>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Prod2prod_entity/entityfields/source_id/onValueChange.js b/entity/Prod2prod_entity/entityfields/source_id/onValueChange.js
index 498192c6dc9e096ec2f225e2c5bad1234bc17305..6b7340b99f92da214cf9f70f511e441c2d15ec55 100644
--- a/entity/Prod2prod_entity/entityfields/source_id/onValueChange.js
+++ b/entity/Prod2prod_entity/entityfields/source_id/onValueChange.js
@@ -1,3 +1,5 @@
+import("system.eMath");
+import("Util_lib");
import("system.text");
import("Product_lib");
import("KeywordRegistry_basic");
@@ -6,25 +8,187 @@ import("Sql_lib");
import("system.vars");
import("system.neon");
-var productId = vars.get("$local.value");
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var buyPrice = "";
+ var sellPrice = "";
+ var productId = vars.get("$local.value");
+
+ var unit = newSelect(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "PRODUCT.UNIT"))
+ .from("PRODUCT")
+ .where("PRODUCT.PRODUCTID", productId)
+ .cell();
+ var data = "";
+ var purchasePrice = ProductUtils.getCurrentProductPrice(productId, "PP", true);
+ if (purchasePrice.length > 0)
+ {
+ purchasePrice = text.formatDouble(purchasePrice[0], "#,##0.00", true) + " " + purchasePrice[1];
+ }
+ else
+ {
+ let calcPrices = _calcPrices();
+ buyPrice = calcPrices["buyPrice"];
+ sellPrice = calcPrices["sellPrice"];
+ purchasePrice = buyPrice;
+ }
-var unit = newSelect(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.quantityUnit(), "PRODUCT.UNIT"))
- .from("PRODUCT")
- .where("PRODUCT.PRODUCTID", productId)
- .cell();
+ var salesPrice = ProductUtils.getCurrentProductPrice(productId, "SP", true);
+ if (salesPrice.length > 0)
+ {
+ salesPrice = text.formatDouble(salesPrice[0], "#,##0.00", true) + " " + salesPrice[1];
+ }
+ else
+ {
+ if(Utils.isNullOrEmptyString(data))
+ {
+ let calcPrices = _calcPrices();
+ buyPrice = calcPrices["buyPrice"];
+ sellPrice = calcPrices["sellPrice"];
+ }
+ salesPrice = sellPrice;
+ }
+
+ neon.setFieldValue("$field.unit", unit);
+ neon.setFieldValue("$field.currentPurchasePrice", purchasePrice);
+ neon.setFieldValue("$field.currentSalesPrice", salesPrice);
+}
-var purchasePrice = ProductUtils.getCurrentProductPrice(productId, "PP", true);
-if (purchasePrice.length > 0)
+/*
+* Recursive function that retuns the childs of a product parts list
+*
+* @param {String} pId - uid value
+*
+* @param {String} pProductId product id
+*
+* @param {Integer} pMaxRecursion max recursion
+*
+* @return {Array} Childs
+ */
+function _getChilds(pId, pProductId, pMaxRecursion)
{
- purchasePrice = text.formatDouble(purchasePrice[0], "#,##0.00", true) + " " + purchasePrice[1];
+ if(pMaxRecursion == 0)
+ {
+ return [];
+ }
+ var items = prod2prod.filter(function(p2p) {
+ return p2p[5] == pProductId;
+ });
+ var itemChilds = [];
+ items.forEach(function(p2p) {
+ p2p[2] = pId;
+ itemChilds.push(_getChilds(p2p[0], p2p[3], pMaxRecursion - 1));
+ });
+ return Array.prototype.concat.apply(items, itemChilds);
}
-var salesPrice = ProductUtils.getCurrentProductPrice(productId, "SP", true);
-if (salesPrice.length > 0)
+/*
+* Caclulates the prace of pProdId by adding up the child prices
+*
+* @param {String} pProdId - uid value
+*
+* @param {String} pProductAndChildProducts product id
+*
+* @param {Integer} pPpSp buy/sell possible values: "PP", "SP"
+*
+* @return {String} Price
+ */
+function _calculatePriceFromChildren(pProdId, pProductAndChildProducts, pPpSp)
{
- salesPrice = text.formatDouble(salesPrice[0], "#,##0.00", true) + " " + salesPrice[1];
+ var children = pProductAndChildProducts[pProdId];
+ var price = "";
+ if(children != undefined)
+ {
+ for (let i = 0; i < children.length; i++)
+ {
+ let childProdId = children[i];
+ childPrice = productPrices[childProdId][pPpSp];
+ if(childPrice && Utils.isNotNullOrEmptyString(childPrice))
+ {
+
+ if(price == "")
+ {
+ price = 0;
+ }
+ price = eMath.addDec(price, childPrice);
+ }
+ }
+ }
+ return price;
}
-neon.setFieldValue("$field.unit", unit);
-neon.setFieldValue("$field.currentPurchasePrice", purchasePrice);
-neon.setFieldValue("$field.currentSalesPrice", salesPrice);
\ No newline at end of file
+/*
+* Caclulates the buy and sales prices for the current product
+*
+* @return {Object} Object with buyPrice and sellPrice.
+ */
+function _calcPrices()
+{
+ var sqlMask = new SqlMaskingUtils();
+ prod2prod = newSelect([
+ "PROD2PROD.PROD2PRODID", // UID.value
+ "PROD2PROD.PROD2PRODID", // PROD2PRODID.value
+ "''", // PARENT_ID.value
+ "PROD2PROD.SOURCE_ID", // SOURCE_ID.value
+ "PRODUCT.PRODUCTNAME", // SOURCE_ID.displayValue
+ "PROD2PROD.DEST_ID", // DEST_ID.value
+ ]).from("PROD2PROD")
+ .join("PRODUCT", "PRODUCT.PRODUCTID = PROD2PROD.SOURCE_ID")
+ .where("PROD2PROD.SOURCE_ID", vars.get("$local.value"))
+ .or("PROD2PROD.DEST_ID", vars.get("$local.value"))
+ .table();
+
+ data = _getChilds(null, vars.get("$local.value"), 20)
+ var productAndChildProducts = {};
+ var productPrices = {};
+
+ for(var i = data.length - 1; i >= 0; i--)//loop backwards
+ {
+ var productId = data[i][3];
+ var prodId = data[i][0];
+ var parentId = data[i][2];
+
+ if(!productAndChildProducts.hasOwnProperty(parentId))
+ {
+ productAndChildProducts[parentId] = [prodId];
+ }
+ else
+ {
+ productAndChildProducts[parentId].push(prodId);
+ }
+
+ productPrices[prodId] = {};
+
+ var purchasePrice = ProductUtils.getCurrentProductPrice(productId, "PP", true);
+ productPrices[prodId]["PP"] = purchasePrice.length == 0 ? _calculatePriceFromChildren(prodId, productAndChildProducts, "PP") : purchasePrice[0];
+
+ var salesPrice = ProductUtils.getCurrentProductPrice(productId, "SP", true);
+ productPrices[prodId]["SP"] = salesPrice.length == 0 ? _calculatePriceFromChildren(prodId, productAndChildProducts, "SP") : salesPrice[0];
+
+ }
+
+ for (i = 0; i < productAndChildProducts[null].length; i++)
+ {
+ var currentProdId = productAndChildProducts[null][i];
+
+ if(Utils.isNotNullOrEmptyString(productPrices[currentProdId]["PP"]))
+ {
+ buyPrice = eMath.addDec(buyPrice, productPrices[currentProdId]["PP"]);
+ }
+ if(Utils.isNotNullOrEmptyString(productPrices[currentProdId]["SP"]))
+ {
+ sellPrice = eMath.addDec(sellPrice, productPrices[currentProdId]["SP"]);
+ }
+ }
+ buyPrice =(
+ Utils.isNullOrEmptyString(buyPrice) ? "" :
+ text.formatDouble(buyPrice, "#,##0.00", true) + " " + "Euro"
+ );
+
+ sellPrice =(
+ Utils.isNullOrEmptyString(sellPrice) ? "" :
+ text.formatDouble(sellPrice, "#,##0.00", true) + " " + "Euro"
+ );
+
+ return {"buyPrice": buyPrice
+ , "sellPrice": sellPrice};
+}
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
index 9c60cc28a8c3905a4c3419520d44bdb5ac1ea277..42e34ece3d422f06fee8f846dc94ebeb54cb88e4 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,5 @@
+import("system.eMath");
+import("Util_lib");
import("Product_lib");
import("system.text");
import("system.neon");
@@ -31,23 +33,68 @@ var query = newSelect([
.join("PRODUCT", "PRODUCT.PRODUCTID = PROD2PROD.SOURCE_ID");
function _returnData(data) {
- for(let i = 0; i < data.length; i++)
+
+ var productAndChildProducts = {};
+ var productPrices = {};
+ function _calculatePriceFromChildren(pProdId, pParentId, pPpSp)
+ {
+ var children = productAndChildProducts[pProdId];
+ var price = "";
+ if(children != undefined)
+ {
+ for (let i = 0; i < children.length; i++)
+ {
+ let childProdId = children[i];
+ childPrice = productPrices[childProdId][pPpSp];
+ if(childPrice && Utils.isNotNullOrEmptyString(childPrice))
+ {
+
+ if(price == "")
+ {
+ price = 0;
+ }
+ price = eMath.addDec(price, childPrice);
+ }
+ }
+ }
+ return price;
+ }
+
+ for(var i = data.length - 1; i >= 0; i--)//loop backwards
{
var productId = data[i][3];
+ var prodId = data[i][0];
+ var parentId = data[i][2];
+
+ if(!productAndChildProducts.hasOwnProperty(parentId))
+ {
+ productAndChildProducts[parentId] = [prodId];
+ }
+ else
+ {
+ productAndChildProducts[parentId].push(prodId);
+ }
+
+ productPrices[prodId] = {};
- // currentPurchasePrice.value
var purchasePrice = ProductUtils.getCurrentProductPrice(productId, "PP", true);
+ productPrices[prodId]["PP"] = purchasePrice.length == 0 ? _calculatePriceFromChildren(prodId, parentId, "PP") : purchasePrice[0];
+
+ var salesPrice = ProductUtils.getCurrentProductPrice(productId, "SP", true);
+ productPrices[prodId]["SP"] = salesPrice.length == 0 ? _calculatePriceFromChildren(prodId, parentId, "SP") : salesPrice[0];
+
+ // currentPurchasePrice.value
data[i].push(
- purchasePrice.length == 0 ? "" :
- text.formatDouble(purchasePrice[0], "#,##0.00", true) + " " + purchasePrice[1]
+ Utils.isNullOrEmptyString(productPrices[prodId]["PP"]) ? "" :
+ text.formatDouble(productPrices[prodId]["PP"], "#,##0.00", true) + " " + "Euro"
);
// currentSalesPrice.value
- var salesPrice = ProductUtils.getCurrentProductPrice(productId, "SP", true);
data[i].push(
- salesPrice.length == 0 ? "" :
- text.formatDouble(salesPrice[0], "#,##0.00", true) + " " + salesPrice[1]
+ Utils.isNullOrEmptyString(productPrices[prodId]["SP"]) ? "" :
+ text.formatDouble(productPrices[prodId]["SP"], "#,##0.00", true) + " " + "Euro"
);
+
}
result.object(data);
}
@@ -76,4 +123,4 @@ else
return Array.prototype.concat.apply(items, itemChilds);
}
_returnData(_getChilds(null, vars.get("$param.ProductId_param"), 20));
-}
+}
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index fc9512094087826d276c307fbbc449ab39e7f3bf..7728993394bca056b90ca981352be7b5bd84e40c 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -697,7 +697,6 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS_TILEVIEW.displayValue</name>
- <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/statustileview.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ADVERTISING_TILEVIEW.value</name>
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 0db66c9d524d439aaf80431e2d60789bc181eb30..a081ee4d02e6b532a138f30a8be320a9031b97e7 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -32,7 +32,7 @@
<children>
<entityParameter>
<name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+ <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/communications/children/objectrowid_param/valueProcess.js</valueProcess>
</entityParameter>
<entityParameter>
<name>ObjectType_param</name>
@@ -233,7 +233,7 @@
<documentation>%aditoprj%/entity/QuickEntry_entity/entityfields/personcontactids_param/documentation.adoc</documentation>
</entityParameter>
<entityConsumer>
- <name>Service tickets</name>
+ <name>ServiceTickets</name>
<dependency>
<name>dependency</name>
<entityName>SupportTicket_entity</entityName>
diff --git a/entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
similarity index 100%
rename from entity/QuickEntry_entity/entityfields/communications/children/contactid_param/valueProcess.js
rename to entity/QuickEntry_entity/entityfields/communications/children/objectrowid_param/valueProcess.js
diff --git a/entity/QuickEntry_entity/entityfields/communications/children/objecttype_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/communications/children/objecttype_param/valueProcess.js
index ba7bafab2a729e4ffb85684eb424dda2712c9bba..80f4b7a29e32b3730977de06a084d4a82803df8b 100644
--- a/entity/QuickEntry_entity/entityfields/communications/children/objecttype_param/valueProcess.js
+++ b/entity/QuickEntry_entity/entityfields/communications/children/objecttype_param/valueProcess.js
@@ -1,4 +1,14 @@
+import("Util_lib");
+import("system.vars");
import("Communication_lib");
import("system.result");
-result.string(CommUtil.defaultObjectType());
\ No newline at end of file
+
+var type = "Organisation";
+//in the first step the communications will be set for the first person
+if(Utils.toBoolean(vars.get("$field.onlyPerson")))
+{
+ type = "Person"
+}
+
+result.string(type);
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js
index dc28dd1668428cd72a6afb49c02147bd36f8ba42..e0f3ec47e2b963a577204e41d9847dd6ad0725a8 100644
--- a/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js
+++ b/entity/QuickEntry_entity/entityfields/servicetickets/children/returnempty_param/valueProcess.js
@@ -1,4 +1,3 @@
import("system.result");
-
-result.string( false);
\ No newline at end of file
+result.string(false);
\ No newline at end of file
diff --git a/entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js
deleted file mode 100644
index b691020ed6224d159383287eb2b841b9d5d225bd..0000000000000000000000000000000000000000
--- a/entity/QuickEntry_entity/entityfields/supporttickets/children/returnempty_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-
-
-result.string( true);
\ No newline at end of file
diff --git a/entity/SalesprojectMilestone_entity/entityfields/kind/displayValueProcess.js b/entity/SalesprojectMilestone_entity/entityfields/kind/displayValueProcess.js
index 3226a4d4661ac80f360bb7f2f9c10cfbc8ca758b..06e348250789097cb4e37b35a36a9b901e771de7 100644
--- a/entity/SalesprojectMilestone_entity/entityfields/kind/displayValueProcess.js
+++ b/entity/SalesprojectMilestone_entity/entityfields/kind/displayValueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("system.vars");
import("Keyword_lib");
-result.string(KeywordUtils.getTranslatedContainer(vars.get("$field.KIND")));
\ No newline at end of file
+result.string(KeywordUtils.getTranslatedContainer(vars.get("$this.value")));
diff --git a/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/titleProcess.js b/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/titleProcess.js
index 38663022e20ea6ef8cbaedf0f49a27f94d93faaf..2353be00031e7e76fff02b6dd57af8b8d85ca789 100644
--- a/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/titleProcess.js
+++ b/entity/SalesprojectMilestone_entity/entityfields/milestonevalue/titleProcess.js
@@ -1,10 +1,11 @@
+import("system.result");
import("system.vars");
import("system.translate");
-import("system.result");
+import("Keyword_lib");
-if (vars.get("$field.KIND"))
+var title = translate.text("Milestones");
+if(vars.get("$field.KIND"))
{
- result.string(translate.text(vars.get("$field.KIND")));
+ title = KeywordUtils.getTranslatedContainer(vars.get("$field.KIND"));
}
-else
- result.string(translate.text("Milestones"));
\ No newline at end of file
+result.string(title);
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 464a1d783eed5d9cf959821370b01b2252afc7ec..1c0742ac86d5cca3aa70678a472a0c10ffd04f99 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -140,7 +140,9 @@
<maxValue v="100" />
<minValue v="0" />
<outputFormat>0'%'</outputFormat>
+ <inputFormat>0'%'</inputFormat>
<groupable v="true" />
+ <mandatory v="true" />
</entityField>
<entityConsumer>
<name>SalesprojectSources</name>
@@ -1104,7 +1106,6 @@
<aggregateFieldDbMapping>
<name>volumeWeighted_aggregate.value</name>
<expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volumeweighted_aggregate.value/expression.js</expression>
- <aggregateType>AVG</aggregateType>
</aggregateFieldDbMapping>
<dbRecordFieldMapping>
<name>MST_TEAM_ID.displayValue</name>
@@ -1122,6 +1123,10 @@
<name>USER_NEW.value</name>
<recordfield>SALESPROJECT.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PROBABILITY.displayValue</name>
+ <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>VOLUME.displayValue</name>
</dbRecordFieldMapping>
diff --git a/entity/Salesproject_entity/onValidation.js b/entity/Salesproject_entity/onValidation.js
index ffe29cce81f26b649d2866fd163f7600df045eb9..de922a24e2c75237fdf8910af75d02c60d55e87b 100644
--- a/entity/Salesproject_entity/onValidation.js
+++ b/entity/Salesproject_entity/onValidation.js
@@ -6,7 +6,11 @@ import("system.vars");
var startDate = vars.get("$field.STARTDATE");
var endDate = vars.get("$field.ENDDATE");
-if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
- result.string(DateUtils.getValidationFailString());
+if(!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
+{
+ result.string(translate.text("The roll out date must be after the project start!"));
+}
else if(!vars.get("$field.PROJECTTITLE") && vars.get("$field.PROJECTTYPE") && vars.exists("$param.PresetTitle_param"))
- result.string(translate.text("The Salesproject can only be filled when a company has been specified"));
\ No newline at end of file
+{
+ result.string(translate.text("The Salesproject can only be filled when a company has been specified"));
+}
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb4fe063f13287c0216a5bab0528cc96669e1ed6
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Sql_lib");
+import("system.SQLTYPES");
+
+var maskingUtils = new SqlMaskingUtils();
+var probability = maskingUtils.cast("SALESPROJECT.PROBABILITY", SQLTYPES.CHAR, 2);
+result.string(maskingUtils.concatenate([probability, "'%'"]));
diff --git a/entity/SearchSync_entity/SearchSync_entity.aod b/entity/SearchSync_entity/SearchSync_entity.aod
index e4b7a24f5b327d133960dffec1ec90b33ab10cc3..6088ee4c7fde2cb171bcfac6662d86af0a3173ed 100644
--- a/entity/SearchSync_entity/SearchSync_entity.aod
+++ b/entity/SearchSync_entity/SearchSync_entity.aod
@@ -4,7 +4,7 @@
<title>Contact synchronisation</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<grantDelete v="false" />
- <iconId>VAADIN:SEARCH</iconId>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
<titlePlural>Contact synchronisations</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
index e91a4c5f39a803af31846213648d3a6a13e4605d..f280f65fbc251b83f419fd0af5061f17965199d7 100644
--- a/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
+++ b/entity/ServiceEmailRecipients_entity/ServiceEmailRecipients_entity.aod
@@ -38,7 +38,6 @@
<entityField>
<name>email_address</name>
<title>Email address</title>
- <mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js</dropDownProcess>
<textInputAllowed v="true" />
<valueProcess>%aditoprj%/entity/ServiceEmailRecipients_entity/entityfields/email_address/valueProcess.js</valueProcess>
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js b/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js
index 0a60a61e6419c210a0758f0f4dbb78a4ab9b55b3..c4f09da61b98e3ff270c353103fc6e14ac4188b6 100644
--- a/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/ServiceEmailRecipients_entity/entityfields/email_address/dropDownProcess.js
@@ -1,3 +1,4 @@
+import("Contact_lib");
import("Communication_lib");
import("system.result");
import("system.vars");
@@ -10,7 +11,7 @@ if (contactId)
var emailAddresses = new SqlBuilder().selectDistinct(["COMMUNICATION.ADDR","COMMUNICATION.ADDR"])
.from("COMMUNICATION")
.where("COMMUNICATION.OBJECT_ROWID",contactId)
- .and("COMMUNICATION.OBJECT_TYPE", CommUtil.defaultObjectType())
+ .and("COMMUNICATION.OBJECT_TYPE", ContactUtils.getContextByContactId(contactId))
.and("COMMUNICATION.MEDIUM_ID",CommUtil.getMediumIdsByCategory("EMAIL"),SqlBuilder.IN())
.table();
result.object(emailAddresses);
diff --git a/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
index 70bdc8be7d3596381114e66c64df05ac64e8c376..cecd4d2fdadf968f2dab6efb197a65d29c04fe0e 100644
--- a/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
+++ b/entity/ServiceEmailRecipients_entity/entityfields/email_address/onValidation.js
@@ -4,7 +4,7 @@ import("Communication_lib");
var fn = CommValidationUtil.makeValidationFn("EMAIL");
-if (fn != null)
+if (fn != null && vars.get("$local.value") != "")
{
var commAddr = vars.get("$local.value");
var res = fn.call(null, commAddr, null);
diff --git a/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js b/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js
deleted file mode 100644
index b1c1aeb894bea017b9e5478561706feb6daeb98f..0000000000000000000000000000000000000000
--- a/entity/ServiceEmail_entity/entityfields/recipients_tolooku/children/actionname/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string( vars.get( "$param.ActionName_param"));
\ No newline at end of file
diff --git a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
index 7bf43f8059cadfb954c8c13675165b4db855cb25..3784f83b59cc269d36275b9f018b856f7e9503a7 100644
--- a/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/ServiceEmail_entity/recordcontainers/jdito/onInsert.js
@@ -214,6 +214,7 @@ if(returnedMsgAfterSend == true)
if( str_conclusion && [ $KeywordRegistry.taskStatus$ended(),$KeywordRegistry.taskStatus$endedAbandoned(),$KeywordRegistry.taskStatus$endedDone()].includes(str_ticketStatusAfterSend) != -1)
{
TicketfieldValues["CONCLUSION"] = str_conclusion;
+ TicketfieldValues["DATE_END"] = vars.get("sys.date");
}
TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
diff --git a/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js b/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js
index 63b9ac5eddf0420845c1b9ced2eeac6bc0c221b7..f06caae5e33b75e8f74212fcaaebfe93ba4baea5 100644
--- a/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js
+++ b/entity/SlaveAdministration_entity/entityfields/filterviewactiongroup/children/intervalset/onActionProcess.js
@@ -1,3 +1,4 @@
+import("system.neonFilter");
import("system.vars");
import("system.neon");
@@ -6,5 +7,5 @@ if (selection.length > 0)
{
var params = {};
params["SlaveUIDs_param"] = JSON.stringify(vars.get("$sys.selection"));
- neon.openContext("SlaveAdministrationIntervall", "SlaveAdminstrationIntervallEdit_view", null, neon.OPERATINGSTATE_VIEW, params);
+ neon.openContextWithRecipe("SlaveAdministrationIntervall", "SlaveAdminstrationIntervallEdit_view", neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString(), neon.OPERATINGSTATE_VIEW);
}
\ No newline at end of file
diff --git a/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
index c8daea565749df730da1358a2480166421e75c80..80f273144dab1fa062b65dc70ba2adfd01446f94 100644
--- a/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
+++ b/entity/SupportTicketMultiSelect_entity/SupportTicketMultiSelect_entity.aod
@@ -103,6 +103,7 @@
<name>ChangeData</name>
<title>Save changes</title>
<onActionProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js</onActionProcess>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
<titleProcess>%aditoprj%/entity/SupportTicketMultiSelect_entity/entityfields/changedata/titleProcess.js</titleProcess>
</entityActionField>
<entityProvider>
diff --git a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
index cb9344c6c3a12a31ae9a9fc2a7291e22209dd797..fb46c8c31841634d71df5e45eee6e0a5fe2d1b4b 100644
--- a/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
+++ b/entity/SupportTicketMultiSelect_entity/entityfields/changedata/onActionProcess.js
@@ -1,8 +1,6 @@
import("system.question");
-import("system.logging");
import("system.neon");
import("Employee_lib");
-import("ActivityTask_lib");
import("Sql_lib");
import("Contact_lib");
import("KeywordRegistry_basic");
@@ -17,7 +15,6 @@ var TaskfieldValues = {};
var TaskfieldValueStatus = {};
var TicketfieldValues = {};
var obj_toolsUser = tools.getCurrentUser()[tools.PARAMS];
-var activityContent = [];
var ChangeCounter = 0;
var removedIds;
@@ -25,7 +22,6 @@ var removedIds;
if(vars.exists("$field.PRIORITY") && (vars.get("$field.PRIORITY") != "" ))
{
TaskfieldValues["PRIORITY"] = vars.get("$field.PRIORITY");
- activityContent += translate.text("Priority changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskPriority(), vars.get("$field.PRIORITY"));
}
/// STATUS
if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
@@ -65,13 +61,7 @@ if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
TicketfieldValues["DATE_END"] = vars.get("$sys.date");
TicketfieldValues["CONCLUSION"] = vars.get("$field.CONCLUSION");
}
- if(activityContent != "")
- {
- activityContent += " / "
- }
- activityContent += translate.text("Status changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.STATUS"));
-
- TaskfieldValue["STATUS"] = vars.get("$field.STATUS");
+ TaskfieldValues["STATUS"] = vars.get("$field.STATUS");
TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
}
}
@@ -79,23 +69,11 @@ if(vars.exists("$field.STATUS") && (vars.get("$field.STATUS") != "" ))
if(vars.exists("$field.EDITOR_CONTACT_ID") && (vars.get("$field.EDITOR_CONTACT_ID") != "" ))
{
TicketfieldValues["EDITOR_CONTACT_ID"] = vars.get("$field.EDITOR_CONTACT_ID");
- if(activityContent != "")
- {
- activityContent += " / "
- }
- activityContent += translate.text("Editor changed to") + ": " + ContactUtils.getFullTitleByContactId(vars.get("$field.EDITOR_CONTACT_ID"),false);
-
}
/// CATEGORY
if(vars.exists("$field.CATEGORY") && (vars.get("$field.CATEGORY") != "" ))
{
TicketfieldValues["CATEGORY"] = vars.get("$field.CATEGORY");
- if(activityContent != "")
- {
- activityContent += " / "
- }
- activityContent += translate.text("Category changed to") + ": " + KeywordUtils.getViewValue($KeywordRegistry.ticketCategory(), vars.get("$field.CATEGORY"));
-
}
/// UPDATE TICKET & TASK
@@ -119,8 +97,8 @@ if (ChangeCounter > 1)
if (ChangeCounter == 1)
{
question.showMessage(translate.text("You tried to change the status of a ticket from 'ended' to another status.")
- + " " + translate.text("The status-change of these tickets was skipped. Any other changes were carried out.")
+ + " " + translate.text("The status-change of the ticket was skipped. Any other changes were carried out.")
+ " " + translate.text("To re-open tickets, please use the corresponding action."), question.INFORMATION, translate.text("Status change skipped!"));
}
neon.closeImage(vars.get("$sys.currentimage"), true)
-neon.refresh();
+neon.refreshAll();
diff --git a/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
index 6a2f9580e38499b3429c1f56bb96f71d0ac86af9..d749fbf2ad67778cad8a8cd0428723a76963789c 100644
--- a/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
+++ b/entity/SupportTicketTemplate_entity/SupportTicketTemplate_entity.aod
@@ -264,6 +264,24 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/SupportTicketTemplate_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -375,6 +393,22 @@
<name>DOCUMENTTEMPLATE_ID.displayValue</name>
<expression>%aditoprj%/entity/SupportTicketTemplate_entity/recordcontainers/db/recordfieldmappings/documenttemplate_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>TICKETTEMPLATE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>TICKETTEMPLATE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>TICKETTEMPLATE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>TICKETTEMPLATE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/SupportTicketTemplate_entity/entityfields/date_edit/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/date_new/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5cf2ff4f91546bf853125bec438493692a5e048
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/user_edit/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicketTemplate_entity/entityfields/user_new/valueProcess.js b/entity/SupportTicketTemplate_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/SupportTicketTemplate_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 32bb07459c6117edc629f4e94de6a48da9374f6e..b53b47a33f2b4ccf79950d2b2f7c21f066ff8342 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -943,11 +943,25 @@
</entityActionField>
<entityField>
<name>DATE_NEW</name>
+ <contentType>DATE</contentType>
<valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>NameFor360</name>
</entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1179,12 +1193,24 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
- <recordfield>TASK.DATE_NEW</recordfield>
+ <recordfield>TICKET.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>NameFor360.value</name>
<expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/namefor360.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>TICKET.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>TICKET.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>TICKET.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/SupportTicket_entity/entityfields/date_edit/valueProcess.js b/entity/SupportTicket_entity/entityfields/date_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2af46a8e46789056c6c341a8e4e087f8e1edc0c4
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/date_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js b/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js
index 6835658dc430852893df25cf22145e1c6aae259e..d5cf2ff4f91546bf853125bec438493692a5e048 100644
--- a/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/date_new/valueProcess.js
@@ -1,8 +1,8 @@
-import("system.vars");
import("system.result");
import("system.neon");
+import("system.vars");
-if (vars.getString("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
result.string(vars.get("$sys.date"));
}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js
index 563673fcbbc2a5383b123991053823e2e7b48adb..1865a37469558b88ce61bcb249676ba2cc99772e 100644
--- a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js
+++ b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/onValueChange.js
@@ -20,7 +20,7 @@ if( str_requestorContactId)
.and( "communication.MEDIUM_ID in ('COMMPHONE', 'COMMMOBIL')")
.orderBy("communication.ISSTANDARD desc")
.cell();
- if(str_email && vars.exists("$field.CommEMail"))
+ if(str_email && vars.exists("$field.CommEmail"))
{
neon.setFieldValue("$field.CommEmail",
str_email
diff --git a/entity/SupportTicket_entity/entityfields/user_edit/valueProcess.js b/entity/SupportTicket_entity/entityfields/user_edit/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b874a7ac426b8e99383ac949299b9753e4951f2b
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/user_edit/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/user_new/valueProcess.js b/entity/SupportTicket_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3f8db68b950a0505d6179cb67c14dde624c45070
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
index 2bacab3ce0a5b9a34fa1e1205a7264abfb17ce02..e573a5d478f1b9d9aff85e54093004b1f6c4a009 100644
--- a/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBUpdate.js
@@ -38,9 +38,9 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
if (vars.get("$field.INBOX_ID"))
{
var mailsig = newSelect("MAILSIGNATURE.MAILSIGNATUREID")
- .from("MAILSIGNATURE")
- .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID"))
- .cell();
+ .from("MAILSIGNATURE")
+ .where("MAILSIGNATURE.INBOX_ID",vars.get("$field.INBOX_ID"))
+ .cell();
TicketfieldValues["MAILSIGNATURE_ID"] = mailsig;
}
@@ -51,7 +51,6 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
if ( (actionName == "sendTicketBackAction") || (actionName == "changeStatusAfterForwardEmail"))
{
newWhereIfSet("TICKET.TICKETID", vars.get("field.TICKETID")).updateFields(TicketfieldValues);
- neon.openHome();
}
///RESUBMIT TICKETS
else if( actionName == "resubmitTicket")
@@ -66,16 +65,16 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
"directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
"subject" : translate.text("Ticket resubmitted"),
"content" : translate.text("New date due") + ": "
- + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy") + " "
- + translate.text("Editor changed to") + ": "
- + ContactUtils.getFullTitleByContactId(vars.get("$field.TICKET_EDITOR_CONTACT_ID"),false),
+ + datetime.toDate(vars.get("$field.TASK_MATURITY_DATE"), "dd.MM.yyyy") + " "
+ + translate.text("Editor changed to") + ": "
+ + ContactUtils.getFullTitleByContactId(vars.get("$field.TICKET_EDITOR_CONTACT_ID"),false),
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys(),
"responsibleContactId" : EmployeeUtils.getCurrentContactId()
}
var ActivityLink = [ContextUtils.getCurrentContextId(), ticketID];
ActivityUtils.insertNewActivity(DataPreset, [ActivityLink]);
- // end ACTIVITY
+ // end ACTIVITY
}
///RETURN TICKETS
@@ -88,7 +87,7 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
"directionKeywordId" : $KeywordRegistry.activityDirection$internal(),
"subject" : translate.text("Ticket returned"),
"content" : translate.text("Ticket returned to pool") + ". "
- +"\n"+ translate.text("Original editor") + ": " + vars.get( "$field.TICKET_EDITOR_CONTACT_ID.displayValue"),
+ +"\n"+ translate.text("Original editor") + ": " + vars.get( "$field.TICKET_EDITOR_CONTACT_ID.displayValue"),
"categoryKeywordId" : $KeywordRegistry.activityCategory$sys(),
"responsibleContactId" : EmployeeUtils.getCurrentContactId()
}
@@ -102,7 +101,7 @@ if( vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
TicketfieldValues["DATE_EDIT_STATUS"] = vars.get("$sys.date");
TicketfieldValues["INBOX_ID"] = vars.get("$field.INBOX_ID");
TicketfieldValues["CATEGORY"] = vars.get("$field.TICKETCATEGORY");
- }
+ }
newWhere("TICKET.TICKETID","$field.TICKETID").updateFields(TicketfieldValues);
newWhere("TASK.TASKID", "$field.TASK_ID").updateFields(TaskfieldValues);
}
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 4f4483a8e00a44648c2945852dc758e7bbc4ae72..cb92ec4bb7b7e6141bae5ac50f09fe47da6f28b2 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -28,7 +28,7 @@
</entityProvider>
<entityField>
<name>SUBJECT</name>
- <title>subject</title>
+ <title>Subject</title>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/subject/valueProcess.js</valueProcess>
</entityField>
@@ -83,12 +83,13 @@
</entityField>
<entityField>
<name>DESCRIPTION</name>
- <title>description</title>
+ <title>Description</title>
<contentType>HTML</contentType>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/description/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>PROTECTIONLEVEL</name>
+ <title>${TASK_PROTECTIONLEVEL}</title>
<contentType>BOOLEAN</contentType>
<contentTypeProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/contentTypeProcess.js</contentTypeProcess>
<titleProcess>%aditoprj%/entity/Task_entity/entityfields/protectionlevel/titleProcess.js</titleProcess>
@@ -357,7 +358,7 @@
</entityField>
<entityActionField>
<name>newSupportticket</name>
- <title>New Service ticket</title>
+ <title>New service ticket</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CHAT</iconId>
</entityActionField>
@@ -490,7 +491,7 @@
</entityField>
<entityField>
<name>connections</name>
- <title>Verknuepfungen</title>
+ <title>Connections</title>
</entityField>
<entityField>
<name>DATE_EDIT</name>
@@ -537,7 +538,7 @@
<children>
<entityActionField>
<name>setComplete</name>
- <title>Erledigt setzen</title>
+ <title>Set completed</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/filteractiongroup/children/setcomplete/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<selectionType>MULTI</selectionType>
@@ -581,7 +582,7 @@
</entityActionField>
<entityActionField>
<name>setCompletePreview</name>
- <title>Erledigt setzen</title>
+ <title>Set completed</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/setcompletepreview/onActionProcess.js</onActionProcess>
<iconId>NEON:MQL</iconId>
<state>DISABLED</state>
@@ -591,7 +592,7 @@
<name>newOffer</name>
<title>New offer</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CHART</iconId>
+ <iconId>VAADIN:CART</iconId>
</entityActionField>
<entityActionField>
<name>openAdminView</name>
diff --git a/entity/TopicTree_entity/TopicTree_entity.aod b/entity/TopicTree_entity/TopicTree_entity.aod
index a1f57a287242fa31a59c821b2ea0f24869d45e27..7c8c12832377b99735c6b18438212dc1edd74412 100644
--- a/entity/TopicTree_entity/TopicTree_entity.aod
+++ b/entity/TopicTree_entity/TopicTree_entity.aod
@@ -7,6 +7,7 @@
<grantDeleteProcess>%aditoprj%/entity/TopicTree_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/TopicTree_entity/contentTitleProcess.js</contentTitleProcess>
<iconId>VAADIN:TREE_TABLE</iconId>
+ <recordsRecipeSupported v="true" />
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
@@ -104,6 +105,7 @@
<title>First</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/first/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:ANGLE_DOUBLE_UP</iconId>
<stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/first/stateProcess.js</stateProcess>
</entityActionField>
@@ -112,6 +114,7 @@
<title>Move Up</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/moveup/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:ANGLE_UP</iconId>
<stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/moveup/stateProcess.js</stateProcess>
</entityActionField>
@@ -120,6 +123,7 @@
<title>Move Down</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/movedown/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:ANGLE_DOWN</iconId>
<stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/movedown/stateProcess.js</stateProcess>
</entityActionField>
@@ -128,6 +132,7 @@
<title>Last</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/last/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:ANGLE_DOUBLE_DOWN</iconId>
<stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/last/stateProcess.js</stateProcess>
</entityActionField>
@@ -135,13 +140,14 @@
<name>copy</name>
<title>Copy</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/copy/onActionProcess.js</onActionProcess>
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:COPY</iconId>
- <stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/copy/stateProcess.js</stateProcess>
</entityActionField>
<entityActionField>
<name>paste</name>
<title>Paste</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/paste/onActionProcess.js</onActionProcess>
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:PASTE</iconId>
<stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/paste/stateProcess.js</stateProcess>
</entityActionField>
@@ -149,6 +155,7 @@
<name>pasteAsTopTopic</name>
<title>Paste as Top Topic</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/pasteastoptopic/onActionProcess.js</onActionProcess>
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:PASTE</iconId>
<stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/pasteastoptopic/stateProcess.js</stateProcess>
</entityActionField>
@@ -156,6 +163,7 @@
<name>cut</name>
<title>Cut</title>
<onActionProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/cut/onActionProcess.js</onActionProcess>
+ <selectionType>MULTI</selectionType>
<iconId>VAADIN:SCISSORS</iconId>
<stateProcess>%aditoprj%/entity/TopicTree_entity/entityfields/more/children/cut/stateProcess.js</stateProcess>
</entityActionField>
diff --git a/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/onActionProcess.js b/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/onActionProcess.js
index 6e11443e9dda8a886c5a8585b8fd195a78c058d5..8412c62f4711a775f8ddb22f4750656da64256d6 100644
--- a/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/onActionProcess.js
+++ b/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/onActionProcess.js
@@ -6,8 +6,7 @@ import("Attribute_lib");
var params = {};
if (vars.exists("$sys.selection"))
{
- var row = vars.get("$sys.selection");
- var topicTreeId = row[0];
+ var topicTreeId = vars.get("$field.TOPICTREEID");
params["AssignedToId_param"] = topicTreeId;
}
neon.openContextWithRecipe("TopicTree", "TopicTreeEdit_view", neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString(), neon.OPERATINGSTATE_NEW);
\ No newline at end of file
diff --git a/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/stateProcess.js b/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/stateProcess.js
index 0e259b3b846e565b0793a70b3fb37cd1a53515d4..2a720a7a63ae74539c9ea4f907fbc6ab53973b75 100644
--- a/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/stateProcess.js
+++ b/entity/TopicTree_entity/entityfields/createexpand/children/createchildtopic/stateProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.result");
import("system.eMath");
import("system.neon");
@@ -8,10 +9,10 @@ var state = neon.COMPONENTSTATE_DISABLED;
if(operatingState != neon.OPERATINGSTATE_NEW && operatingState != neon.OPERATINGSTATE_EDIT)
{
- var selection = vars.get("$sys.selectionRows")[0];
- if(selection && selection.sortingHelper != "")
+ var selection = vars.get("$sys.selectionsRecordsRecipe");
+ if(selection && JSON.parse(selection)["uidsIncludelist"][0] && Utils.isNotNullOrEmptyString(vars.get("$field.sortingHelper")))
{
- var sortingObj = JSON.parse(selection.sortingHelper);
+ var sortingObj = JSON.parse(vars.get("$field.sortingHelper"));
var layer = sortingObj.sortingLayer;
if(layer != "SORTING_LAYER_6")
{
diff --git a/entity/TopicTree_entity/entityfields/more/children/copy/onActionProcess.js b/entity/TopicTree_entity/entityfields/more/children/copy/onActionProcess.js
index 04b811522dd2345d2ed9a5804b39af8e1eed7479..e52ea430b4aeed3d00ad9faaa70fc53e8e07edbc 100644
--- a/entity/TopicTree_entity/entityfields/more/children/copy/onActionProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/copy/onActionProcess.js
@@ -1,7 +1,24 @@
import("TopicTree_lib");
import("system.vars");
-var topicDatSet = vars.get("$sys.selectionRows")[0];
+var topicDatSet = {};
+topicDatSet["ACTIVE"] = vars.get("$field.ACTIVE");
+topicDatSet["ASSIGNEDTO"] = vars.get("$field.ASSIGNEDTO");
+topicDatSet["DATE_EDIT"] = vars.get("$field.DATE_EDIT");
+topicDatSet["DATE_NEW"] = vars.get("$field.DATE_NEW");
+topicDatSet["SORTING_LAYER_1"] = vars.get("$field.SORTING_LAYER_1");
+topicDatSet["SORTING_LAYER_2"] = vars.get("$field.SORTING_LAYER_2");
+topicDatSet["SORTING_LAYER_3"] = vars.get("$field.SORTING_LAYER_3");
+topicDatSet["SORTING_LAYER_4"] = vars.get("$field.SORTING_LAYER_4");
+topicDatSet["SORTING_LAYER_5"] = vars.get("$field.SORTING_LAYER_5");
+topicDatSet["SORTING_LAYER_6"] = vars.get("$field.SORTING_LAYER_6");
+topicDatSet["TOPIC"] = vars.get("$field.TOPIC");
+topicDatSet["DESCRIPTION"] = vars.get("$field.DESCRIPTION");
+topicDatSet["TOPICTREEID"] = vars.get("$field.TOPICTREEID");
+topicDatSet["#UID"] = vars.get("$field.UID");
+topicDatSet["USER_EDIT"] = vars.get("$field.USER_EDIT");
+topicDatSet["USER_NEW"] = vars.get("$field.USER_NEW");
+topicDatSet["sortingHelper"] = vars.get("$field.sortingHelper");
vars.set("$context.HasToBeCut", false);
vars.set("$context.Copied", JSON.stringify({dataset: topicDatSet
diff --git a/entity/TopicTree_entity/entityfields/more/children/copy/stateProcess.js b/entity/TopicTree_entity/entityfields/more/children/copy/stateProcess.js
deleted file mode 100644
index 3f81b4f375b84c14050bdfc7577055d5b20216e8..0000000000000000000000000000000000000000
--- a/entity/TopicTree_entity/entityfields/more/children/copy/stateProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.db");
-import("system.neon");
-import("system.result");
-import("system.vars");
-
-var selection = vars.get("$sys.selectionRows")[0];
-var state = neon.COMPONENTSTATE_DISABLED;
-if(selection)
-{
- state = neon.COMPONENTSTATE_EDITABLE;
-}
-result.string(state);
\ No newline at end of file
diff --git a/entity/TopicTree_entity/entityfields/more/children/cut/onActionProcess.js b/entity/TopicTree_entity/entityfields/more/children/cut/onActionProcess.js
index 0de3d45cd47a69ec2c21c7667178f5540f52ae6f..aa044d1eed03eb687910f30234bfc54636fc741e 100644
--- a/entity/TopicTree_entity/entityfields/more/children/cut/onActionProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/cut/onActionProcess.js
@@ -1,7 +1,23 @@
import("TopicTree_lib");
import("system.vars");
-var topicDatSet = vars.get("$sys.selectionRows")[0];
+var topicDatSet = {};
+topicDatSet["ACTIVE"] = vars.get("$field.ACTIVE");
+topicDatSet["ASSIGNEDTO"] = vars.get("$field.ASSIGNEDTO");
+topicDatSet["DATE_EDIT"] = vars.get("$field.DATE_EDIT");
+topicDatSet["DATE_NEW"] = vars.get("$field.DATE_NEW");
+topicDatSet["SORTING_LAYER_1"] = vars.get("$field.SORTING_LAYER_1");
+topicDatSet["SORTING_LAYER_2"] = vars.get("$field.SORTING_LAYER_2");
+topicDatSet["SORTING_LAYER_3"] = vars.get("$field.SORTING_LAYER_3");
+topicDatSet["SORTING_LAYER_4"] = vars.get("$field.SORTING_LAYER_4");
+topicDatSet["SORTING_LAYER_5"] = vars.get("$field.SORTING_LAYER_5");
+topicDatSet["SORTING_LAYER_6"] = vars.get("$field.SORTING_LAYER_6");
+topicDatSet["TOPIC"] = vars.get("$field.TOPIC");
+topicDatSet["TOPICTREEID"] = vars.get("$field.TOPICTREEID");
+topicDatSet["#UID"] = vars.get("$field.UID");
+topicDatSet["USER_EDIT"] = vars.get("$field.USER_EDIT");
+topicDatSet["USER_NEW"] = vars.get("$field.USER_NEW");
+topicDatSet["sortingHelper"] = vars.get("$field.sortingHelper");
vars.set("$context.Copied", JSON.stringify({dataset: topicDatSet
, amountOfLayers: TopicTreeUtils.getAmountOfLayers(topicDatSet)}));
diff --git a/entity/TopicTree_entity/entityfields/more/children/cut/stateProcess.js b/entity/TopicTree_entity/entityfields/more/children/cut/stateProcess.js
index da1b7324b98030e890d11a91b7cfc7a470ae77de..89f86e7d116f89b87b1801a56c981ff7f8e88786 100644
--- a/entity/TopicTree_entity/entityfields/more/children/cut/stateProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/cut/stateProcess.js
@@ -1,14 +1,32 @@
+import("Util_lib");
import("system.neon");
import("system.result");
import("Sql_lib");
import("TopicTree_lib");
import("system.vars");
-var selection = vars.get("$sys.selectionRows");
+var selection = vars.get("$sys.selectionsRecordsRecipe");
var state = neon.COMPONENTSTATE_DISABLED;
-if(selection && selection.length > 0)
+if(selection && !Utils.isNullOrEmpty(selection[0]))
{
- var topicDatSet = selection[0];
+ var topicDatSet = {};
+ topicDatSet["ACTIVE"] = vars.get("$field.ACTIVE");
+ topicDatSet["ASSIGNEDTO"] = vars.get("$field.ASSIGNEDTO");
+ topicDatSet["DATE_EDIT"] = vars.get("$field.DATE_EDIT");
+ topicDatSet["DATE_NEW"] = vars.get("$field.DATE_NEW");
+ topicDatSet["SORTING_LAYER_1"] = vars.get("$field.SORTING_LAYER_1");
+ topicDatSet["SORTING_LAYER_2"] = vars.get("$field.SORTING_LAYER_2");
+ topicDatSet["SORTING_LAYER_3"] = vars.get("$field.SORTING_LAYER_3");
+ topicDatSet["SORTING_LAYER_4"] = vars.get("$field.SORTING_LAYER_4");
+ topicDatSet["SORTING_LAYER_5"] = vars.get("$field.SORTING_LAYER_5");
+ topicDatSet["SORTING_LAYER_6"] = vars.get("$field.SORTING_LAYER_6");
+ topicDatSet["TOPIC"] = vars.get("$field.TOPIC");
+ topicDatSet["TOPICTREEID"] = vars.get("$field.TOPICTREEID");
+ topicDatSet["#UID"] = vars.get("$field.UID");
+ topicDatSet["USER_EDIT"] = vars.get("$field.USER_EDIT");
+ topicDatSet["USER_NEW"] = vars.get("$field.USER_NEW");
+ topicDatSet["sortingHelper"] = vars.get("$field.sortingHelper");
+
var topicIds = TopicTreeUtils.getSubTopicIds(topicDatSet);
var count = 0;
diff --git a/entity/TopicTree_entity/entityfields/more/children/first/onActionProcess.js b/entity/TopicTree_entity/entityfields/more/children/first/onActionProcess.js
index 328ca8c9be6d35e44604c2cecfc8c137d4f331a0..ea59797c078d3c393fd4deafa427de37a46bc68c 100644
--- a/entity/TopicTree_entity/entityfields/more/children/first/onActionProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/first/onActionProcess.js
@@ -2,11 +2,10 @@ import("system.neon");
import("TopicTree_lib");
import("system.vars");
-var selection = vars.get("$sys.selectionRows")[0];
-var topicTreeid = selection["#UID"];
-var sortingHelper = JSON.parse(selection.sortingHelper);
-var currentLayer = TopicTreeUtils.getLayer(selection.SORTING_LAYER_1, selection.SORTING_LAYER_2, selection.SORTING_LAYER_3, selection.SORTING_LAYER_4, selection.SORTING_LAYER_5, selection.SORTING_LAYER_6);
-var assignedTo = selection.ASSIGNEDTO == "" ? $TopicTreeConstants.TOPTOPIC() : selection.ASSIGNEDTO;
+var topicTreeid = vars.get("$field.UID");
+var sortingHelper = JSON.parse(vars.get("$field.sortingHelper"));
+var currentLayer = TopicTreeUtils.getLayer(vars.get("$field.SORTING_LAYER_1"), vars.get("$field.SORTING_LAYER_2"), vars.get("$field.SORTING_LAYER_3"), vars.get("$field.SORTING_LAYER_4"), vars.get("$field.SORTING_LAYER_5"), vars.get("$field.SORTING_LAYER_6"));
+var assignedTo = vars.get("$field.ASSIGNEDTO") == "" ? $TopicTreeConstants.TOPTOPIC() : vars.get("$field.ASSIGNEDTO");
TopicTreeUtils.movePosition(topicTreeid, $TopicTreeMoveDirections.TOP(), sortingHelper.maxSortingValue, assignedTo, sortingHelper.ownSortingValue, currentLayer);
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/TopicTree_entity/entityfields/more/children/first/stateProcess.js b/entity/TopicTree_entity/entityfields/more/children/first/stateProcess.js
index 1a90e3c289a1d561f6959c35adef58380815ab50..ba9a2d08fdd217b67f5b8d2f79edb435537ae527 100644
--- a/entity/TopicTree_entity/entityfields/more/children/first/stateProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/first/stateProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.result");
import("system.eMath");
import("system.neon");
@@ -7,10 +8,10 @@ var operatingState = vars.get("$sys.operatingstate");
var state = neon.COMPONENTSTATE_DISABLED;
if(operatingState != neon.OPERATINGSTATE_NEW && operatingState != neon.OPERATINGSTATE_EDIT)
{
- var selection = vars.get("$sys.selectionRows")[0];
- if(selection && selection.sortingHelper != "")
+ var selection = vars.get("$sys.selectionsRecordsRecipe");
+ if(selection && JSON.parse(selection)["uidsIncludelist"][0] && Utils.isNotNullOrEmptyString(vars.get("$field.sortingHelper")))
{
- var sortingObj = JSON.parse(selection.sortingHelper);
+ var sortingObj = JSON.parse(vars.get("$field.sortingHelper"));
var ownSortingValue = sortingObj.ownSortingValue;
if(ownSortingValue != 1)
{
diff --git a/entity/TopicTree_entity/entityfields/more/children/last/onActionProcess.js b/entity/TopicTree_entity/entityfields/more/children/last/onActionProcess.js
index bb26a0d1dc66b815e53da2d5b26d61755918f8c7..44691e40d5fc7201f895ba168b4de99e5e7bf43c 100644
--- a/entity/TopicTree_entity/entityfields/more/children/last/onActionProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/last/onActionProcess.js
@@ -2,11 +2,10 @@ import("system.neon");
import("TopicTree_lib");
import("system.vars");
-var selection = vars.get("$sys.selectionRows")[0];
-var topicTreeid = selection["#UID"];
-var sortingHelper = JSON.parse(selection.sortingHelper);
-var currentLayer = TopicTreeUtils.getLayer(selection.SORTING_LAYER_1, selection.SORTING_LAYER_2, selection.SORTING_LAYER_3, selection.SORTING_LAYER_4, selection.SORTING_LAYER_5, selection.SORTING_LAYER_6);
-var assignedTo = selection.ASSIGNEDTO == "" ? $TopicTreeConstants.TOPTOPIC() : selection.ASSIGNEDTO;
+var topicTreeid = vars.get("$field.UID");
+var sortingHelper = JSON.parse(vars.get("$field.sortingHelper"));
+var currentLayer = TopicTreeUtils.getLayer(vars.get("$field.SORTING_LAYER_1"), vars.get("$field.SORTING_LAYER_2"), vars.get("$field.SORTING_LAYER_3"), vars.get("$field.SORTING_LAYER_4"), vars.get("$field.SORTING_LAYER_5"), vars.get("$field.SORTING_LAYER_6"));
+var assignedTo = vars.get("$field.ASSIGNEDTO") == "" ? $TopicTreeConstants.TOPTOPIC() : vars.get("$field.ASSIGNEDTO");
TopicTreeUtils.movePosition(topicTreeid, $TopicTreeMoveDirections.BOTTOM(), sortingHelper.maxSortingValue, assignedTo, sortingHelper.ownSortingValue, currentLayer);
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/TopicTree_entity/entityfields/more/children/last/stateProcess.js b/entity/TopicTree_entity/entityfields/more/children/last/stateProcess.js
index b0e5ad3ee6202c8d7ff8d87f57046373570a60c6..8ce0611a7677702383f48477565fd8a8508ac73d 100644
--- a/entity/TopicTree_entity/entityfields/more/children/last/stateProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/last/stateProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.result");
import("system.eMath");
import("system.neon");
@@ -8,10 +9,10 @@ var state = neon.COMPONENTSTATE_DISABLED;
if(operatingState != neon.OPERATINGSTATE_NEW && operatingState != neon.OPERATINGSTATE_EDIT)
{
- var selection = vars.get("$sys.selectionRows")[0];
- if(selection && selection.sortingHelper != "")
+ var selection = vars.get("$sys.selectionsRecordsRecipe");
+ if(selection && JSON.parse(selection)["uidsIncludelist"][0] && Utils.isNotNullOrEmptyString(vars.get("$field.sortingHelper")))
{
- var sortingObj = JSON.parse(selection.sortingHelper);
+ var sortingObj = JSON.parse(vars.get("$field.sortingHelper"));
var maxSorting = sortingObj.maxSortingValue;
var ownSortingValue = sortingObj.ownSortingValue;
if(eMath.addInt(ownSortingValue, 1) <= maxSorting)
diff --git a/entity/TopicTree_entity/entityfields/more/children/movedown/onActionProcess.js b/entity/TopicTree_entity/entityfields/more/children/movedown/onActionProcess.js
index cf3eac3f952dd7fd3aeeb3f9602680e61789caad..ce04d4afde09e23cc7e2cb793ab0f57294623270 100644
--- a/entity/TopicTree_entity/entityfields/more/children/movedown/onActionProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/movedown/onActionProcess.js
@@ -2,11 +2,10 @@ import("system.neon");
import("TopicTree_lib");
import("system.vars");
-var selection = vars.get("$sys.selectionRows")[0];
-var topicTreeid = selection["#UID"];
-var sortingHelper = JSON.parse(selection.sortingHelper);
-var currentLayer = TopicTreeUtils.getLayer(selection.SORTING_LAYER_1, selection.SORTING_LAYER_2, selection.SORTING_LAYER_3, selection.SORTING_LAYER_4, selection.SORTING_LAYER_5, selection.SORTING_LAYER_6);
-var assignedTo = selection.ASSIGNEDTO == "" ? $TopicTreeConstants.TOPTOPIC() : selection.ASSIGNEDTO;
+var topicTreeid = vars.get("$field.UID");
+var sortingHelper = JSON.parse(vars.get("$field.sortingHelper"));
+var currentLayer = TopicTreeUtils.getLayer(vars.get("$field.SORTING_LAYER_1"), vars.get("$field.SORTING_LAYER_2"), vars.get("$field.SORTING_LAYER_3"), vars.get("$field.SORTING_LAYER_4"), vars.get("$field.SORTING_LAYER_5"), vars.get("$field.SORTING_LAYER_6"));
+var assignedTo = vars.get("$field.ASSIGNEDTO") == "" ? $TopicTreeConstants.TOPTOPIC() : vars.get("$field.ASSIGNEDTO");
TopicTreeUtils.movePosition(topicTreeid, $TopicTreeMoveDirections.DOWN(), sortingHelper.maxSortingValue, assignedTo, sortingHelper.ownSortingValue, currentLayer);
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/TopicTree_entity/entityfields/more/children/movedown/stateProcess.js b/entity/TopicTree_entity/entityfields/more/children/movedown/stateProcess.js
index b0e5ad3ee6202c8d7ff8d87f57046373570a60c6..8ce0611a7677702383f48477565fd8a8508ac73d 100644
--- a/entity/TopicTree_entity/entityfields/more/children/movedown/stateProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/movedown/stateProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.result");
import("system.eMath");
import("system.neon");
@@ -8,10 +9,10 @@ var state = neon.COMPONENTSTATE_DISABLED;
if(operatingState != neon.OPERATINGSTATE_NEW && operatingState != neon.OPERATINGSTATE_EDIT)
{
- var selection = vars.get("$sys.selectionRows")[0];
- if(selection && selection.sortingHelper != "")
+ var selection = vars.get("$sys.selectionsRecordsRecipe");
+ if(selection && JSON.parse(selection)["uidsIncludelist"][0] && Utils.isNotNullOrEmptyString(vars.get("$field.sortingHelper")))
{
- var sortingObj = JSON.parse(selection.sortingHelper);
+ var sortingObj = JSON.parse(vars.get("$field.sortingHelper"));
var maxSorting = sortingObj.maxSortingValue;
var ownSortingValue = sortingObj.ownSortingValue;
if(eMath.addInt(ownSortingValue, 1) <= maxSorting)
diff --git a/entity/TopicTree_entity/entityfields/more/children/moveup/onActionProcess.js b/entity/TopicTree_entity/entityfields/more/children/moveup/onActionProcess.js
index 681a3bf3fc485a4acc07910702c796b4243736e7..cb36836948f3b8d586981cb1ec26fee53ee3e995 100644
--- a/entity/TopicTree_entity/entityfields/more/children/moveup/onActionProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/moveup/onActionProcess.js
@@ -2,11 +2,10 @@ import("system.neon");
import("TopicTree_lib");
import("system.vars");
-var selection = vars.get("$sys.selectionRows")[0];
-var topicTreeid = selection["#UID"];
-var sortingHelper = JSON.parse(selection.sortingHelper);
-var currentLayer = TopicTreeUtils.getLayer(selection.SORTING_LAYER_1, selection.SORTING_LAYER_2, selection.SORTING_LAYER_3, selection.SORTING_LAYER_4, selection.SORTING_LAYER_5, selection.SORTING_LAYER_6);
-var assignedTo = selection.ASSIGNEDTO == "" ? $TopicTreeConstants.TOPTOPIC() : selection.ASSIGNEDTO;
+var topicTreeid = vars.get("$field.UID");
+var sortingHelper = JSON.parse(vars.get("$field.sortingHelper"));
+var currentLayer = TopicTreeUtils.getLayer(vars.get("$field.SORTING_LAYER_1"), vars.get("$field.SORTING_LAYER_2"), vars.get("$field.SORTING_LAYER_3"), vars.get("$field.SORTING_LAYER_4"), vars.get("$field.SORTING_LAYER_5"), vars.get("$field.SORTING_LAYER_6"));
+var assignedTo = vars.get("$field.ASSIGNEDTO") == "" ? $TopicTreeConstants.TOPTOPIC() : vars.get("$field.ASSIGNEDTO");
TopicTreeUtils.movePosition(topicTreeid, $TopicTreeMoveDirections.UP(), sortingHelper.maxSortingValue, assignedTo, sortingHelper.ownSortingValue, currentLayer);
neon.refreshAll();
\ No newline at end of file
diff --git a/entity/TopicTree_entity/entityfields/more/children/moveup/stateProcess.js b/entity/TopicTree_entity/entityfields/more/children/moveup/stateProcess.js
index c9a5b7f7c30ab18ec91fcb66f666b578229cbeba..6bdcb5e368813e12533d9375511d67ba6c0a18f8 100644
--- a/entity/TopicTree_entity/entityfields/more/children/moveup/stateProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/moveup/stateProcess.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.result");
import("system.eMath");
import("system.neon");
@@ -8,10 +9,10 @@ var state = neon.COMPONENTSTATE_DISABLED;
if(operatingState != neon.OPERATINGSTATE_NEW && operatingState != neon.OPERATINGSTATE_EDIT)
{
- var selection = vars.get("$sys.selectionRows")[0];
- if(selection && selection.sortingHelper != "")
+ var selection = vars.get("$sys.selectionsRecordsRecipe");
+ if(selection && JSON.parse(selection)["uidsIncludelist"][0] && Utils.isNotNullOrEmptyString(vars.get("$field.sortingHelper")))
{
- var sortingObj = JSON.parse(selection.sortingHelper);
+ var sortingObj = JSON.parse(vars.get("$field.sortingHelper"));
var ownSortingValue = sortingObj.ownSortingValue;
if(ownSortingValue != 1)
{
diff --git a/entity/TopicTree_entity/entityfields/more/children/paste/stateProcess.js b/entity/TopicTree_entity/entityfields/more/children/paste/stateProcess.js
index b3d1749a90e97dfa9eb17f2796232285e65dd2b6..e08bc5a1e1ca539141ac55e80792846a7fa3bef7 100644
--- a/entity/TopicTree_entity/entityfields/more/children/paste/stateProcess.js
+++ b/entity/TopicTree_entity/entityfields/more/children/paste/stateProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("system.eMath");
import("TopicTree_lib");
import("system.db");
@@ -7,9 +8,9 @@ import("system.vars");
var selection = vars.get("$sys.selectionRows")[0];
var state = neon.COMPONENTSTATE_DISABLED;
-if(selection && vars.exists("$context.Copied"))
+if(vars.get("$sys.selectionsRecordsRecipe") && JSON.parse(vars.get("$sys.selectionsRecordsRecipe")) && vars.exists("$context.Copied"))
{
- var layer = TopicTreeUtils.returnNumberOfLayerName(JSON.parse(selection["sortingHelper"])["sortingLayer"]);
+ var layer = TopicTreeUtils.returnNumberOfLayerName(JSON.parse(vars.get("$field.sortingHelper"))["sortingLayer"]);
var amountOfLayers = JSON.parse(vars.get("$context.Copied"))["amountOfLayers"];
if(eMath.addInt(amountOfLayers, layer) <= TopicTreeUtils.getArrayLayers().length)//this tree doesn't work endlessly, so we can*t allow the user to create more layers than we allow
@@ -19,7 +20,7 @@ if(selection && vars.exists("$context.Copied"))
var copiedTopicTreeId = JSON.parse(vars.get("$context.Copied"))["dataset"];
var topicTreeIds = TopicTreeUtils.getSubTopicIds(copiedTopicTreeId);
topicTreeIds.push(copiedTopicTreeId);
- var pasteTopicTreeId = selection["#UID"];
+ var pasteTopicTreeId = vars.get("$field.UID");
if(!topicTreeIds.includes(pasteTopicTreeId))
{
state = neon.COMPONENTSTATE_EDITABLE;
diff --git a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
index ee071702a9c59efe0147927381438ff98f5c6810..c89a7b83a1d278ea31537a4cc6d27bcbb965f7a9 100644
--- a/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
+++ b/entity/VisitPlanEmployeeWeek_entity/VisitPlanEmployeeWeek_entity.aod
@@ -32,7 +32,6 @@
<groupable v="true" />
<mandatory v="true" />
<dropDownProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/week/dropDownProcess.js</dropDownProcess>
- <stateProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/week/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/week/valueProcess.js</valueProcess>
<onValidation>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/week/onValidation.js</onValidation>
</entityField>
@@ -145,7 +144,6 @@
<contentType>DATE</contentType>
<resolution>YEAR</resolution>
<mandatory v="true" />
- <stateProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/onValueChange.js</onValueChange>
</entityField>
diff --git a/entity/VisitPlanEmployeeWeek_entity/entityfields/week/stateProcess.js b/entity/VisitPlanEmployeeWeek_entity/entityfields/week/stateProcess.js
deleted file mode 100644
index aaef0eb3e5aef485ea1f7849a418c6e2513d67ad..0000000000000000000000000000000000000000
--- a/entity/VisitPlanEmployeeWeek_entity/entityfields/week/stateProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-var state = neon.COMPONENTSTATE_EDITABLE;
-
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- state = neon.COMPONENTSTATE_DISABLED;
-}
-
-result.string(state);
\ No newline at end of file
diff --git a/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/onValueChange.js b/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/onValueChange.js
index 5a0dca7adb20327c407f39a3f3d03a1f992c4c68..58609044140433a6b40fefa16cd4fe67d8199045 100644
--- a/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/onValueChange.js
+++ b/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/onValueChange.js
@@ -5,4 +5,4 @@ import("system.vars");
var dateValue = vars.get("$this.value");
var year = datetime.toDate(dateValue, "yyyy");
-neon.setFieldValue("$field.YEAR", year);
\ No newline at end of file
+neon.setFieldValue("$field.YEAR", year);
diff --git a/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/stateProcess.js b/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/stateProcess.js
deleted file mode 100644
index aaef0eb3e5aef485ea1f7849a418c6e2513d67ad..0000000000000000000000000000000000000000
--- a/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/stateProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-var state = neon.COMPONENTSTATE_EDITABLE;
-
-if(vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
-{
- state = neon.COMPONENTSTATE_DISABLED;
-}
-
-result.string(state);
\ No newline at end of file
diff --git a/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/valueProcess.js b/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/valueProcess.js
index 818bba58b28fd070ae0b017843976d83f439eeb5..9086c828d3d5b1237831da7b92a57e20330e4a52 100644
--- a/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/valueProcess.js
+++ b/entity/VisitPlanEmployeeWeek_entity/entityfields/yearselection/valueProcess.js
@@ -2,7 +2,15 @@ import("system.neon");
import("system.result");
import("system.vars");
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
-{
- result.string(vars.get("$sys.date"));
-}
\ No newline at end of file
+if(vars.get("$this.value") == null)
+{
+ var recordstate = vars.get("$sys.recordstate")
+ if(recordstate == neon.OPERATINGSTATE_NEW)
+ {
+ result.string(vars.get("$sys.date"));
+ }
+ else if(recordstate == neon.OPERATINGSTATE_EDIT)
+ {
+ result.string(new Date(vars.get("$field.YEAR")).getTime());
+ }
+}
diff --git a/entity/WeblinkTag_entity/entityfields/tag/displayValueProcess.js b/entity/WeblinkTag_entity/entityfields/tag/displayValueProcess.js
index beebea09168f9f4766bae042d7e7f9ce35a70aed..5e11e8f7a16171e832f253b6554b4ec2b069bfd4 100644
--- a/entity/WeblinkTag_entity/entityfields/tag/displayValueProcess.js
+++ b/entity/WeblinkTag_entity/entityfields/tag/displayValueProcess.js
@@ -1,5 +1,6 @@
import("system.vars");
import("Keyword_lib");
import("system.result");
+import("KeywordRegistry_basic");
-result.string(KeywordUtils.getViewValue("LinkTags", vars.get("$field.TAG")));
\ No newline at end of file
+result.string(KeywordUtils.getViewValue($KeywordRegistry.weblinkTags()), vars.get("$field.TAG"));
\ No newline at end of file
diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index ba40c32758c338e9b683a319b8a4e7aa3b00a991..e263ae195e479bda5863a57b9934491540590a36 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -206,6 +206,28 @@
<title>Last Click</title>
<contentType>DATE</contentType>
</entityField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityConsumer>
+ <name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/documentation.adoc</documentation>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -296,7 +318,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>userLastChange.value</name>
- <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js</expression>
+ <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
@@ -304,6 +326,10 @@
<expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastclick.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ACTION_TYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e5484c53bfd9839d54f6b49a8fa1e5ee6bdc81b
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.WEBLINKID"), tableNames: ["WEBLINK"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5f5e2e14661caad5c0c4eed47e503e2f5f4b2ba
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("Context_lib");
+
+
+
+AdminViewUtils.open("WEBLINKID", [
+ ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
+ ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
+ ["USER_NEW", vars.get("$field.USER_NEW")],
+ ["USER_EDIT", vars.get("$field.USER_EDIT")]
+]);
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/openadminview/stateProcess.js b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f2298db7304b4d44a15fbad7f720558c02da99
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/url/onValidation.js b/entity/Weblink_entity/entityfields/url/onValidation.js
index e6206fe51d7947ef870a671ef47fb3089c8f0ce4..ad34bba4f8f454fbfa8d54c5e2e4e08dc69d1fb0 100644
--- a/entity/Weblink_entity/entityfields/url/onValidation.js
+++ b/entity/Weblink_entity/entityfields/url/onValidation.js
@@ -9,7 +9,7 @@ if (vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW && vars.get("$loc
if (newSelect("URL").from("WEBLINK").where("WEBLINK.URL", vars.get("$local.value")).cell())
result.string(translate.text("URL must be unique"));
- if (vars.get("$field.ISREDIRECT") == "1" && !/^(?:http(s)?:\/\/)[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/g.test(vars.get("$local.value")))
+ if (vars.get("$field.ISREDIRECT") == "1" && !/^(?:http(s)?:\/\/)[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#%[\]@!\$&'\(\)\*\+,;=.]+$/g.test(vars.get("$local.value")) && !/\/[\w\-\._~:/?#%[\]@!\$&'\(\)\*\+,;=.]+$/g.test(vars.get("$local.value")))
{
result.string(translate.text("Redirect needs a full URL with http/https"));
}
diff --git a/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js b/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js
index f3aa364a806fc472dbf0dce26576d5cbabe82b3d..2e069f777aa1a112c9cdb37baa7bb3d72746e986 100644
--- a/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js
+++ b/entity/Weblink_entity/recordcontainers/db/orderClauseProcess.js
@@ -3,6 +3,6 @@ import("system.result");
import("Sql_lib");
var ret = {};
-ret[SqlMaskingUtils.prototype.isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW")] = db.DESCENDING;
+ret[new SqlMaskingUtils().isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW")] = db.DESCENDING;
result.object(ret);
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..5f4573dc27b744862ef193913294c1d4f4607ff7
--- /dev/null
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.weblinkActionType(), "WEBLINK.ACTION_TYPE"));
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js
index 02a47dbbaf0dcf516217ec4f65a2a0d310f8c1e3..ac99863a915cabdb31357539d6bcdf17a4eec004 100644
--- a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastchange.value/expression.js
@@ -1,6 +1,6 @@
import("system.result");
import("Sql_lib");
-var cond = SqlMaskingUtils.prototype.isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW");
+var cond = new SqlMaskingUtils().isNull("WEBLINK.DATE_EDIT", "WEBLINK.DATE_NEW");
result.string(cond);
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb2cdf0df266469729e5484e8da7621f436dfa82
--- /dev/null
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlastchange.value/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+
+var cond = new SqlMaskingUtils().isNull("WEBLINK.USER_EDIT", "WEBLINK.USER_NEW");
+
+result.string(cond);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 3a98eb7d74771609113da1c2dd938493de542389..f691753f8cf313dd790fe1bc0bea83f5d52dec31 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4525,10 +4525,10 @@
<key>Shows unread notifications about different content, e.g. Appointments, serial mails, ...</key>
</entry>
<entry>
- <key>Shows how many sales projects are in the various sales phases</key>
+ <key>Show how many sales projects are in the various sales phases</key>
</entry>
<entry>
- <key>Most important salse key figures</key>
+ <key>Most important Sales key figures</key>
</entry>
<entry>
<key>Shows the organisations turnover and forecast</key>
@@ -4828,7 +4828,7 @@
<key>My Forecast and Turnover </key>
</entry>
<entry>
- <key>Shows my Forecast and Turnover for the actual year</key>
+ <key>Show my Forecast and Turnover for the current year</key>
</entry>
<entry>
<key>My Forecast and Turnover</key>
@@ -7744,7 +7744,7 @@
<key>Sales Project Id</key>
</entry>
<entry>
- <key>Sales Project Convertion Rates</key>
+ <key>Sales Project Conversion Rates</key>
</entry>
<entry>
<key>Set Campaign Step</key>
@@ -9269,7 +9269,7 @@
<key>First Approval</key>
</entry>
<entry>
- <key>show all offers with second approval</key>
+ <key>Show all offers with second approval</key>
</entry>
<entry>
<key>Second Approval</key>
@@ -9278,7 +9278,7 @@
<key>Approval denied</key>
</entry>
<entry>
- <key>show all offers with first approval</key>
+ <key>Show all offers with first approval</key>
</entry>
<entry>
<key>[TEST] Importer</key>
@@ -11214,28 +11214,46 @@
<key>Reveal the price in the offer</key>
</entry>
<entry>
- <key>Volume(Euro)</key>
+ <key>Valid from (as %0)</key>
+ </entry>
+ <entry>
+ <key>Calculate sum</key>
+ </entry>
+ <entry>
+ <key>Offers / Receipts</key>
+ </entry>
+ <entry>
+ <key>${CONTEXT}</key>
+ </entry>
+ <entry>
+ <key>Manual resynchronization</key>
+ </entry>
+ <entry>
+ <key>Discount in %0</key>
+ </entry>
+ <entry>
+ <key>Discount in %</key>
</entry>
<entry>
- <key>Swiss Franc</key>
+ <key>You were assigned as new district contact to district %0 and %1 organisation(s).</key>
</entry>
<entry>
- <key>Canadian Dollar</key>
+ <key>Set parent district</key>
</entry>
<entry>
- <key>Volume Weighted(%0)</key>
+ <key>The roll out date must be after the project start!</key>
</entry>
<entry>
- <key>Values have not been updated, because the stored rate is equal to the most up to date one.</key>
+ <key>Set auto assignment</key>
</entry>
<entry>
- <key>Values have not been updated, because the stored rate is already up to date.</key>
+ <key>No Datasets selected</key>
</entry>
<entry>
- <key>Refresh %0 Values</key>
+ <key>Subject and Body</key>
</entry>
<entry>
- <key>Values</key>
+ <key>Serial action</key>
</entry>
<entry>
<key>Slave UID</key>
@@ -11246,9 +11264,6 @@
<entry>
<key>EWS - Manage Synctable</key>
</entry>
- <entry>
- <key>Refresh Currency Rate</key>
- </entry>
<entry>
<key>Start Workflow</key>
</entry>
@@ -11271,14 +11286,23 @@
<key>Intervall setzen</key>
</entry>
<entry>
- <key>Mosaico template</key>
+ <key>[TEST] Util_lib - ArrayUtils</key>
</entry>
<entry>
- <key>Currencies</key>
+ <key>Mosaico template</key>
</entry>
<entry>
<key>Mosaico</key>
</entry>
+ <entry>
+ <key>Input</key>
+ </entry>
+ <entry>
+ <key>Advertising Id</key>
+ </entry>
+ <entry>
+ <key>Advertisingitem Id</key>
+ </entry>
<entry>
<key>Device ID</key>
</entry>
@@ -11289,14 +11313,11 @@
<key>Propkey</key>
</entry>
<entry>
- <key>User Currency</key>
+ <key>[TEST] ZippingUtil_lib</key>
</entry>
<entry>
<key>LastSync zurücksetzen</key>
</entry>
- <entry>
- <key>Currency RATE</key>
- </entry>
<entry>
<key>Device ID Reset</key>
</entry>
@@ -11304,79 +11325,76 @@
<key>Show the finished Tickets in the last 4 weeks</key>
</entry>
<entry>
- <key>Total gross (%0)</key>
- </entry>
- <entry>
- <key>discounted Price (%0)</key>
+ <key>Kd.-Nr.</key>
</entry>
<entry>
- <key>Total net (%0)</key>
+ <key>completed</key>
</entry>
<entry>
- <key>Total Net (%0)</key>
+ <key>Existing customer</key>
</entry>
<entry>
- <key>Total VAT (%0)</key>
+ <key>Cust.-No.</key>
</entry>
<entry>
- <key>Unit price (%0)</key>
+ <key>by title</key>
</entry>
<entry>
- <key>discounted Vat (%0)</key>
+ <key>by translated title</key>
</entry>
<entry>
- <key>Sum (%0)</key>
+ <key>${TASK_PROTECTIONLEVEL}</key>
</entry>
<entry>
- <key>Target Amount (%0)</key>
+ <key>manually</key>
</entry>
<entry>
- <key>Actual Amount (%0)</key>
+ <key>Contact or company</key>
</entry>
<entry>
- <key>Price (%0)</key>
+ <key>File can't be edited here. You can download, edit and reupload the template to change the content.</key>
</entry>
<entry>
- <key>Advertising Item</key>
+ <key>Cost overview</key>
</entry>
<entry>
- <key>Currency Rates</key>
+ <key>Stufen</key>
</entry>
<entry>
- <key>%0 Values updated using the current rate: %1</key>
+ <key>Adito red</key>
</entry>
<entry>
- <key>Source Currency and Target Currency cannot be the same Currency.</key>
+ <key>general</key>
</entry>
<entry>
- <key>British Pound Sterling</key>
+ <key>Adito grey</key>
</entry>
<entry>
- <key>Valid from (as %0)</key>
+ <key>Ad hoc</key>
</entry>
<entry>
- <key>Insert subnode</key>
+ <key>White</key>
</entry>
<entry>
- <key>Calculate sum</key>
+ <key>news@adito.de</key>
</entry>
<entry>
- <key>Offers / Receipts</key>
+ <key>Feedback</key>
</entry>
<entry>
- <key>New Currencyrate</key>
+ <key>Adito light blue</key>
</entry>
<entry>
- <key>Current Currencyrate</key>
+ <key>Retour</key>
</entry>
<entry>
- <key>Paid (%0)</key>
+ <key>Adito dark blue</key>
</entry>
<entry>
- <key>Vat</key>
+ <key>To re-open tickets, please use the corresponding action.</key>
</entry>
<entry>
- <key>Net</key>
+ <key>The status-change of the ticket was skipped. Any other changes were carried out.</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index fcdaf1234409d6d13e2bedb129e007087b4bac0e..b16adb33fc7eeb301e6a507f1bfb3b44ed34fdcb 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,6 +10,10 @@
<key>The file did not contain any data</key>
<value>Die Datei enthielt keine Daten</value>
</entry>
+ <entry>
+ <key>by translated title</key>
+ <value>Titel (übersetzt)</value>
+ </entry>
<entry>
<key>Slave administration</key>
<value>Slave Verwaltung</value>
@@ -21,6 +25,10 @@
<entry>
<key>Ticket was reopen by</key>
</entry>
+ <entry>
+ <key>Contact or company</key>
+ <value>Kontakt oder Firma</value>
+ </entry>
<entry>
<key>You tried to change the status of a ticket from 'ended' to another status.</key>
<value>Sie haben versucht den Status eines Tickets von 'abgeschlossen zu einem anderen Status zu ändern.</value>
@@ -62,13 +70,17 @@
<value>Sie müssen mindestens einen Empfänger eintragen.</value>
</entry>
<entry>
- <key>To re-opening tickets, please use the corresponding action.</key>
+ <key>To re-open tickets, please use the corresponding action.</key>
<value>Nutzen Sie bitte die entsprechende Aktion, um Tickets wiederzueröffnen.</value>
</entry>
<entry>
<key>Single (Service/Internal)</key>
<value>Einzel (Service/Intern)</value>
</entry>
+ <entry>
+ <key>Subject and Body</key>
+ <value>Betreff und Mailtext</value>
+ </entry>
<entry>
<key>Original editor</key>
<value>Originaler Bearbeiter</value>
@@ -83,7 +95,7 @@
</entry>
<entry>
<key>You tried to change the status of \"%0\" tickets from 'ended' to another status.</key>
- <value>Sie haben versucht den Status von \"%0\" Tickets von 'abgeschlossen zu einem anderen Status zu ändern.</value>
+ <value>Sie haben versucht den Status von \"%0\" Tickets von 'abgeschlossen' zu einem anderen Status zu ändern.</value>
</entry>
<entry>
<key>Ticket was duplicated by</key>
@@ -307,9 +319,13 @@
<key>Fullfilled</key>
<value>erledigt</value>
</entry>
+ <entry>
+ <key>No Datasets selected</key>
+ <value>Keine Datensätze ausgewählt</value>
+ </entry>
<entry>
<key>A Phase filter has to be set when creating a checklistentry for the Salesproject Context.</key>
- <value>Es muss ein Filter auf die Phase gesetzt werden wenn der VertriebsprojektKontext ausgewählt ist.</value>
+ <value>Es muss ein Filter auf die Phase gesetzt werden, wenn der Context Vertriebsprojekt ausgewählt ist.</value>
</entry>
<entry>
<key>Redirect needs a full URL with http/https</key>
@@ -575,8 +591,8 @@
<value>Eigenschaft \"%0\" kann nur einmal mit dem selben Wert ausgewählt werden.</value>
</entry>
<entry>
- <key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key>
- <value>Das Bearbeiten von EML-Dateien ist hier nicht möglich. Um den Inhalt zu ändern, können Sie die Vorlage herunterladen, bearbeiten und erneut hochladen.</value>
+ <key>File can't be edited here. You can download, edit and reupload the template to change the content.</key>
+ <value>Das Bearbeiten der-Datei ist hier nicht möglich. Um den Inhalt zu ändern, können Sie die Vorlage herunterladen, bearbeiten und erneut hochladen.</value>
</entry>
<entry>
<key>Date Clicked</key>
@@ -720,7 +736,7 @@
</entry>
<entry>
<key>discounted Price</key>
- <value>Rbt. Betrag netto</value>
+ <value>Red. Betrag netto</value>
</entry>
<entry>
<key>Add app</key>
@@ -2074,7 +2090,7 @@
</entry>
<entry>
<key>Region</key>
- <value>Gebiet</value>
+ <value>Region</value>
</entry>
<entry>
<key>Lastname</key>
@@ -2272,6 +2288,10 @@
<key>Discount</key>
<value>Rabatt</value>
</entry>
+ <entry>
+ <key>Discount in %</key>
+ <value>Rabatt in %</value>
+ </entry>
<entry>
<key>Sales</key>
<value>Vertrieb</value>
@@ -2826,7 +2846,7 @@
</entry>
<entry>
<key>Unique click rate (in \%)</key>
- <value>Unique Klickrate in Prozent</value>
+ <value>Einzigartige Klickrate in Prozent</value>
</entry>
<entry>
<key>Contact Owner</key>
@@ -3252,10 +3272,6 @@
<key>Task</key>
<value>Aufgabe</value>
</entry>
- <entry>
- <key>subject</key>
- <value>Betreff</value>
- </entry>
<entry>
<key>Mobile</key>
<value>Handy</value>
@@ -3268,10 +3284,6 @@
<key>{$TASK_REQUESTOR}</key>
<value>Anforderer</value>
</entry>
- <entry>
- <key>description</key>
- <value>Beschreibung</value>
- </entry>
<entry>
<key>priority</key>
<value>Priorität</value>
@@ -3399,10 +3411,6 @@
<key>Keyword</key>
<value>Schlüsselwort</value>
</entry>
- <entry>
- <key>Manually</key>
- <value>Manuell</value>
- </entry>
<entry>
<key>Sorting</key>
<value>Sortierung</value>
@@ -3519,6 +3527,10 @@
<key>Public Hand</key>
<value>Öffentliche Hand</value>
</entry>
+ <entry>
+ <key>Cost overview</key>
+ <value>Kostenübersicht</value>
+ </entry>
<entry>
<key>Create and open in editor</key>
<value>Erstellen und im Editor öffnen</value>
@@ -4792,7 +4804,7 @@
<value>Tochtergesellschaft von</value>
</entry>
<entry>
- <key>ended</key>
+ <key>completed</key>
<value>abgeschlossen</value>
</entry>
<entry>
@@ -6131,6 +6143,10 @@
<key>Tag</key>
<value>Tag</value>
</entry>
+ <entry>
+ <key>general</key>
+ <value>Allgemein</value>
+ </entry>
<entry>
<key>Title suffix</key>
<value>Namenszusatz</value>
@@ -7219,7 +7235,7 @@
<value>Geburtstagsliste</value>
</entry>
<entry>
- <key>Consisted customer</key>
+ <key>Existing customer</key>
<value>Bestandskunde</value>
</entry>
<entry>
@@ -7773,6 +7789,10 @@
<key>(drop mails here)</key>
<value>(E-Mails per Drag and Drop einfügen)</value>
</entry>
+ <entry>
+ <key>manually</key>
+ <value>manuell</value>
+ </entry>
<entry>
<key>minute</key>
<value>Minute</value>
@@ -7821,6 +7841,10 @@
<key>seconds</key>
<value>Sekunden</value>
</entry>
+ <entry>
+ <key>by title</key>
+ <value>Titel</value>
+ </entry>
<entry>
<key>Duplicatescan</key>
<value>Dublettenermittlung</value>
@@ -7950,11 +7974,11 @@
<value>Zeigt alle ungelesenen Benachrichtigungen mit verschiedenen Inhalten, z.B. zu Terminen, Serienmails</value>
</entry>
<entry>
- <key>Shows how many sales projects are in the various sales phases</key>
+ <key>Show how many sales projects are in the various sales phases</key>
<value>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind</value>
</entry>
<entry>
- <key>Most important salse key figures</key>
+ <key>Most important Sales key figures</key>
<value>Zeigt die wichtigsten Vertriebskennzahlen</value>
</entry>
<entry>
@@ -8398,6 +8422,10 @@
<key>${CONTRACT_STATUS}</key>
<value>Vertragsstatus</value>
</entry>
+ <entry>
+ <key>${CONTEXT}</key>
+ <value>Context</value>
+ </entry>
<entry>
<key>Time in minutes</key>
<value>Zeit in Minuten</value>
@@ -8522,7 +8550,7 @@
<value>Wird gelöscht</value>
</entry>
<entry>
- <key>Shows my Forecast and Turnover for the actual year</key>
+ <key>Show my Forecast and Turnover for the current year</key>
<value>Zeigt meinen Forecast und meinen Umsatz für das aktuelle Jahr</value>
</entry>
<entry>
@@ -9946,7 +9974,7 @@ Bitte Datumseingabe prüfen</value>
<value>Eigenschaften setzen (verwende Filterergebnis)</value>
</entry>
<entry>
- <key>show all offers with first approval</key>
+ <key>Show all offers with first approval</key>
<value>Alle Angebote mit 1. Freigabe anzeigen</value>
</entry>
<entry>
@@ -10309,7 +10337,7 @@ Bitte Datumseingabe prüfen</value>
<value>Neu</value>
</entry>
<entry>
- <key>show all offers with second approval</key>
+ <key>Show all offers with second approval</key>
<value>Alle Angebote mit 2. Freigabe anzeigen</value>
</entry>
<entry>
@@ -11273,7 +11301,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Shows the different conversion rates of the sales project phases</key>
- <value>zeigt die unterschiedlichen Umrechnungsraten der vertriebsprojektphasen</value>
+ <value>Zeigt die unterschiedlichen Conversion Rates der Vertriebsprojektphasen</value>
</entry>
<entry>
<key>Salesproject Convertion Rates</key>
@@ -11503,7 +11531,7 @@ Bitte Datumseingabe prüfen</value>
<value>VertriebsprojektId</value>
</entry>
<entry>
- <key>Sales Project Convertion Rates</key>
+ <key>Sales Project Conversion Rates</key>
<value>Vertriebsprojekt Umrechnungsraten</value>
</entry>
<entry>
@@ -12940,6 +12968,11 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Approval</key>
+ <value>Genehmigung</value>
+ </entry>
+ <entry>
+ <key>No activity</key>
+ <value>Keine Aktivität</value>
</entry>
<entry>
<key>No activity</key>
@@ -13439,6 +13472,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Einzelaufgaben erstellen</key>
+ <value>Create single tasks</value>
</entry>
<entry>
<key>Erledigt setzen</key>
@@ -13521,6 +13555,10 @@ Bitte Datumseingabe prüfen</value>
<key>determined in</key>
<value>ermittelt in</value>
</entry>
+ <entry>
+ <key>The status-change of the ticket was skipped. Any other changes were carried out.</key>
+ <value>Die Statusänderungen dieses Tickets wurde übersprungen. Alle anderen Änderungen wurden durchgeführt.</value>
+ </entry>
<entry>
<key>duplicate Ticket</key>
<value>Duplizieren</value>
@@ -13995,10 +14033,6 @@ Bitte Datumseingabe prüfen</value>
<key>Daily goals</key>
<value>Tagesziele</value>
</entry>
- <entry>
- <key>Further informations</key>
- <value>Weitere Informationen</value>
- </entry>
<entry>
<key>Conclusion</key>
<value>Abschluss</value>
@@ -14634,6 +14668,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Unique click rate (in %)</key>
+ <value>Einzigartige Klickrate in Prozent</value>
</entry>
<entry>
<key>Employees for Employee groups</key>
@@ -14649,6 +14684,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Opener rate (in %)</key>
+ <value>Öffnungsrate in Prozent</value>
</entry>
<entry>
<key>Evaluation type</key>
@@ -14680,6 +14716,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Click rate (in %)</key>
+ <value>Klickrate in Prozent</value>
</entry>
<entry>
<key>Ticket return</key>
@@ -14732,6 +14769,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>New Service ticket</key>
+ <value>Neues Serviceticket</value>
</entry>
<entry>
<key>Use all service ticket categories</key>
@@ -14764,6 +14802,18 @@ Bitte Datumseingabe prüfen</value>
<key>Insert subnode</key>
<value>Unterposten einfügen</value>
</entry>
+ <entry>
+ <key>Serial action</key>
+ <value>Serienaktion</value>
+ </entry>
+ <entry>
+ <key>Set parent district</key>
+ <value>Ãœbergeordnetes Gebiet setzen</value>
+ </entry>
+ <entry>
+ <key>Set auto assignment</key>
+ <value>Auto-Zuordnung setzen</value>
+ </entry>
<entry>
<key>Calculate sum</key>
<value>Summe berechnen</value>
@@ -14772,80 +14822,165 @@ Bitte Datumseingabe prüfen</value>
<key>Valid from (as %0)</key>
<value>Gültig von (in %0)</value>
</entry>
+ <entry>
+ <key>You were assigned as new district contact to district %0 and %1 organisation(s).</key>
+ <value>Sie wurden Distrikt %0 und %1 Organisation(en) als neuer Distriktkontakt zugewiesen.</value>
+ </entry>
+ <entry>
+ <key>Discount in %0</key>
+ <value>Rabatt in %0</value>
+ </entry>
+ <entry>
+ <key>The roll out date must be after the project start!</key>
+ <value>Das Roll Out Datum muss nach dem Projektstart liegen!</value>
+ </entry>
+ <entry>
+ <key>Manual resynchronization</key>
+ </entry>
+ <entry>
+ <key>Slave UID</key>
+ </entry>
+ <entry>
+ <key>AsysAudit Clean Up</key>
+ </entry>
+ <entry>
+ <key>EWS - Manage Synctable</key>
+ </entry>
+ <entry>
+ <key>Start Workflow</key>
+ </entry>
+ <entry>
+ <key>Beschreibung</key>
+ </entry>
+ <entry>
+ <key>EWS - Sync to Exchange</key>
+ </entry>
+ <entry>
+ <key>Search Synchronisation</key>
+ </entry>
+ <entry>
+ <key>Last synchronized</key>
+ </entry>
<entry>
<key>Intervall</key>
</entry>
<entry>
- <key>Show my tickets that are in process.</key>
+ <key>Intervall setzen</key>
+ </entry>
+ <entry>
+ <key>[TEST] Util_lib - ArrayUtils</key>
</entry>
<entry>
<key>Mosaico template</key>
</entry>
<entry>
- <key>Propkey</key>
+ <key>Mosaico</key>
+ </entry>
+ <entry>
+ <key>Input</key>
+ </entry>
+ <entry>
+ <key>Advertising Id</key>
+ </entry>
+ <entry>
+ <key>Advertisingitem Id</key>
</entry>
<entry>
<key>Device ID</key>
</entry>
<entry>
- <key>Search Synchronisation</key>
+ <key>Show my tickets that are in process.</key>
</entry>
<entry>
- <key>AsysAudit Clean Up</key>
+ <key>Propkey</key>
</entry>
<entry>
- <key>Currencies</key>
+ <key>[TEST] ZippingUtil_lib</key>
</entry>
<entry>
- <key>EWS - Manage Synctable</key>
+ <key>LastSync zurücksetzen</key>
</entry>
<entry>
- <key>Slave UID</key>
+ <key>Device ID Reset</key>
</entry>
<entry>
- <key>Values have not been updated, because the stored rate is already up to date</key>
+ <key>Show the finished Tickets in the last 4 weeks</key>
</entry>
<entry>
- <key>Volume(Euro)</key>
+ <key>Cust.-No.</key>
+ <value>Kd.-Nr.</value>
</entry>
<entry>
- <key>Mosaico</key>
+ <key>subject</key>
+ <value>Betreff</value>
</entry>
<entry>
- <key>Beschreibung</key>
+ <key>ended</key>
+ <value>beendet</value>
</entry>
<entry>
- <key>EWS - Sync to Exchange</key>
+ <key>description</key>
+ <value>Beschreibung</value>
</entry>
<entry>
- <key>Euro Values updated using the current rate:</key>
+ <key>${TASK_PROTECTIONLEVEL}</key>
+ <value>Private Aufgabe</value>
</entry>
<entry>
- <key>Show the finished Tickets in the last 4 weeks</key>
+ <key>Manually</key>
</entry>
<entry>
- <key>Intervall setzen</key>
+ <key>Consisted customer</key>
</entry>
<entry>
- <key>LastSync zurücksetzen</key>
+ <key>Further informations</key>
</entry>
<entry>
- <key>Start Workflow</key>
+ <key>EML files can't be edited here. You can download, edit and reupload the template to change the content.</key>
</entry>
<entry>
- <key>Currency RATE</key>
+ <key>Kd.-Nr.</key>
</entry>
<entry>
- <key>Values have been updated, using the current rate:</key>
+ <key>Stufen</key>
</entry>
<entry>
- <key>Refresh Euro Values</key>
+ <key>Adito red</key>
+ <value>Adito rot</value>
</entry>
<entry>
- <key>Device ID Reset</key>
+ <key>general</key>
+ <value>allgemein</value>
</entry>
<entry>
- <key>Last synchronized</key>
+ <key>Adito grey</key>
+ <value>Adito grau</value>
+ </entry>
+ <entry>
+ <key>Ad hoc</key>
+ </entry>
+ <entry>
+ <key>White</key>
+ <value>Weiß</value>
+ </entry>
+ <entry>
+ <key>news@adito.de</key>
+ </entry>
+ <entry>
+ <key>Feedback</key>
+ <value>Rückmeldung</value>
+ </entry>
+ <entry>
+ <key>Adito light blue</key>
+ <value>Adito hellblau</value>
+ </entry>
+ <entry>
+ <key>Retour</key>
+ <value>Rücksendung</value>
+ </entry>
+ <entry>
+ <key>Adito dark blue</key>
+ <value>Adito dunkelblau</value>
</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 6b2cee8cac330028e228bfafee82d48a2df1e534..4b457f388b859f97cdac9d7d70c402df7fda176b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -882,9 +882,6 @@
<entry>
<key>Task</key>
</entry>
- <entry>
- <key>subject</key>
- </entry>
<entry>
<key>{$TASK_REQUESTOR}</key>
<value>Requestor</value>
@@ -893,9 +890,6 @@
<key>{$TASK_EDITOR}</key>
<value>Editor</value>
</entry>
- <entry>
- <key>description</key>
- </entry>
<entry>
<key>priority</key>
</entry>
@@ -1830,7 +1824,7 @@
<key>Swaziland</key>
</entry>
<entry>
- <key>ended</key>
+ <key>completed</key>
</entry>
<entry>
<key>Wallis and Futuna</key>
@@ -4624,10 +4618,10 @@
<key>Shows unread notifications about different content, e.g. Appointments, serial mails, ...</key>
</entry>
<entry>
- <key>Shows how many sales projects are in the various sales phases</key>
+ <key>Show how many sales projects are in the various sales phases</key>
</entry>
<entry>
- <key>Most important salse key figures</key>
+ <key>Most important Sales key figures</key>
</entry>
<entry>
<key>Shows the organisations turnover and forecast</key>
@@ -4927,7 +4921,7 @@
<key>My Forecast and Turnover </key>
</entry>
<entry>
- <key>Shows my Forecast and Turnover for the actual year</key>
+ <key>Show my Forecast and Turnover for the current year</key>
</entry>
<entry>
<key>My Forecast and Turnover</key>
@@ -7565,7 +7559,7 @@
<key>Sales Project Id</key>
</entry>
<entry>
- <key>Sales Project Convertion Rates</key>
+ <key>Sales Project Conversion Rates</key>
</entry>
<entry>
<key>Set Campaign Step</key>
@@ -8722,7 +8716,7 @@
<key>First Approval</key>
</entry>
<entry>
- <key>show all offers with second approval</key>
+ <key>Show all offers with second approval</key>
</entry>
<entry>
<key>Second Approval</key>
@@ -8731,7 +8725,7 @@
<key>Approval denied</key>
</entry>
<entry>
- <key>show all offers with first approval</key>
+ <key>Show all offers with first approval</key>
</entry>
<entry>
<key>[TEST] Importer</key>
@@ -11310,28 +11304,47 @@
<key>Reveal the price in the offer</key>
</entry>
<entry>
- <key>Volume(Euro)</key>
+ <key>Valid from (as %0)</key>
+ </entry>
+ <entry>
+ <key>Calculate sum</key>
+ </entry>
+ <entry>
+ <key>Offers / Receipts</key>
+ </entry>
+ <entry>
+ <key>${CONTEXT}</key>
+ <value>Context</value>
+ </entry>
+ <entry>
+ <key>Manual resynchronization</key>
+ </entry>
+ <entry>
+ <key>Discount in %0</key>
+ </entry>
+ <entry>
+ <key>Discount in %</key>
</entry>
<entry>
- <key>Swiss Franc</key>
+ <key>You were assigned as new district contact to district %0 and %1 organisation(s).</key>
</entry>
<entry>
- <key>Canadian Dollar</key>
+ <key>Set parent district</key>
</entry>
<entry>
- <key>Volume Weighted(%0)</key>
+ <key>The roll out date must be after the project start!</key>
</entry>
<entry>
- <key>Values have not been updated, because the stored rate is equal to the most up to date one.</key>
+ <key>Set auto assignment</key>
</entry>
<entry>
- <key>Values have not been updated, because the stored rate is already up to date.</key>
+ <key>No Datasets selected</key>
</entry>
<entry>
- <key>Refresh %0 Values</key>
+ <key>Subject and Body</key>
</entry>
<entry>
- <key>Values</key>
+ <key>Serial action</key>
</entry>
<entry>
<key>Slave UID</key>
@@ -11342,9 +11355,6 @@
<entry>
<key>EWS - Manage Synctable</key>
</entry>
- <entry>
- <key>Refresh Currency Rate</key>
- </entry>
<entry>
<key>Start Workflow</key>
</entry>
@@ -11367,14 +11377,23 @@
<key>Intervall setzen</key>
</entry>
<entry>
- <key>Mosaico template</key>
+ <key>[TEST] Util_lib - ArrayUtils</key>
</entry>
<entry>
- <key>Currencies</key>
+ <key>Mosaico template</key>
</entry>
<entry>
<key>Mosaico</key>
</entry>
+ <entry>
+ <key>Input</key>
+ </entry>
+ <entry>
+ <key>Advertising Id</key>
+ </entry>
+ <entry>
+ <key>Advertisingitem Id</key>
+ </entry>
<entry>
<key>Device ID</key>
</entry>
@@ -11385,14 +11404,11 @@
<key>Propkey</key>
</entry>
<entry>
- <key>User Currency</key>
+ <key>[TEST] ZippingUtil_lib</key>
</entry>
<entry>
<key>LastSync zurücksetzen</key>
</entry>
- <entry>
- <key>Currency RATE</key>
- </entry>
<entry>
<key>Device ID Reset</key>
</entry>
@@ -11400,79 +11416,83 @@
<key>Show the finished Tickets in the last 4 weeks</key>
</entry>
<entry>
- <key>Total gross (%0)</key>
+ <key>Kd.-Nr.</key>
+ </entry>
+ <entry>
+ <key>subject</key>
</entry>
<entry>
- <key>discounted Price (%0)</key>
+ <key>ended</key>
</entry>
<entry>
- <key>Total net (%0)</key>
+ <key>description</key>
</entry>
<entry>
- <key>Total Net (%0)</key>
+ <key>Existing customer</key>
</entry>
<entry>
- <key>Total VAT (%0)</key>
+ <key>Cust.-No.</key>
</entry>
<entry>
- <key>Unit price (%0)</key>
+ <key>by title</key>
</entry>
<entry>
- <key>discounted Vat (%0)</key>
+ <key>by translated title</key>
</entry>
<entry>
- <key>Sum (%0)</key>
+ <key>${TASK_PROTECTIONLEVEL}</key>
+ <value>Private task</value>
</entry>
<entry>
- <key>Target Amount (%0)</key>
+ <key>manually</key>
</entry>
<entry>
- <key>Actual Amount (%0)</key>
+ <key>Contact or company</key>
</entry>
<entry>
- <key>Price (%0)</key>
+ <key>File can't be edited here. You can download, edit and reupload the template to change the content.</key>
</entry>
<entry>
- <key>Advertising Item</key>
+ <key>Cost overview</key>
</entry>
<entry>
- <key>Currency Rates</key>
+ <key>Stufen</key>
</entry>
<entry>
- <key>%0 Values updated using the current rate: %1</key>
+ <key>Adito red</key>
</entry>
<entry>
- <key>Source Currency and Target Currency cannot be the same Currency.</key>
+ <key>general</key>
</entry>
<entry>
- <key>British Pound Sterling</key>
+ <key>Adito grey</key>
</entry>
<entry>
- <key>Valid from (as %0)</key>
+ <key>Ad hoc</key>
</entry>
<entry>
- <key>Insert subnode</key>
+ <key>White</key>
</entry>
<entry>
- <key>Calculate sum</key>
+ <key>news@adito.de</key>
</entry>
<entry>
- <key>Offers / Receipts</key>
+ <key>Feedback</key>
</entry>
<entry>
- <key>New Currencyrate</key>
+ <key>Adito light blue</key>
</entry>
<entry>
- <key>Current Currencyrate</key>
+ <key>Retour</key>
</entry>
<entry>
- <key>Paid (%0)</key>
+ <key>Adito dark blue</key>
</entry>
<entry>
- <key>Vat</key>
+ <key>To re-open tickets, please use the corresponding action.</key>
</entry>
<entry>
- <key>Net</key>
+ <key>The status-change of the ticket was skipped. Any other changes were carried out.</key>
</entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
diff --git a/neonContext/360Degree/360Degree.aod b/neonContext/360Degree/360Degree.aod
index a20caa32190d850eacca19b1f2da95805c4c041d..f9bd49ef6887aaf3d0d0dbeffe3789036af094b9 100644
--- a/neonContext/360Degree/360Degree.aod
+++ b/neonContext/360Degree/360Degree.aod
@@ -3,7 +3,6 @@
<name>360Degree</name>
<title>360 Degree</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterView>360DegreeFilter_view</filterView>
<entity>360Degree_entity</entity>
<references>
<neonViewReference>
diff --git a/neonContext/MarketingWorkflowLauncher/MarketingWorkflowLauncher.aod b/neonContext/DistrictChangeField/DistrictChangeField.aod
similarity index 62%
rename from neonContext/MarketingWorkflowLauncher/MarketingWorkflowLauncher.aod
rename to neonContext/DistrictChangeField/DistrictChangeField.aod
index e200a8a70f878ecb8c691752d3585cf3880e5bef..f7ae8af03e21147691ba188d6d2ee81d66ffffac 100644
--- a/neonContext/MarketingWorkflowLauncher/MarketingWorkflowLauncher.aod
+++ b/neonContext/DistrictChangeField/DistrictChangeField.aod
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
- <name>MarketingWorkflowLauncher</name>
- <title>Marketing workflow</title>
+ <name>DistrictChangeField</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>MarketingWorkflowLauncher_entity</entity>
+ <editView>DistrictChangeField_view</editView>
+ <entity>DistrictChangeField_entity</entity>
<references>
<neonViewReference>
- <name>39e62b1f-b27f-4f74-8521-d95e27748c6c</name>
- <view>MarketingWorkflowLauncherEdit_view</view>
+ <name>c9bd3a38-4c54-45bd-b24e-ba5b9c49ec58</name>
+ <view>DistrictChangeField_view</view>
</neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index fccd99b2964f1c91e161f5579d611ee0a11f2785..537ab53cb4ceecc98da13c4c72a42ff20a9bf06d 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -55,10 +55,6 @@
<name>ade0ed85-260d-4da5-bf4c-f838cfdcc693</name>
<view>OrganisationReport_view</view>
</neonViewReference>
- <neonViewReference>
- <name>d27a8b2d-2fcf-4626-843c-e709c2ed71b0</name>
- <view>OrganisationClassification</view>
- </neonViewReference>
<neonViewReference>
<name>d9065774-5ef3-4d1c-b96f-b2f98e6a581c</name>
<view>OrganisationNoNoiseTable_view</view>
diff --git a/neonContext/Product/Product.aod b/neonContext/Product/Product.aod
index a351e0477842e17e1b6413477923289f3f45e36b..dc4076556ecffd9730ca9c8a82e91517119372d9 100644
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
@@ -39,5 +39,13 @@
<name>bcc36a52-f97f-4883-b1eb-21b9daef82f4</name>
<view>ProductOfferOrder_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>d4a89117-5f6d-4fdf-ad1b-546deb45f497</name>
+ <view>ProductKnowledgeManagementDrawer_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>97ada610-725f-4636-a812-4da364a41636</name>
+ <view>ProductDescriptionTranslationDrawer_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/UserDailyGoals/UserDailyGoals.aod b/neonContext/UserDailyGoals/UserDailyGoals.aod
deleted file mode 100644
index 80a3f8b913cb4c9a0d876119960d088bccdab0b3..0000000000000000000000000000000000000000
--- a/neonContext/UserDailyGoals/UserDailyGoals.aod
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
- <name>UserDailyGoals</name>
- <title>Ticket daily goals</title>
- <description><null value></description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
-</neonContext>
diff --git a/neonContext/WeblinkClick/WeblinkClick.aod b/neonContext/WeblinkClick/WeblinkClick.aod
index 06f55183587ce936ca90e2d452ecaf69070be639..a371f4c0fbd3d58ebe9e4beea7757f34a115725c 100644
--- a/neonContext/WeblinkClick/WeblinkClick.aod
+++ b/neonContext/WeblinkClick/WeblinkClick.aod
@@ -2,7 +2,6 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
<name>WeblinkClick</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterView>WeblinkClickFilter_view</filterView>
<entity>WeblinkClick_entity</entity>
<references>
<neonViewReference>
diff --git a/neonContext/WorkflowStartConfig/WorkflowStartConfig.aod b/neonContext/WorkflowStartConfig/WorkflowStartConfig.aod
index 5261c781f8746359414b7c3c92f5783050136ff7..7915d25a13f55ec7d8af1a37fad65f7a279ac588 100644
--- a/neonContext/WorkflowStartConfig/WorkflowStartConfig.aod
+++ b/neonContext/WorkflowStartConfig/WorkflowStartConfig.aod
@@ -2,11 +2,17 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
<name>WorkflowStartConfig</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterView>WorkflowStartConfigFilter_view</filterView>
+ <editView>WorkflowStartConfigEdit_view</editView>
<entity>WorkflowStartConfig_entity</entity>
<references>
<neonViewReference>
<name>c6e5379e-3df6-4f1d-be39-32fd1ad0852d</name>
<view>WorkflowStartConfigFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>a8c1e94d-83cb-45c3-afc3-70686705ab82</name>
+ <view>WorkflowStartConfigEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index b2d178249281f7e171499d047499dea540086297..5228efc0ee3d54f2cdb3758dc78d2d2658679778 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -34,15 +34,15 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>8b6d9b7d-588e-481b-84ac-a3f918b266dc</name>
- <entityField>LogHistories</entityField>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>82705fc4-32ea-42de-ae34-df00dbd4b159</name>
<entityField>#ENTITY</entityField>
<view>ActivityAdvertising_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>8b6d9b7d-588e-481b-84ac-a3f918b266dc</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
index c4f5dc80868f0fc73c092adb982b07555b593d58..d4daec1fb871735874b52642b851d2c92fa5cb77 100644
--- a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
+++ b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
@@ -59,10 +59,6 @@
<name>e53a6f55-c4d4-49df-8785-55fa8ee8a657</name>
<entityField>DELIVERY</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>5f359ff4-06c6-4d6d-bf10-2f8dbf1fbb01</name>
- <entityField>SENT</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>007e2ca8-d7c8-4f9e-891f-a53f3d0e6b5a</name>
<entityField>INFO</entityField>
diff --git a/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod b/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
index 392578f715fb82a3e8f2b7ae0c1dc8e8c876a13b..768304d0d52dd0675356441507892769388435b0 100644
--- a/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
+++ b/neonView/AdvertisingItemSmallFilter_view/AdvertisingItemSmallFilter_view.aod
@@ -16,10 +16,6 @@
<name>4f14ad89-679c-43c5-bf2d-9a7050a84b4c</name>
<entityField>PRODUCT_ID</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>9cc62b40-e77e-46d9-b44f-9f0ee42d7116</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
<neonTableColumn>
<name>a54cbe2d-b6d4-42b9-9998-48a92b157147</name>
<entityField>DELIVERY</entityField>
diff --git a/neonView/BulkMailAnalysisDeviceTypeChart_view/BulkMailAnalysisDeviceTypeChart_view.aod b/neonView/BulkMailAnalysisDeviceTypeChart_view/BulkMailAnalysisDeviceTypeChart_view.aod
index 870422df4767619bedb31d77c2d8e055c8306cfb..df8146988e016472657942cb6d92acfab4261a21 100644
--- a/neonView/BulkMailAnalysisDeviceTypeChart_view/BulkMailAnalysisDeviceTypeChart_view.aod
+++ b/neonView/BulkMailAnalysisDeviceTypeChart_view/BulkMailAnalysisDeviceTypeChart_view.aod
@@ -11,6 +11,7 @@
<singleton v="true" />
<storeRoles>
<element>PROJECT_Marketing</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
</storeRoles>
<icon>NEON:GROUP_APPOINTMENT</icon>
<categories>
diff --git a/neonView/BulkMailAnalysisScoreCard_view/BulkMailAnalysisScoreCard_view.aod b/neonView/BulkMailAnalysisScoreCard_view/BulkMailAnalysisScoreCard_view.aod
index 650ea5b83a91a0131459a877fadf7cd46230aa5c..1fb0eecc08b3211b5a093f2092b4868a0a2af280 100644
--- a/neonView/BulkMailAnalysisScoreCard_view/BulkMailAnalysisScoreCard_view.aod
+++ b/neonView/BulkMailAnalysisScoreCard_view/BulkMailAnalysisScoreCard_view.aod
@@ -12,6 +12,7 @@
<singleton v="true" />
<storeRoles>
<element>PROJECT_Marketing</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
</storeRoles>
<icon>VAADIN:GRID_BIG</icon>
<categories>
diff --git a/neonView/BulkMailEdit_view/BulkMailEdit_view.aod b/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
index e8bc870a2e48ee27865667439c793a50ee939226..e0d049310bffe9e20502e81c0c383d34a224135b 100644
--- a/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
+++ b/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
@@ -97,6 +97,10 @@
<name>cd711f0c-20b7-4f1a-8bca-2e1cf420bb6d</name>
<entityField>ISOLANGUAGE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>651e0144-57e6-4559-9b73-4e7ae23e4a0a</name>
+ <entityField>CAMPAIGN_ID</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
diff --git a/neonView/BulkMailFilter_view/BulkMailFilter_view.aod b/neonView/BulkMailFilter_view/BulkMailFilter_view.aod
index 042e71cb800e3f9f8d63f78d61a5b654469ee418..58a7e0c06ef66dfa3abc8ceb54f97438b116c490 100644
--- a/neonView/BulkMailFilter_view/BulkMailFilter_view.aod
+++ b/neonView/BulkMailFilter_view/BulkMailFilter_view.aod
@@ -12,6 +12,7 @@
<singleton v="true" />
<storeRoles>
<element>PROJECT_Marketing</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
</storeRoles>
<icon>VAADIN:AT</icon>
<categories>
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index f61ce7711775bb207d6550a34a03ae62b373f096..9c304416151c5c105193aef06b1545744836e178 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -29,11 +29,6 @@
<entityField>BulkMailTestRecipients</entityField>
<view>BulkMailTestRecipientFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name>
- <entityField>Activities</entityField>
- <view>ActivityFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>cd8c44c9-209b-464c-a2e0-ce15720ab22e</name>
<entityField>MailLogs</entityField>
@@ -44,6 +39,11 @@
<entityField>Clicks</entityField>
<view>WeblinkClickFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>49eb2dd2-0df9-4b58-bdae-f941200be8d9</name>
<entityField>LogHistories</entityField>
diff --git a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
index 64ac3895ae985dd638bd924c1de629124cba1eae..777c523a8c23e39b3651723549741e00f6c14df3 100644
--- a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
+++ b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
@@ -79,6 +79,10 @@
<name>8f811e5a-0477-4ba8-8f6e-fbb390833459</name>
<entityField>EMPLOYEE_CONTACT_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>b036373c-fb1a-4f1d-ab75-adee3728f2f5</name>
+ <entityField>CAMPAIGN_ID</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
diff --git a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
index 79fa24a99a23064c9911773632f1e97b2261104b..bd65911bca3075419355f7988ba99644f1b2abaa 100644
--- a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
+++ b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
@@ -11,6 +11,7 @@
<singleton v="true" />
<storeRoles>
<element>PROJECT_Marketing</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
</storeRoles>
<icon>VAADIN:MONEY</icon>
<categories>
@@ -22,9 +23,11 @@
</neonDashletConfiguration>
</dashletConfigurations>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Cost overview</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<singleDataChartViewTemplate>
diff --git a/neonView/CampaignFilter_view/CampaignFilter_view.aod b/neonView/CampaignFilter_view/CampaignFilter_view.aod
index 648fbef2a5fddef0c2f5f3faf17246a5ca0bddb1..53acd27360a994b95b7d70dcb5e232be3bc22955 100644
--- a/neonView/CampaignFilter_view/CampaignFilter_view.aod
+++ b/neonView/CampaignFilter_view/CampaignFilter_view.aod
@@ -14,6 +14,7 @@
<singleton v="true" />
<storeRoles>
<element>PROJECT_Marketing</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
</storeRoles>
<icon>NEON:GROUP_APPOINTMENT</icon>
<categories>
@@ -37,6 +38,7 @@
<singleton v="true" />
<storeRoles>
<element>PROJECT_Marketing</element>
+ <element>INTERNAL_ADMINISTRATOR</element>
</storeRoles>
<icon>NEON:GROUP_APPOINTMENT</icon>
<categories>
diff --git a/neonView/CampaignOverview_view/CampaignOverview_view.aod b/neonView/CampaignOverview_view/CampaignOverview_view.aod
index 8d48635c048e2ba5b327d5004610dc1ce02071ac..0e5711ecc2975192a5c3e4aa5666ec311f8179ae 100644
--- a/neonView/CampaignOverview_view/CampaignOverview_view.aod
+++ b/neonView/CampaignOverview_view/CampaignOverview_view.aod
@@ -7,7 +7,6 @@
<layout>
<boxLayout>
<name>layout</name>
- <direction>VERTICAL</direction>
</boxLayout>
</layout>
<children>
diff --git a/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
index 10f2275e319aaa7c582324be30523367a902ecee..1c601dc689a85710bb9a4a2b7aed117bcea5b512 100644
--- a/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
+++ b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
@@ -3,9 +3,11 @@
<name>CampaignParticipantChart_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Participants</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<multiDataChartViewTemplate>
diff --git a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod b/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
deleted file mode 100644
index e11db29e24c4128c55e21f6686762e87d85931a9..0000000000000000000000000000000000000000
--- a/neonView/CampaignStepMembers_view/CampaignStepMembers_view.aod
+++ /dev/null
@@ -1,10 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>CampaignStepMembers_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
-</neonView>
diff --git a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
index fa93cc7f4c3a663c0b6efe7fc2185538b0a2d365..8318e45e12104638b95893faeb52066466e4b14d 100644
--- a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
+++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
@@ -3,9 +3,11 @@
<name>CampaignStepsGantt_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <drawerLayout>
<name>layout</name>
- </noneLayout>
+ <layoutCaption>Stufen</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<ganttViewTemplate>
diff --git a/neonView/MarketingWorkflowLauncherEdit_view/MarketingWorkflowLauncherEdit_view.aod b/neonView/DistrictChangeField_view/DistrictChangeField_view.aod
similarity index 55%
rename from neonView/MarketingWorkflowLauncherEdit_view/MarketingWorkflowLauncherEdit_view.aod
rename to neonView/DistrictChangeField_view/DistrictChangeField_view.aod
index 251902906a051ebae83b2af60ca8582cbf7f3cb1..624da2dce500683c11a938171b82bedf0e03b71e 100644
--- a/neonView/MarketingWorkflowLauncherEdit_view/MarketingWorkflowLauncherEdit_view.aod
+++ b/neonView/DistrictChangeField_view/DistrictChangeField_view.aod
@@ -1,6 +1,6 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>MarketingWorkflowLauncherEdit_view</name>
+ <name>DistrictChangeField_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<size>SMALL</size>
<layout>
@@ -10,21 +10,18 @@
</layout>
<children>
<genericViewTemplate>
- <name>TemplateSelection</name>
+ <name>generic</name>
<editMode v="true" />
- <hideEmptyFields v="false" />
- <entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>13b27604-86ee-41cb-80bd-7b0b4d834c8d</name>
- <entityField>DOCUMENTTEMPLATE_ID</entityField>
+ <name>b3bcd65d-ff54-40b3-91d6-8a883f95b1d6</name>
+ <entityField>DISTRICT_AUTOADD</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>32d20d9d-56a7-4b8f-b107-b7ccffb22fee</name>
+ <entityField>PARENTDISTRICT_DISTRICTID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>e091c680-ee26-466a-a20e-52469dc28cfe</name>
- <entityField>WorkflowLauncherIntegration</entityField>
- <view>WorkflowLauncherEdit_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/DistrictFilter_view/DistrictFilter_view.aod b/neonView/DistrictFilter_view/DistrictFilter_view.aod
index e979e1c1a0e09097bdb0c908ccb859f1dbb7c7e2..c7f6fc496e1866a209ac87fea5ac0bb374f9270b 100644
--- a/neonView/DistrictFilter_view/DistrictFilter_view.aod
+++ b/neonView/DistrictFilter_view/DistrictFilter_view.aod
@@ -14,7 +14,6 @@
<parentField>PARENTDISTRICT_DISTRICTID</parentField>
<hideContentSearch v="false" />
<showChildrenCount v="false" />
- <entityField>#ENTITY</entityField>
<favoriteActionGroup1>ActionGroup</favoriteActionGroup1>
<linkedColumns>
<element>DISTRICT_NAME</element>
diff --git a/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod b/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod
deleted file mode 100644
index a794c79ae5468961a47b76e4ef551e5f22129790..0000000000000000000000000000000000000000
--- a/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod
+++ /dev/null
@@ -1,10 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>DocumentTemplatePlaceOfUseList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
-</neonView>
diff --git a/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod b/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod
deleted file mode 100644
index e7f6cadf9d25dabbe2ee05bb144c190b8ee90a8b..0000000000000000000000000000000000000000
--- a/neonView/DuplicatesOverview_view/DuplicatesOverview_view.aod
+++ /dev/null
@@ -1,20 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>DuplicatesOverview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>b3164f16-fa7e-42b0-829f-88553add7c08</name>
- <entityField>#ENTITY</entityField>
- </neonViewReference>
- <neonViewReference>
- <name>8e19d057-58da-4db8-8119-ecf070af86ab</name>
- <entityField>#ENTITY</entityField>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/LeadimportMain_view/LeadimportMain_view.aod b/neonView/LeadimportMain_view/LeadimportMain_view.aod
index 21dca8795337ccaec37844efc65f29311ff46e40..d96bffac876fb78ab510b12be65b5a3de421a392 100644
--- a/neonView/LeadimportMain_view/LeadimportMain_view.aod
+++ b/neonView/LeadimportMain_view/LeadimportMain_view.aod
@@ -35,9 +35,9 @@
<view>LeadimportLeadFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>b085a160-f739-487c-a24c-5d12898aa6f1</name>
- <entityField>#ENTITY</entityField>
- <view>LeadimportLog_view</view>
+ <name>2d0068c7-b3df-4d01-bd0a-e9103851153b</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
</neonViewReference>
<neonViewReference>
<name>61237df6-2af1-41bd-bb56-da0bc624afb5</name>
@@ -45,9 +45,9 @@
<view>AttributeRelationTree_view</view>
</neonViewReference>
<neonViewReference>
- <name>2d0068c7-b3df-4d01-bd0a-e9103851153b</name>
- <entityField>Tasks</entityField>
- <view>TaskFilter_view</view>
+ <name>b085a160-f739-487c-a24c-5d12898aa6f1</name>
+ <entityField>#ENTITY</entityField>
+ <view>LeadimportLog_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/MSTTeamChannelEdit_view/MSTTeamChannelEdit_view.aod b/neonView/MSTTeamChannelEdit_view/MSTTeamChannelEdit_view.aod
deleted file mode 100644
index 7bc6b98e1de9c6015fe82e48d2d4c5b1b4171f2e..0000000000000000000000000000000000000000
--- a/neonView/MSTTeamChannelEdit_view/MSTTeamChannelEdit_view.aod
+++ /dev/null
@@ -1,10 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>MSTTeamChannelEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
-</neonView>
diff --git a/neonView/MyTurnoverForecastScoreCard_view/MyTurnoverForecastScoreCard_view.aod b/neonView/MyTurnoverForecastScoreCard_view/MyTurnoverForecastScoreCard_view.aod
index 2c67b8c90a7d9a4c44ee74913267712e898bc580..e0798e0066c30ac73869ce15bd3d8f37a867a541 100644
--- a/neonView/MyTurnoverForecastScoreCard_view/MyTurnoverForecastScoreCard_view.aod
+++ b/neonView/MyTurnoverForecastScoreCard_view/MyTurnoverForecastScoreCard_view.aod
@@ -6,7 +6,7 @@
<neonDashletConfiguration>
<name>OwnForecastTurnover</name>
<title>My Forecast and Turnover</title>
- <description>Shows my Forecast and Turnover for the actual year</description>
+ <description>Show my Forecast and Turnover for the current year</description>
<fragment>SalesprojectAnalyses/full</fragment>
<singleton v="true" />
<icon>VAADIN:MONEY</icon>
diff --git a/neonView/OfferFilter_view/OfferFilter_view.aod b/neonView/OfferFilter_view/OfferFilter_view.aod
index c92b2a4e556897e4650ea9c461118db38af63997..3e1f1de8a491a8670724b87e95278f1caf7b0bf4 100644
--- a/neonView/OfferFilter_view/OfferFilter_view.aod
+++ b/neonView/OfferFilter_view/OfferFilter_view.aod
@@ -45,7 +45,7 @@
<neonDashletConfiguration>
<name>FirstApprovalDashlet</name>
<title>First Approval</title>
- <description>show all offers with first approval</description>
+ <description>Show all offers with first approval</description>
<fragment>Offer/filter</fragment>
<singleton v="true" />
<storeRoles>
@@ -69,7 +69,7 @@
<neonDashletConfiguration>
<name>SecondApprovalDashlet</name>
<title>Second Approval</title>
- <description>show all offers with second approval</description>
+ <description>Show all offers with second approval</description>
<fragment>Offer/filter</fragment>
<singleton v="true" />
<storeRoles>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index cabb05f1fd4037d53cda129338912cede148a06d..1b274880031ac3928189bca83f3b9b35f44ee1aa 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -68,6 +68,14 @@
<name>d7ca2b66-5e7a-4951-a89b-fbeab0f4f798</name>
<entityField>NET</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>1d19fabe-3f13-47a6-baf5-1f9f0eadc53c</name>
+ <entityField>DISCOUNT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cc0d2b0d-b1b6-4a98-b715-71f7f7824ae1</name>
+ <entityField>DISCOUNT_NET</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>3e9e37e2-6756-41c2-ace7-6ff094dc78c1</name>
<entityField>DISCOUNTED_NET</entityField>
@@ -77,12 +85,8 @@
<entityField>VAT</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>5cc461e4-fd0f-47e6-ab06-886a18621c31</name>
- <entityField>DISCOUNTED_VAT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>43972a26-67f7-4fb5-9107-111731d326af</name>
- <entityField>TotalGross</entityField>
+ <name>66557054-e556-428b-b9aa-9991f5ab89b2</name>
+ <entityField>GROSS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>b8480aee-4fdd-4161-8b63-b9bac7a8878a</name>
@@ -128,10 +132,6 @@
<name>a3a9ee30-bdd2-4907-b215-d4b4adcc0f1d</name>
<entityField>DELIVERYTERMS</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>b67494ee-f7c1-4002-a550-50ce1eac5020</name>
- <entityField>DISCOUNT</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
diff --git a/neonView/OrderFilter_view/OrderFilter_view.aod b/neonView/OrderFilter_view/OrderFilter_view.aod
index d4c712215b0fc63f599c6d48115e4d0b63b7b26a..24b1f14667a418ebe1a20f7a2d23ac36ddf69ecf 100644
--- a/neonView/OrderFilter_view/OrderFilter_view.aod
+++ b/neonView/OrderFilter_view/OrderFilter_view.aod
@@ -146,6 +146,7 @@
<neonTreeTableColumn>
<name>7873c2f2-0dc4-4c54-814a-df970eddea65</name>
<entityField>NET</entityField>
+ <aggregateEntityField>NET_aggregate</aggregateEntityField>
</neonTreeTableColumn>
</columns>
</treeTableViewTemplate>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index 72bff0dccf1d640b3a5fe5c87c6e696fe5ec9050..af448650e00755e5e8f3f60b1d230ea99f5996d5 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -83,6 +83,14 @@
<name>d7ca2b66-5e7a-4951-a89b-fbeab0f4f798</name>
<entityField>NET</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>e8d0649b-dbcf-4c2e-9f4c-7f673e4f1f02</name>
+ <entityField>DISCOUNT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ec752803-20bc-4b37-854b-39a553c4e3c4</name>
+ <entityField>DISCOUNT_NET</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>4baf8275-e96d-4b26-9808-17fc1e515134</name>
<entityField>DISCOUNTED_NET</entityField>
@@ -92,12 +100,8 @@
<entityField>VAT</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>2b919444-e34e-4f89-9894-8916da00a709</name>
- <entityField>DISCOUNTED_VAT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>43972a26-67f7-4fb5-9107-111731d326af</name>
- <entityField>TotalGross</entityField>
+ <name>e69ec466-d2fb-462c-aa03-8c5646bc2ece</name>
+ <entityField>GROSS</entityField>
</entityFieldLink>
<entityFieldLink>
<name>96cce4c1-1d12-46fe-9501-ce2ac7975dd6</name>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index cf69a9efcb4d10099de9c270693da8cfc684a012..5b53c0a8cbed7e8dc605ee1bbe780d3b2853740d 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -15,6 +15,11 @@
<entityField>#ENTITY</entityField>
<view>OrganisationPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
+ <entityField>Contact</entityField>
+ <view>PersonSimpleList_view</view>
+ </neonViewReference>
<neonViewReference>
<name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
<entityField>Activities</entityField>
@@ -26,25 +31,15 @@
<view>360DegreeFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>d63b5190-e85e-4a34-a937-3be8a3bd5d40</name>
- <entityField>ChecklistEntryValues</entityField>
- <view>ChecklistEntryValueList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
- <entityField>Contact</entityField>
- <view>PersonSimpleList_view</view>
+ <name>b6e7ad76-511f-46c4-b47c-b2e56825331b</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrganisationPlanningTurnoverChart_view</view>
</neonViewReference>
<neonViewReference>
<name>0728e9d5-3b38-4b53-9f13-ebf3f4a9518e</name>
<entityField>#ENTITY</entityField>
<view>OrganisationConditionPricelist_view</view>
</neonViewReference>
- <neonViewReference>
- <name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
- <entityField>ObjectTrees</entityField>
- <view>ObjectTreeFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>45c0f486-e7df-48ac-a201-661ac07f5fed</name>
<entityField>#ENTITY</entityField>
@@ -55,25 +50,30 @@
<entityField>#ENTITY</entityField>
<view>OrganisationAttribute_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c82aff98-ede5-4d9e-a902-89f71ed7dbb0</name>
+ <entityField>ObjectTrees</entityField>
+ <view>ObjectTreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>c2b37e4d-3b5e-4e23-8b7c-6da02b27ffc0</name>
<entityField>DistrictContacts</entityField>
<view>DistrictContactFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
+ <name>d63b5190-e85e-4a34-a937-3be8a3bd5d40</name>
+ <entityField>ChecklistEntryValues</entityField>
+ <view>ChecklistEntryValueList_view</view>
</neonViewReference>
<neonViewReference>
- <name>b6e7ad76-511f-46c4-b47c-b2e56825331b</name>
+ <name>56eb7d7d-23e9-4ab8-8a77-d0a6d997d710</name>
<entityField>#ENTITY</entityField>
- <view>OrganisationPlanningTurnoverChart_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
- <entityField>LogHistories</entityField>
- <view>LogHistoryFilter_view</view>
+ <view>OrganisationMarketing_view</view>
</neonViewReference>
<neonViewReference>
<name>a5ab96e5-927c-4db3-b7ed-f0c0aadcb89b</name>
@@ -81,9 +81,9 @@
<view>DuplicateFilter_view</view>
</neonViewReference>
<neonViewReference>
- <name>56eb7d7d-23e9-4ab8-8a77-d0a6d997d710</name>
- <entityField>#ENTITY</entityField>
- <view>OrganisationMarketing_view</view>
+ <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index 3e1bacb2f1d941942501b7badb112fae0e9dc4a8..30babbda6f73f09d220c11849c0d83d71ed90960 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -24,11 +24,6 @@
<entityField>360DegreeObjects</entityField>
<view>360DegreeFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
- <entityField>ObjectTrees</entityField>
- <view>ObjectTreeFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
<entityField>OtherContacts</entityField>
@@ -49,6 +44,11 @@
<entityField>Documents</entityField>
<view>DocumentFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>cb8ff3df-772b-4c12-8814-f9101295b1ba</name>
+ <entityField>ObjectTrees</entityField>
+ <view>ObjectTreeFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>82f19c55-fa96-43de-9f26-46069b28db31</name>
<entityField>#ENTITY</entityField>
diff --git a/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod b/neonView/ProductDescriptionTranslationDrawer_view/ProductDescriptionTranslationDrawer_view.aod
similarity index 60%
rename from neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
rename to neonView/ProductDescriptionTranslationDrawer_view/ProductDescriptionTranslationDrawer_view.aod
index 83bd487910c7c79a5be7963674d0b703c93eb2e5..0ec9d21eb215a2d0d06d4c079bd0b83aa0ddf82d 100644
--- a/neonView/OrganisationClassificationDrawer_view/OrganisationClassificationDrawer_view.aod
+++ b/neonView/ProductDescriptionTranslationDrawer_view/ProductDescriptionTranslationDrawer_view.aod
@@ -1,20 +1,18 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>OrganisationClassificationDrawer_view</name>
- <title>Classifications</title>
+ <name>ProductDescriptionTranslationDrawer_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
<drawerLayout>
<name>layout</name>
- <layoutCaption>Classification</layoutCaption>
- <fixedDrawer v="true" />
+ <layoutCaption>Descriptions</layoutCaption>
</drawerLayout>
</layout>
<children>
<neonViewReference>
- <name>b49a0291-89cc-4962-8706-5044aa2f9e21</name>
- <entityField>#ENTITY</entityField>
- <view>OrganisationClassification</view>
+ <name>59ca667d-68c8-40c4-a8cb-a9d98eeb0237</name>
+ <entityField>DescriptionTranslations</entityField>
+ <view>DescriptionTranslationFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductDescritption_view/ProductDescritption_view.aod b/neonView/ProductDescritption_view/ProductDescritption_view.aod
index a85032efe375759d5f49e7390f426496a523036a..ffdddeb4f507c9d38616762abd3c8fdc7138e6ad 100644
--- a/neonView/ProductDescritption_view/ProductDescritption_view.aod
+++ b/neonView/ProductDescritption_view/ProductDescritption_view.aod
@@ -10,14 +10,14 @@
</layout>
<children>
<neonViewReference>
- <name>d1bc2777-ee77-4604-8d7e-735ec79ed551</name>
- <entityField>KnowledgeManagements</entityField>
- <view>KnowledgeManagementFilter_view</view>
+ <name>74824d62-9767-4196-89fc-92a1fc432d34</name>
+ <entityField>#ENTITY</entityField>
+ <view>ProductKnowledgeManagementDrawer_view</view>
</neonViewReference>
<neonViewReference>
- <name>1871fa72-d36b-43bd-937b-822ea7c2a08d</name>
- <entityField>DescriptionTranslations</entityField>
- <view>DescriptionTranslationFilter_view</view>
+ <name>325ad9fb-801b-4462-9899-22d07747c93f</name>
+ <entityField>#ENTITY</entityField>
+ <view>ProductDescriptionTranslationDrawer_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OrganisationClassification/OrganisationClassification.aod b/neonView/ProductKnowledgeManagementDrawer_view/ProductKnowledgeManagementDrawer_view.aod
similarity index 58%
rename from neonView/OrganisationClassification/OrganisationClassification.aod
rename to neonView/ProductKnowledgeManagementDrawer_view/ProductKnowledgeManagementDrawer_view.aod
index d01a7d43a0f2e11b2024e5cbfd66cb2bee7ad40a..8a4a258a872a658b5b6dd2e318c3b6f8eecf6180 100644
--- a/neonView/OrganisationClassification/OrganisationClassification.aod
+++ b/neonView/ProductKnowledgeManagementDrawer_view/ProductKnowledgeManagementDrawer_view.aod
@@ -1,19 +1,18 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>OrganisationClassification</name>
+ <name>ProductKnowledgeManagementDrawer_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- <direction>HORIZONTAL</direction>
- <maxDirectionElements v="2" />
- </boxLayout>
+ <layoutCaption>Knowledge entries</layoutCaption>
+ </drawerLayout>
</layout>
<children>
<neonViewReference>
- <name>b2ef616c-7605-429a-bace-868b52ce9b06</name>
- <entityField>Classifications</entityField>
- <view>ClassificationTree_view</view>
+ <name>b322e599-ccda-47c1-8f5c-42264d9d362e</name>
+ <entityField>KnowledgeManagements</entityField>
+ <view>KnowledgeManagementFilter_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/ProductPreview_view/ProductPreview_view.aod b/neonView/ProductPreview_view/ProductPreview_view.aod
index 687114627beba86d1f6095264fdc8806152aa1cf..6bda8f376d2b344b69884a617f758d3fb2e3ebef 100644
--- a/neonView/ProductPreview_view/ProductPreview_view.aod
+++ b/neonView/ProductPreview_view/ProductPreview_view.aod
@@ -11,7 +11,7 @@
<children>
<cardViewTemplate>
<name>Header</name>
- <iconField>PICTURE</iconField>
+ <iconField>#IMAGE</iconField>
<titleField>PRODUCTCODE</titleField>
<descriptionField>PRODUCTNAME</descriptionField>
<favoriteAction1>newActivity</favoriteAction1>
diff --git a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
index d1aa285fbcdfa37a727490e125eceb6fa90d0e49..baf020a9f84dfc6f70d945a8c97f341c35cbba28 100644
--- a/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
+++ b/neonView/QuickEntryEdit_view/QuickEntryEdit_view.aod
@@ -80,7 +80,7 @@
</neonViewReference>
<neonViewReference>
<name>ad2e41fc-e1e3-4907-9d23-7f3e3c4a026b</name>
- <entityField>Service tickets</entityField>
+ <entityField>ServiceTickets</entityField>
<view>SupportTicketMultiEdit_view</view>
</neonViewReference>
</children>
diff --git a/neonView/SalesprojectAnalyses_view/SalesprojectAnalyses_view.aod b/neonView/SalesprojectAnalyses_view/SalesprojectAnalyses_view.aod
index b2c99ae417a1dcab62f0a4ba4ff0ebf4383d0c32..cd0ba197cbf0e71645b7e47de0653e72d29488c5 100644
--- a/neonView/SalesprojectAnalyses_view/SalesprojectAnalyses_view.aod
+++ b/neonView/SalesprojectAnalyses_view/SalesprojectAnalyses_view.aod
@@ -7,7 +7,7 @@
<neonDashletConfiguration>
<name>SalesprojectPhases</name>
<title>Sales Project Phases</title>
- <description>Shows how many sales projects are in the various sales phases</description>
+ <description>Show how many sales projects are in the various sales phases</description>
<fragment>Salesproject/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiJQSEFTRSIsIm9wZXJhdG9yIjoiTk9UX0VRVUFMIiwidmFsdWUiOiJOZWdvdGlhdGlvbiIsImtleSI6IlNBTFBST0pQSEFTRU5FR08iLCJjb250ZW50dHlwZSI6IlRFWFQifSx7InR5cGUiOiJyb3ciLCJuYW1lIjoiU1RBVFVTIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiT2ZmZW4iLCJrZXkiOiJTQUxQUk9KU1RBVE9QRU4iLCJjb250ZW50dHlwZSI6IlRFWFQifV19&axes=COUNT&grouping=%23EXTENSION.Phase_filter.Phase_filter%23TEXT</fragment>
<singleton v="true" />
<storeRoles>
diff --git a/neonView/SalesprojectConversionRate_view/SalesprojectConversionRate_view.aod b/neonView/SalesprojectConversionRate_view/SalesprojectConversionRate_view.aod
index 9b9754063c92aea73ff8385c24c0c71b99d6ce29..7a28d81a49845ad55884dab9ef689d2f5aed1b1f 100644
--- a/neonView/SalesprojectConversionRate_view/SalesprojectConversionRate_view.aod
+++ b/neonView/SalesprojectConversionRate_view/SalesprojectConversionRate_view.aod
@@ -6,7 +6,7 @@
<dashletConfigurations>
<neonDashletConfiguration>
<name>ConvertionRates</name>
- <title>Sales Project Convertion Rates</title>
+ <title>Sales Project Conversion Rates</title>
<description>Shows the different conversion rates of the sales project phases</description>
<fragment>SalesprojectConversionRate/filter?search=eyJ0eXBlIjoiZ3JvdXAiLCJvcGVyYXRvciI6IkFORCIsImNoaWxkcyI6W3sidHlwZSI6InJvdyIsIm5hbWUiOiIjRVhURU5TSU9OLkRBVEVfU1RBUlQuREFURV9TVEFSVCNEQVRFIiwib3BlcmF0b3IiOiJUSU1FRlJBTUVfRVFVQUwiLCJ2YWx1ZSI6IkRpZXNlcyBKYWhyIiwia2V5IjoiUkVMPUFESlVTVEVEO1VOSVQ9WUVBUiIsImNvbnRlbnR0eXBlIjoiREFURSJ9XX0%3D&axes=conversionRate&grouping=AB_KEYWORD_ENTRYID_KEYID%2C%23EXTENSION.Month.Month%23NUMBER</fragment>
<singleton v="true" />
diff --git a/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod b/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod
deleted file mode 100644
index 66589d53af1ec84be40e2d12d8226dc700d5edec..0000000000000000000000000000000000000000
--- a/neonView/SalesprojectPhaseInfoTraitList_view/SalesprojectPhaseInfoTraitList_view.aod
+++ /dev/null
@@ -1,10 +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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
- <name>SalesprojectPhaseInfoTraitList_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <noneLayout>
- <name>layout</name>
- </noneLayout>
- </layout>
-</neonView>
diff --git a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
index 73440be89f0f0da0add22c6c1dc51542be009400..c52153ae682519c6c5bd24bdac8a2512a53258d2 100644
--- a/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
+++ b/neonView/SalesprojectScoreCard_view/SalesprojectScoreCard_view.aod
@@ -6,7 +6,7 @@
<neonDashletConfiguration>
<name>KeyFigures</name>
<title>Key Figures</title>
- <description>Most important salse key figures</description>
+ <description>Most important Sales key figures</description>
<fragment>SalesprojectAnalyses/full</fragment>
<singleton v="true" />
<storeRoles>
diff --git a/neonView/WeblinkMain_view/WeblinkMain_view.aod b/neonView/WeblinkMain_view/WeblinkMain_view.aod
index d768584685d2a8d1d45a3c704c78100ae8174e1a..ba9e2d634fe194c11e2c52a5ed847d5dc1e47425 100644
--- a/neonView/WeblinkMain_view/WeblinkMain_view.aod
+++ b/neonView/WeblinkMain_view/WeblinkMain_view.aod
@@ -24,5 +24,10 @@
<entityField>Clicks</entityField>
<view>WeblinkClickFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ae528068-30ba-45b2-a052-a33cc9d76635</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/WorkflowStartConfigEdit_view/WorkflowStartConfigEdit_view.aod b/neonView/WorkflowStartConfigEdit_view/WorkflowStartConfigEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..90a5234ad36788b21d38e28fc9b9708192a91597
--- /dev/null
+++ b/neonView/WorkflowStartConfigEdit_view/WorkflowStartConfigEdit_view.aod
@@ -0,0 +1,23 @@
+<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>WorkflowStartConfigEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <size>SMALL</size>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>StartConfig</name>
+ <editMode v="true" />
+ <fields>
+ <entityFieldLink>
+ <name>48b1dd11-5964-4d46-85eb-3f144ab7b3d2</name>
+ <entityField>OBJECT_TYPE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
index 2ced9ab248fdce98ea9019cc4442571c4c8c811e..ddee9e3a21a1d14c749fdd5c0a2a2c8644b0ae1b 100644
--- a/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
+++ b/neonView/WorkflowStartConfigFilter_view/WorkflowStartConfigFilter_view.aod
@@ -10,8 +10,6 @@
<children>
<tableViewTemplate>
<name>Table</name>
- <inlineEdit v="true" />
- <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 07b035ddfda2309aebdb23b24b7abdf0c1c9eadb..8e86e31504068b592a49feec23f3b19053464156 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -56,7 +56,7 @@
<intervall v="5000" />
<bridgeMode v="3" />
<flagMode v="2" />
- <process>mailbridge_service</process>
+ <process>mailbridge</process>
<errorProcess></errorProcess>
<attachmentHandling>ALL</attachmentHandling>
</mailbridgeMailserver>
@@ -105,7 +105,19 @@
<customStringProperty>
<name>bulkmail.baseReplacementURL</name>
<description>Base url for replacement of redirectlinks in bulkmails</description>
- <property></property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>bulkmail.fileStorage</name>
+ <description>Save Location for send Mails. When empty %aditodata% gets used.</description>
+ </customStringProperty>
+ <customStringProperty>
+ <name>bulkmail.user</name>
+ <description>Title of the useraccount that is used to send bulkmails</description>
+ <property>mailbridge</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>mosaico.url</name>
+ <description>Url of the Mosaico Email Editor</description>
</customStringProperty>
</customConfigProperties>
<customProperties>
@@ -205,26 +217,11 @@
<description></description>
<property v="false" />
</customBooleanProperty>
- <customStringProperty>
- <name>bulkmail.fileStorage</name>
- <description>Save Location for send Mails. Path is relative to Serverpath</description>
- <property>/bulkMailFiles/</property>
- </customStringProperty>
<customIntegerProperty>
<name>ews.syncsize</name>
<description>Defines how big a filter for synchronizing to Outlook may be</description>
<property v="7200" />
</customIntegerProperty>
- <customStringProperty>
- <name>bulkmail.user</name>
- <description>Title of the useraccount that is used to send bulkmails</description>
- <property>mailbridgeDev</property>
- </customStringProperty>
- <customStringProperty>
- <name>mosaico.url</name>
- <description>Url of the Mosaico Email Editor</description>
- <property>https://mosaico.xrm-service.dev.c2.adito.cloud</property>
- </customStringProperty>
<customStringProperty>
<name>local.currency</name>
<description>local currency as iso4 (e.g. "EUR")</description>
diff --git a/process/AddToAdHocMailing_workflowService/AddToAdHocMailing_workflowService.aod b/process/AddToAdHocMailing_workflowService/AddToAdHocMailing_workflowService.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5d0b43d02d4b50156456e7d4bb21114ad4fc3349
--- /dev/null
+++ b/process/AddToAdHocMailing_workflowService/AddToAdHocMailing_workflowService.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>AddToAdHocMailing_workflowService</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/AddToAdHocMailing_workflowService/process.js</process>
+ <alias>Data_alias</alias>
+ <serviceTaskParameterProcess>%aditoprj%/process/AddToAdHocMailing_workflowService/serviceTaskParameterProcess.js</serviceTaskParameterProcess>
+ <variants>
+ <element>WORKFLOW</element>
+ </variants>
+</process>
diff --git a/process/AddToAdHocMailing_workflowService/process.js b/process/AddToAdHocMailing_workflowService/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..fa16b32d1468e9e8e6fcc209db814a680577f97f
--- /dev/null
+++ b/process/AddToAdHocMailing_workflowService/process.js
@@ -0,0 +1,20 @@
+import("system.vars");
+import("Communication_lib");
+import("Bulkmail_lib");
+import("system.workflow");
+
+var processInstanceId = vars.get("$local.uid");
+
+var variables = JSON.parse(vars.get("$local.value"));
+var recipientContactId = variables.contactId || variables.targetId;
+var bulkMailId = variables.bulkMailId;
+var recipientEmail = variables.recipientEmail || CommUtil.getStandardMail(recipientContactId);
+var originUrl = variables.originUrl;
+var workflowKey = variables.workflowKey;
+
+var additionalLinkParameters = {
+ workflowinstance: processInstanceId,
+ workflowkey: workflowKey
+};
+
+BulkMailUtils.addToAdHocMail(bulkMailId, recipientContactId, recipientEmail, additionalLinkParameters, originUrl)
\ No newline at end of file
diff --git a/process/AddToAdHocMailing_workflowService/serviceTaskParameterProcess.js b/process/AddToAdHocMailing_workflowService/serviceTaskParameterProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ab67564e7b3c07b587377c5500d184757facfdc
--- /dev/null
+++ b/process/AddToAdHocMailing_workflowService/serviceTaskParameterProcess.js
@@ -0,0 +1,24 @@
+import("system.result");
+import("Workflow_lib");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+
+
+var adHocMails = newSelect(["BULKMAIL.BULKMAILID","BULKMAIL.NAME"])
+.from("BULKMAIL")
+.where("BULKMAIL.STATUS",$KeywordRegistry.bulkMailStatus$adHoc())
+.table()
+.map(function ([pId, pName])
+{
+ return {
+ id:pId,
+ name:pName
+ }
+});
+
+var parameters = [
+ new WorkflowServiceTaskParameter("bulkMailId", "Ad Hoc Mailing", WorkflowServiceTaskParameter.ENUM(), adHocMails)
+];
+
+result.object(parameters);
+
diff --git a/process/Advertising_lib/process.js b/process/Advertising_lib/process.js
index 9341bdaa21042620b50a74691daa77407c91dfca..9f5c37a3bd862b3b63471bb5d79c2321f1dd1bcd 100644
--- a/process/Advertising_lib/process.js
+++ b/process/Advertising_lib/process.js
@@ -95,6 +95,24 @@ AdvertisingUtils.getNextItemPos = function (pAdvertisingId)
}
return itemPos;
}
+
+/*
+* Returns the status of an advertising
+*
+* @param {String} pAdvertisingId the advertising id
+*
+* @return {String} Status
+ */
+AdvertisingUtils.getStatus = function(pAdvertisingId)
+{
+ var status = newSelect("ADVERTISING.STATUS")
+ .from("ADVERTISING")
+ .where("ADVERTISING.ADVERTISINGID", pAdvertisingId)
+ .cell();
+
+ return status;
+}
+
/*
* checks if the advertising is editable, currently it's editable when it's not sent and not followed up
*
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 776a7ed0a7059ba01d8a1feff7b542fcb15c540c..0a4abe43994a04bfa2febe4d21de4e20fa6c8c5c 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -28,6 +28,7 @@ import("Document_lib");
import("system.db");
import("system.workflow");
import("system.tools");
+import("FileUtil_lib");
/**
* Functions for bulk mails.
@@ -72,17 +73,25 @@ BulkMailUtils.sendBulkMailOnServer = function (pBulkMailId, pTestRun, pUser)
* True indicates a Testrun<br>
* @param {Bool} pUser (optional) <p>
* If there are no test recipients or no recipients marked for a test replacement in a test run
- * we send an email to this user instead<br>
+ * we send an email to this user instead<br>
+ * @param {Object} pAdditionalLinkParameters(optional)<p>
+ * Additional parameters that get put into the weblinks for the redirect webservice.
+ * Expects object of key value pairs. <br>
+ * @param {String} pAdHochMailingRecipientId (optional) <p>
+ * The id of a recipient added to a adhoc mailing list. The mailing ignores all other recipients if this parameter is set<br>
+ * @param {String} pOriginUrl (optional) <p>
+ * Base URL for link replacement. Only needed when sending an Ad-Hoc Mailing without a configured baseReplacementURL in the Configuration <br>
+ * since sys.origin does not exist during workflowactions.
* @return {Object} <p>
* Count of sucessful and failed mails.<br>
*/
-BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
+BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser, pAdditionalLinkParameters, pAdHochMailingRecipientId, pOriginUrl)
{
if (pIsTestRun == undefined)
{
pIsTestRun = false;
}
- var sendUserTitle = project.getPreferenceValue("custom.bulkmail.user");
+ var sendUserTitle = project.getInstanceConfigValue("custom.bulkmail.user");
var [templateId, subject, emailSender, createActivity, bulkMailName, useTemplateAttachments, mosaicoTemplateId] =
newSelect("DOCUMENTTEMPLATE_ID, SUBJECT, SENDER_EMAIL_ADDRESS, CREATEACTIVITIES, NAME, USE_TEMPLATE_ATTACHMENTS, MOSAICOTEMPLATE_ID")
@@ -103,6 +112,11 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
.addParameter("BulkMailId_param", pBulkMailId)
.addParameter("IsTestMail_param", pIsTestRun);
+ if(pAdHochMailingRecipientId)
+ {
+ recipientLoadConfig.uid(pAdHochMailingRecipientId);
+ }
+
recipientData = entities.getRows(recipientLoadConfig);
var blacklist = new CommunicationBlacklist().loadBlacklistRecipients(pBulkMailId);
@@ -147,7 +161,21 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
return contactId;
});
- var baseUrl = project.getInstanceConfigValue("custom.bulkmail.baseReplacementURL", vars.get("$sys.origin")) + "/services/rest/redirect_rest?";
+ var baseUrl = (pOriginUrl || project.getInstanceConfigValue("custom.bulkmail.baseReplacementURL", vars.get("$sys.origin"))) + "/services/rest/redirect_rest?";
+
+ var additionalParameterString = "";
+
+ if (pAdditionalLinkParameters)
+ {
+ additionalParameterString = "&" + Object.keys(pAdditionalLinkParameters)
+ .map(function (key)
+ {
+ return key + "=" + pAdditionalLinkParameters[key]
+ })
+ .join("&");
+ }
+
+
var linkPlaceholders = newSelect(["PLACEHOLDER", "WEBLINKID", "URL", "ISREDIRECT"])
.from("WEBLINK")
.table()
@@ -157,7 +185,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
{
var linkFn = function (pContactId)
{
- return baseUrl + "link=" + weblinkId + "&log=" + mailLogIds.get(pContactId);
+ return baseUrl + "link=" + weblinkId + "&log=" + mailLogIds.get(pContactId) + additionalParameterString;
}
return new Placeholder(placeholder, Placeholder.types.CALLBACKFUNCTION, linkFn);
}
@@ -166,7 +194,7 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
var webviewFn = function(pContactId)
{
- return vars.get("$sys.origin")+"/services/rest/webview_rest?" + "log=" + mailLogIds.get(pContactId);
+ return (pOriginUrl || project.getInstanceConfigValue("custom.bulkmail.baseReplacementURL", vars.get("$sys.origin"))) + "/services/rest/webview_rest?" + "log=" + mailLogIds.get(pContactId);
}
var webviewPlaceholder = new Placeholder("webview", Placeholder.types.CALLBACKFUNCTION, webviewFn);
@@ -326,10 +354,13 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pIsTestRun, pUser)
"DATE_RUN_FINISHED": vars.get("$sys.date")
});
- newWhere("BULKMAIL.BULKMAILID", pBulkMailId)
+ if(!pAdHochMailingRecipientId)
+ {
+ newWhere("BULKMAIL.BULKMAILID", pBulkMailId)
.updateFields({
"STATUS": $KeywordRegistry.bulkMailStatus$sent()
- });
+ });
+ }
}
else
{
@@ -428,6 +459,21 @@ BulkMailUtils.openAddRecipientView = function (pContext, pIds, pFilter, pParamet
neon.openContextWithRecipe("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
}
+/**
+ * Opens a context to select a bulk mail to add recipients to.<br>
+ *
+ * @param {String} pRecordsRecipe RecordsRecipe for the selection that should be added
+ */
+BulkMailUtils.openAddRecipientViewWithRecipe = function (pRecordsRecipe)
+{
+ logging.log(pRecordsRecipe);
+
+ var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters({
+ "RecordsRecipe_param": pRecordsRecipe
+ }).toString();
+ neon.openContextWithRecipe("BulkMailAddRecipients", "BulkMailAddRecipientsEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
+}
+
/**
* Deletes all bulk mail recipients that have a commrestriction for emails.<br>
*
@@ -583,6 +629,26 @@ BulkMailUtils.newBulkMail = function (pRecipients, pContext, pFilter)
neon.openContextWithRecipe("BulkMail", "BulkMailEdit_view", recipe, neon.OPERATINGSTATE_NEW);
}
+/**
+ * Opens the BulkMail context in new mode.<br>
+ *
+ * @param {String} pRecordsRecipe <p>
+ * Recordsrecipe containing the recipients for the new Bulkmail.
+ * Currently supported Contexts are campaignstep, campaignparticipant, person and <br> sys.filter of selection that should be added to new bulkmail<br>
+ */
+BulkMailUtils.newBulkMailWithRecordsRecipe = function (pRecordsRecipe)
+{
+ if (!Utils.isString(pRecordsRecipe))
+ {
+ pRecordsRecipe = JSON.stringify(pRecordsRecipe);
+ }
+ var params = {
+ "PresetRecipientsRecordsRecipe_param": pRecordsRecipe
+ };
+ var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
+ neon.openContextWithRecipe("BulkMail", "BulkMailEdit_view", recipe, neon.OPERATINGSTATE_NEW);
+}
+
/**
* Filters the given contactIds if they can be added as new recipients.
* Checks if a contact is already a recipient or if there is a advertising ban.
@@ -660,6 +726,107 @@ BulkMailUtils.filterNewRecipientsByCondition = function (pBulkMailId, pCondition
}
return condition.arrayColumn();
}
+/*
+ * adds a Recipient to an ad hoc mailing list and sends the mail.
+ *
+ * @param {String} pBulkMailId id of the bulk mail the contact should be added to
+ * @param {String} pContactId id of the contact that gets added
+ * @param {String} pEmailAddress address the ad hoc mailing gets sent to.
+ * @param {Object} pAdditionalLinkParameters(optional)<p>
+ * Additional parameters that get put into the weblinks for the redirect webservice.
+ * Expects object of key value pairs. <br>
+ * @param {String} pOriginUrl Base URL for link replacement.
+ */
+
+BulkMailUtils.addToAdHocMail = function (pBulkMailId, pContactId, pEmailAddress, pAdditionalLinkParameters, pOriginUrl)
+{
+ if(!pBulkMailId || !pContactId)
+ {
+ return;
+ }
+
+ var bulkMailRecipientId = util.getNewUUID();
+ new SqlBuilder().insertFields({
+ "BULKMAILRECIPIENTID": bulkMailRecipientId,
+ "BULKMAIL_ID": pBulkMailId,
+ "CONTACT_ID": pContactId,
+ "STATUS": $KeywordRegistry.bulkMailRecipientStatus$pending(),
+ "EMAIL_ADDRESS": pEmailAddress
+ },
+ "BULKMAILRECIPIENT");
+
+ this.sendBulkMail(pBulkMailId, false, false, pAdditionalLinkParameters, bulkMailRecipientId, pOriginUrl);
+}
+
+/**
+ * Filters the given contactIds if they can be added as new recipients.
+ * Checks if a contact is already a recipient or if there is a advertising ban.
+ *
+ * @param {String} pBulkMailId id of the bulk mail the contacts should be added to
+ * @param {String} pRecordsRecipe recordsrecipe for the selection that should be filtered.
+ * @return {String[]} contacts that can be added as recipients
+ */
+BulkMailUtils.filterNewRecipientsByRecordsRecipe = function (pBulkMailId, pRecordsRecipe)
+{
+ var recipients = [];
+
+ var entity = JSON.parse(pRecordsRecipe).entityName;
+
+ var loadConfig = entities.createConfigForLoadingRows()
+ .fromEntityRecordsRecipe(pRecordsRecipe)
+ .fields(["#UID"]);
+ var rows = entities.getRows(loadConfig);
+
+ while (rows.length > 0)
+ {
+ var currentIds = rows.splice(0,1000).map(function (row)
+ {
+ return row["#UID"];
+ });
+ var sql = newSelect("CONTACTID")
+ .from("CONTACT")
+ .join("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+ .join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ // only add contacts that aren't already recipients
+ .where(null, newSelect("BULKMAILRECIPIENTID")
+ .from("BULKMAILRECIPIENT")
+ .where("BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
+ .and("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
+ , SqlBuilder.NOT_EXISTS())
+ // check if there's a commrestriction
+ .and(new CommunicationSettingsCondition()
+ .emails(CommUtil.getStandardSubSqlMail())
+ .rejected()
+ .existNoSettings()
+ .buildCondition());
+ if (entity == "Person_entity")
+ {
+ sql.join("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .and("CONTACT.CONTACTID",currentIds,SqlBuilder.IN());
+ }
+ if (entity == "Organisation_entity")
+ {
+ sql.and("CONTACT.PERSON_ID is null")
+ .and("CONTACT.CONTACTID",currentIds,SqlBuilder.IN());
+ }
+
+ if (entity == "CampaignParticipant_entity")
+ {
+ sql.join("CAMPAIGNPARTICIPANT","CAMPAIGNPARTICIPANT.CONTACT_ID = CONTACT.CONTACTID")
+ .and("CAMPAIGNPARTICIPANT.CAMPAIGNPARTICIPANTID",currentIds,SqlBuilder.IN());
+ }
+
+ if (entity == "CampaignStep_entity")
+ {
+ sql.join("CAMPAIGNPARTICIPANT","CAMPAIGNPARTICIPANT.CONTACT_ID = CONTACT.CONTACTID")
+ .join("CAMPAIGNSTEP","CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
+ .and("CAMPAIGNSTEP.CAMPAIGNSTEPID",currentIds,SqlBuilder.IN());
+ }
+ recipients = recipients.concat(sql.arrayColumn());
+ }
+
+ return recipients;
+}
/**
* Opens the given bulk mail.
@@ -723,6 +890,21 @@ BulkMailUtils.isStatusSendingOrSent = function (pStatus)
return pStatus == $KeywordRegistry.bulkMailStatus$sent() || pStatus == $KeywordRegistry.bulkMailStatus$beingSent()
}
+/**
+ * Checks whether the given status id matches,<br>
+ * to the status of a bulk mail which is sent or<br>
+ * not.
+ *
+ * @param {String} pStatus <p>
+ * The key id of the current status.<br>
+ * @return {Boolean} <p>
+ * True if the status is "sent" or "sending".<br>
+ */
+BulkMailUtils.isStatusSendingSentOrAdHoc = function (pStatus)
+{
+ return pStatus == $KeywordRegistry.bulkMailStatus$sent() || pStatus == $KeywordRegistry.bulkMailStatus$beingSent() || pStatus == $KeywordRegistry.bulkMailStatus$adHoc()
+}
+
/**
* Opens BulkMail context in new mode, with the given bulk mail id.<br>
*
@@ -765,13 +947,27 @@ BulkMailUtils.createFromMosaicoTemplate = function(pMosaicoTemplateId)
**/
BulkMailUtils.storeEmlFile = function (pBulkMailId, pMailRunId, pMailLogId, pFile)
{
- var locationoption = project.getPreferenceValue("bulkmail.fileStorage", "/bulkMailFiles/");
- var path = vars.get("$sys.serverdata") + locationoption + pBulkMailId + "/" + pMailRunId + "/";
+ var locationOption = project.getInstanceConfigValue("bulkmail.fileStorage", vars.get("$sys.serverdata"));
+ var path = locationOption + (locationOption.substr(locationOption.length-1) == "/" ? "" : "/" )+ "bulkmailfiles/" + pBulkMailId + "/" + pMailRunId + "/";
var filename = pMailLogId + ".eml"
var fullPath = path + filename;
fileIO.storeData(fullPath, pFile, util.DATA_BINARY, false);
}
+/*
+ *Deletes all stored eml files for a bulk mail
+ *
+ *@param {String} pBulkMailId <p>
+ * The id of the bulk mail.<br>
+ *
+ **/
+BulkMailUtils.deleteAllEmlFiles = function (pBulkMailId)
+{
+ var locationOption = project.getInstanceConfigValue("bulkmail.fileStorage", vars.get("$sys.serverdata"));
+ var path = locationOption + (locationOption.substr(locationOption.length-1) == "/" ? "" : "/" )+ "bulkmailfiles/" + pBulkMailId;
+ FileUtils.removeFolder(path);
+}
+
/*
* Stores the eml file of a bounce in the filesystem
*
@@ -781,8 +977,8 @@ BulkMailUtils.storeEmlFile = function (pBulkMailId, pMailRunId, pMailLogId, pFil
**/
BulkMailUtils.storeBounceEmlFile = function (pBounceId, pFile)
{
- var locationoption = project.getPreferenceValue("bulkmail.fileStorage", "/bulkMailFiles/");
- var path = vars.get("$sys.serverdata") + locationoption + "Bounces/";
+ var locationOption = project.getInstanceConfigValue("bulkmail.fileStorage", vars.get("$sys.serverdata"));
+ var path = locationOption + (locationOption.substr(locationOption.length-1) == "/" ? "" : "/" )+ "bulkmailfiles/bounces/";
var filename = pBounceId + ".eml"
var fullPath = path + filename;
fileIO.storeData(fullPath, pFile, util.DATA_TEXT, false);
@@ -802,8 +998,8 @@ BulkMailUtils.storeBounceEmlFile = function (pBounceId, pFile)
**/
BulkMailUtils.getEmlFile = function(pBulkMailId,pMailRunId, pMailLogId)
{
- var locationoption = project.getPreferenceValue("bulkmail.fileStorage","/bulkMailFiles/");
- var path = vars.get("$sys.serverdata")+locationoption +pBulkMailId+"/"+pMailRunId+"/";
+ var locationOption = project.getInstanceConfigValue("bulkmail.fileStorage", vars.get("$sys.serverdata"));
+ var path = locationOption + (locationOption.substr(locationOption.length-1) == "/" ? "" : "/" )+ "bulkmailfiles/" + pBulkMailId + "/" + pMailRunId + "/";
var filename = pMailLogId+".eml"
var fullPath = path + filename;
return (fileIO.getData(fullPath,util.DATA_BINARY));
@@ -814,15 +1010,22 @@ BulkMailUtils.getEmlFile = function(pBulkMailId,pMailRunId, pMailLogId)
*
* @param {String} pLinkId <p>
* The id of the link.<br>
+ * @param {String} pBaseUrl <p>
+ * The base url for relative links<br>
*
* @return {String} <p>
* The url<br>
**/
-BulkMailUtils.getRedirectLink = function(pLinkId)
+BulkMailUtils.getRedirectLink = function(pLinkId, pBaseUrl)
{
if (pLinkId)
{
- return newSelect("WEBLINK.URL").from("WEBLINK").where("WEBLINK.WEBLINKID", pLinkId).cell();
+ var link = newSelect("WEBLINK.URL").from("WEBLINK").where("WEBLINK.WEBLINKID", pLinkId).cell();
+ if(link[0] == "/")
+ {
+ link = pBaseUrl + link;
+ }
+ return link;
}
return null;
}
diff --git a/process/Campaign_lib/process.js b/process/Campaign_lib/process.js
index 58bdffc44102983beea08ff21599faa982748d66..b42cd51a90d0882b32916d2beebc572c1b4e124b 100644
--- a/process/Campaign_lib/process.js
+++ b/process/Campaign_lib/process.js
@@ -48,6 +48,20 @@ CampaignUtils.addParticipantsByCondition = function(pCondition, pSourceTableName
"campaignParticipantsCondition_param", "CampaignAddParticipantsEdit_view", pSourceTableName);
}
+/**
+ * Add many contacts (person or organistaion) to a campaign.<br>
+ *
+ * @param {String} pRecordsRecipe <p>
+ * RecordsRecipe
+ * @param {String} pSourceTableName <p>
+ * The source table.<br>
+ */
+CampaignUtils.addParticipantsByRecordsRecipe = function(pRecordsRecipe, pSourceTableName)
+{
+ _CampaignUtils._openAddParticipantContext("CampaignAddParticipants", pRecordsRecipe,
+ "campaignParticipantsRecordsRecipe_param", "CampaignAddParticipantsEdit_view", pSourceTableName);
+}
+
/**
* Gets the campaign name per id.<br>
*
@@ -257,6 +271,29 @@ CampaignUtils.openSetCampaignStepViewByCondition = function(pCondition, pCampaig
neon.openContextWithRecipe("CampaignAddParticipants", "CampaignAddParticipantsEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
}
+/**
+ * Opens the CampaignAddParticipants context in new mode.<br>
+ *
+ * @param {String} pRecordsRecipe <p>
+ * The records recipe which will be used to select the specific<br>
+ * participants, which campaign step shall be updated.<br>
+ * @param {String} pCampaignId <p>
+ * The id of the campaign.<br>
+ * @param {String} pCampaignStepId <p>
+ * The id of the new campaign step.<br>
+ */
+CampaignUtils.openSetCampaignStepViewByRecordsRecipe = function(pRecordsRecipe, pCampaignId, pCampaignStepId)
+{
+ var params = {
+ "campaignParticipantsRecordsRecipe_param": pRecordsRecipe,
+ "currentCampaignId_param": pCampaignId,
+ "currentCampaignStepId_param": pCampaignStepId,
+ "isUpdate_param": true
+ };
+ var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
+ neon.openContextWithRecipe("CampaignAddParticipants", "CampaignAddParticipantsEdit_view", recipe, neon.OPERATINGSTATE_VIEW);
+}
+
/**
* Opens the CampaignStep context in new mode.<br>
*
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index 8a99351a66231aafc8321312180c8c9cf4372af9..4445c76e6264b3ec4288f125e15afb9b741cf2a0 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -1,3 +1,6 @@
+import("Util_lib");
+import("Contact_lib");
+import("Context_lib");
import("system.db");
import("system.vars");
import("system.datetime");
@@ -17,10 +20,6 @@ import("Keyword_lib");
*/
function CommUtil(){}
-CommUtil.defaultObjectType = function () {
- return "Contact";
-}
-
/**
* Returns the ids of COMMUNICATION.MEDIUM that are clustered under a specific category.<br>
*
@@ -59,7 +58,7 @@ CommUtil.getMediumIdsByCategory = function (pCategory)
* Value of the keyword "COMMUNICATION.MEDIUM"<br>
* custom.category e.g.: "PHONE" the ISSTANDARD of <br>
* this category is set.<br>
- * @param {String} pAffectedType=defaultObjectType (optional)<p>
+ * @param {String} pAffectedType=currentContextId (optional)<p>
* The type is the context of the pAffectedRowId.<br>
* If the type is not specified, the CommUtil.defaultObjectType() is then used.<br>
* @return {null} <p>
@@ -86,7 +85,7 @@ CommUtil.setStandardForCategory = function(pAffectedRowId, pNewStandardCommId, p
if (!pAffectedType)
{
- pAffectedType = CommUtil.defaultObjectType();
+ pAffectedType = ContextUtils.getCurrentContextId();
}
//set current standard comm-record as non-standard
@@ -165,7 +164,7 @@ CommUtil.setStandardMail = function(pAffectedRowId, pNewStandardCommId, pAffecte
* @param {String|Object} pObjectField=CONTACT.CONTACTID (optional) <p>
* A refencial ID whose communication entries should be modified.<br>
* (e.g.: a CONTACTID)<br>
- * @param {String} pObjectType=defaultObjectType (optional) <p>
+ * @param {String} pObjectType=CurrentContextId (optional) <p>
* The type is the context of the pAffectedRowId.<br>
* If the type is not specified, the CommUtil.defaultObjectType() is then used.<br>
* @return {String} <p>
@@ -173,6 +172,7 @@ CommUtil.setStandardMail = function(pAffectedRowId, pNewStandardCommId, pAffecte
*/
CommUtil.getStandardSubSqlForCategory = function(pCategory, pObjectField, pObjectType)
{
+ let objectType;
if (!pCategory)
{
return "''";
@@ -181,14 +181,16 @@ CommUtil.getStandardSubSqlForCategory = function(pCategory, pObjectField, pObjec
var selectStandardAddr = newSelect("max(COMMUNICATION.ADDR)")
.from("COMMUNICATION")
.where();
-
+
if (pObjectField == undefined)
{
- selectStandardAddr.and("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID")
+ selectStandardAddr.and("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID");
+ objectType = pObjectType || ContactUtils.getContextBySubsql();
}
else if (typeof(pObjectField) == "string")
{
selectStandardAddr.and("COMMUNICATION.OBJECT_ROWID", pObjectField);
+ objectType = pObjectType || ContactUtils.getContextByContactId(pObjectField);
}
else if (typeof(pObjectField) == "object")
{
@@ -205,12 +207,12 @@ CommUtil.getStandardSubSqlForCategory = function(pCategory, pObjectField, pObjec
{
return "''";
}
-
+
selectStandardAddr
.andIfSet("COMMUNICATION.MEDIUM_ID", mediumIds, SqlBuilder.IN())
.and("COMMUNICATION.ISSTANDARD = 1")
- .and("COMMUNICATION.OBJECT_TYPE", (pObjectType ? pObjectType : CommUtil.defaultObjectType()));
+ .andIfSet("COMMUNICATION.OBJECT_TYPE", objectType);
return selectStandardAddr.toString();
};
@@ -263,7 +265,7 @@ CommUtil.getStandardSubSqlMail = function(pObjectField, pObjectType)
*/
CommUtil.getStandardMail = function (pObjectRowId, pObjectType)
{
- var query = CommUtil.getStandardSubSqlMail(newWhere("COMMUNICATION.OBJECT_ROWID", pObjectRowId), pObjectType);
+ var query = CommUtil.getStandardSubSqlMail(pObjectRowId, pObjectType);
return db.cell(query);
}
@@ -276,7 +278,7 @@ CommUtil.getStandardMail = function (pObjectRowId, pObjectType)
* @param {String|Object} pContactField=CONTACT.CONTACTID (optional) <p>
* SQL-fieldname that shall be used for filtering the CONTACT_ID, <br>
* this can be a string(fieldname) or an SqlBuilder object.<br>
- * @param {String} pObjectType=defaultObjectType (optional) <p>
+ * @param {String} pObjectType=currentContextId (optional) <p>
* The type is the context of the pAffectedRowId.<br>
* If the type is not specified, the CommUtil.defaultObjectType() is then used.<br>
* @return {String} <p>
@@ -284,6 +286,7 @@ CommUtil.getStandardMail = function (pObjectRowId, pObjectType)
*/
CommUtil.getMediumAddrSubSqlByKey = function(pMediumKey, pContactField, pObjectType)
{
+ let objectType;
var selectAddr = newSelect("max(COMMUNICATION.ADDR)")
.from("COMMUNICATION")
.where();
@@ -291,11 +294,13 @@ CommUtil.getMediumAddrSubSqlByKey = function(pMediumKey, pContactField, pObjectT
if (pContactField == undefined)
{
selectAddr.and("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID");
+ objectType = pObjectType || ContactUtils.getContextBySubsql();
}
else if (typeof(pContactField) == "string")
{
selectAddr.and("COMMUNICATION.OBJECT_ROWID", pContactField);
+ objectType = pObjectType || ContactUtils.getContextByContactId(pObjectField);
}
else if (typeof(pContactField) == "object")
{
@@ -308,7 +313,7 @@ CommUtil.getMediumAddrSubSqlByKey = function(pMediumKey, pContactField, pObjectT
}
selectAddr.andIfSet("COMMUNICATION.MEDIUM_ID", pMediumKey)
- .and("COMMUNICATION.OBJECT_TYPE", (pObjectType ? pObjectType : CommUtil.defaultObjectType()));
+ .andIfSet("COMMUNICATION.OBJECT_TYPE", objectType);
return selectAddr.toString();
}
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 7f18a5617c54455f8ced880b223f4d7ed91d261b..018d0d460d794f3786efcf3e856da42c5caf203e 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -32,9 +32,9 @@ function OrganisationUtils() {}//TODO: there exsits a OrgUtils and OrganisationU
OrganisationUtils.getNameByOrganisationId = function(pOrganisationId)
{
var orgname = newSelect("ORGANISATION.NAME")
- .from("ORGANISATION")
- .whereIfSet("ORGANISATION.ORGANISATIONID", pOrganisationId)
- .cell(true);
+ .from("ORGANISATION")
+ .whereIfSet("ORGANISATION.ORGANISATIONID", pOrganisationId)
+ .cell(true);
return orgname;
};
@@ -49,10 +49,10 @@ OrganisationUtils.getNameByOrganisationId = function(pOrganisationId)
OrganisationUtils.getNameByContactId = function(pContactId)
{
var orgname = newSelect("ORGANISATION.NAME")
- .from("ORGANISATION")
- .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
- .whereIfSet("CONTACT.CONTACTID", pContactId)
- .cell(true);
+ .from("ORGANISATION")
+ .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
+ .whereIfSet("CONTACT.CONTACTID", pContactId)
+ .cell(true);
return orgname;
};
@@ -93,9 +93,9 @@ ContactUtils.getResolvingDisplaySubSql = function(pContactIdField, pIncludeOrgan
}
//TODO: verify if there is a better solution for the usage of this as a displayValueExpression --> automatic use of #TITLE | waiting vor implementation
return "select " + selectExpression + "from CONTACT "
- + " left join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID) "
- + " left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) "
- + " where CONTACT.CONTACTID = " + pContactIdField;
+ + " left join PERSON on (PERSON.PERSONID = CONTACT.PERSON_ID) "
+ + " left join ORGANISATION on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID) "
+ + " where CONTACT.CONTACTID = " + pContactIdField;
}
/*
@@ -126,12 +126,12 @@ ContactUtils.validateIfAlreadyExists = function(pPersonId, pOrganisationId, pOwn
}
var alreadyExistantContactId = newSelect("CONTACT.CONTACTID")
- .from("CONTACT")
- .where("CONTACT.PERSON_ID", pPersonId)
- .and("CONTACT.ORGANISATION_ID", pOrganisationId)
- //exclude the own since we do not want a "is not valid"-message for our own entry (on EDIT-mode)
- .andIfSet("CONTACT.CONTACTID", pOwnContactId, SqlBuilder.NOT_EQUAL())
- .cell();
+ .from("CONTACT")
+ .where("CONTACT.PERSON_ID", pPersonId)
+ .and("CONTACT.ORGANISATION_ID", pOrganisationId)
+ //exclude the own since we do not want a "is not valid"-message for our own entry (on EDIT-mode)
+ .andIfSet("CONTACT.CONTACTID", pOwnContactId, SqlBuilder.NOT_EQUAL())
+ .cell();
if (alreadyExistantContactId)
{
@@ -368,6 +368,23 @@ ContactUtils.getContextByPersOrg = function(pPersonId, pOrganisationId)
}
}
+/**
+ * return the corresponding context of the contact as sub-SqlBuilder
+ *
+ * @param {String} [pContactIdField="CONTACT.CONTACTID"] the field of the contact_id in the select
+ *
+ * @return {SqlBuilder} sub-SqlBuilder to get the context
+ */
+ContactUtils.getContextBySubsql = function(pContactIdField)
+{
+ return newSelect(
+ SqlBuilder.caseWhen("SUBCONTACT.PERSON_ID is null")
+ .thenString("Organisation")
+ .elseString("Person"))
+ .from("CONTACT", "SUBCONTACT")
+ .where("SUBCONTACT.CONTACTID = " + (Utils.isNotNullOrEmptyString(pContactIdField) ? pContactIdField : "CONTACT.CONTACTID"))
+}
+
/**
* return the corresponding context of the contact <br>
* If you already have persId and orgId from the CONTACT table, use getContextByPersOrg() <br>
@@ -390,9 +407,9 @@ ContactUtils.getContextByContactId = function(pContactId)
ContactUtils.getPersOrgIds = function(pContactId)
{
var persOrgIds = newSelect("CONTACTID, PERSON_ID, ORGANISATION_ID")
- .from("CONTACT")
- .whereIfSet("CONTACT.CONTACTID", pContactId)
- .arrayRow(true);
+ .from("CONTACT")
+ .whereIfSet("CONTACT.CONTACTID", pContactId)
+ .arrayRow(true);
return persOrgIds;
}
@@ -407,9 +424,9 @@ ContactUtils.getPersOrgIds = function(pContactId)
ContactUtils.getPersOrgIds = function(pContactId)
{
return newSelect("CONTACTID, PERSON_ID, ORGANISATION_ID")
- .from("CONTACT")
- .whereIfSet("CONTACT.CONTACTID", pContactId)
- .arrayRow(true);
+ .from("CONTACT")
+ .whereIfSet("CONTACT.CONTACTID", pContactId)
+ .arrayRow(true);
}
/**
@@ -422,10 +439,10 @@ ContactUtils.getPersOrgIds = function(pContactId)
ContactUtils.getOrganisationContactId = function(pAnyContactId)
{
return newSelect("CONTACT.CONTACTID")
- .from("CONTACT")
- .join("CONTACT", "anyContact.ORGANISATION_ID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null", "anyContact")
- .whereIfSet(["CONTACT", "CONTACTID", "anyContact"], pAnyContactId)
- .cell(true);
+ .from("CONTACT")
+ .join("CONTACT", "anyContact.ORGANISATION_ID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null", "anyContact")
+ .whereIfSet(["CONTACT", "CONTACTID", "anyContact"], pAnyContactId)
+ .cell(true);
}
/**
@@ -438,10 +455,10 @@ ContactUtils.getOrgContactId = function(pOrganisationId)
{
if (pOrganisationId) {
return newSelect("CONTACTID")
- .from("CONTACT")
- .where("CONTACT.ORGANISATION_ID", pOrganisationId)
- .and("CONTACT.PERSON_ID is null")
- .cell();
+ .from("CONTACT")
+ .where("CONTACT.ORGANISATION_ID", pOrganisationId)
+ .and("CONTACT.PERSON_ID is null")
+ .cell();
}
return "";
}
@@ -457,11 +474,11 @@ ContactUtils.getOrgContactId = function(pOrganisationId)
ContactUtils.getFullTitleByContactId = function(pContactId, pIncludeOrganisation)
{
var data = newSelect("ORGANISATION.NAME, PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME")
- .from("CONTACT")
- .join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
- .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .whereIfSet("CONTACT.CONTACTID", pContactId)
- .arrayRow(true);
+ .from("CONTACT")
+ .join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .whereIfSet("CONTACT.CONTACTID", pContactId)
+ .arrayRow(true);
if (data.length == 0)
return "";
@@ -488,9 +505,9 @@ ContactUtils.getFullTitleByContactId = function(pContactId, pIncludeOrganisation
ContactUtils.getTitleByPersonId = function(pPersonId, pIncludeOrganisation)
{
var data = newSelect("PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME")
- .from("PERSON")
- .whereIfSet("PERSON.PERSONID", pPersonId)
- .arrayRow(true);
+ .from("PERSON")
+ .whereIfSet("PERSON.PERSONID", pPersonId)
+ .arrayRow(true);
if (data.length == 0)
return "";
@@ -516,9 +533,9 @@ ContactUtils.getTitleByPersonId = function(pPersonId, pIncludeOrganisation)
ContactUtils.getTitleByContactId = function(pContactId)
{
var personId = newSelect("CONTACT.PERSON_ID")
- .from("CONTACT")
- .whereIfSet("CONTACT.CONTACTID", pContactId)
- .cell(true);
+ .from("CONTACT")
+ .whereIfSet("CONTACT.CONTACTID", pContactId)
+ .cell(true);
return ContactUtils.getTitleByPersonId(personId);
}
@@ -531,9 +548,9 @@ ContactUtils.getTitleByContactId = function(pContactId)
ContactUtils.getFullContactString = function()
{
return " CONTACT "
- + " join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID "
- + " left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID "
- + " left join ADDRESS on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID";
+ + " join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID "
+ + " left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID "
+ + " left join ADDRESS on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID";
}
/**
@@ -545,10 +562,10 @@ ContactUtils.getFullContactString = function()
ContactUtils.getFullContactSqlBuilder = function (pSelectFields)
{
var sql = new SqlBuilder()
- .from("CONTACT")
- .join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
- .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID");
+ .from("CONTACT")
+ .join("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID");
if (pSelectFields)
sql.select(pSelectFields);
@@ -564,9 +581,9 @@ ContactUtils.getFullContactSqlBuilder = function (pSelectFields)
ContactUtils.getDefaultAddressId = function(pContactId)
{
return newSelect("ADDRESS_ID")
- .from("CONTACT")
- .whereIfSet("CONTACT.CONTACTID", pContactId)
- .cell(true);
+ .from("CONTACT")
+ .whereIfSet("CONTACT.CONTACTID", pContactId)
+ .cell(true);
}
/**
@@ -584,22 +601,22 @@ ContactUtils.getDefaultAddressId = function(pContactId)
ContactUtils.getCommRestrictionCondition = function (pMedium, pNoRestriction, pStartDate)
{
var existsQuery = new SqlBuilder()
- .select("COMMUNICATIONSETTINGSID")
- .from("COMMUNICATIONSETTINGS")
- .where(newWhereIfSet("COMMUNICATIONSETTINGS.MEDIUM", pMedium)
- .or("COMMUNICATIONSETTINGS.CHANNEL_TYPE", $KeywordRegistry.communicationChannelType$global()))
- .and("COMMUNICATIONSETTINGS.STATUS", $KeywordRegistry.communicationSettingStatus$rejected())
- .and("COMMUNICATIONSETTINGS.ISACTIVE",1)
- .and(newWhere()
- // check contactid
- .or("COMMUNICATIONSETTINGS.CONTACT_ID = CONTACT.CONTACTID")
- // or the contact id of the organisation
- .or("COMMUNICATIONSETTINGS.CONTACT_ID", newSelect("orgContact.CONTACTID")
- .from("CONTACT anyContact")
- .join("CONTACT orgContact", newWhere("anyContact.ORGANISATION_ID = orgContact.ORGANISATION_ID")
- .and("orgContact.PERSON_ID is null")
- )
- .where("anyContact.CONTACTID = CONTACT.CONTACTID")
+ .select("COMMUNICATIONSETTINGSID")
+ .from("COMMUNICATIONSETTINGS")
+ .where(newWhereIfSet("COMMUNICATIONSETTINGS.MEDIUM", pMedium)
+ .or("COMMUNICATIONSETTINGS.CHANNEL_TYPE", $KeywordRegistry.communicationChannelType$global()))
+ .and("COMMUNICATIONSETTINGS.STATUS", $KeywordRegistry.communicationSettingStatus$rejected())
+ .and("COMMUNICATIONSETTINGS.ISACTIVE",1)
+ .and(newWhere()
+ // check contactid
+ .or("COMMUNICATIONSETTINGS.CONTACT_ID = CONTACT.CONTACTID")
+ // or the contact id of the organisation
+ .or("COMMUNICATIONSETTINGS.CONTACT_ID", newSelect("orgContact.CONTACTID")
+ .from("CONTACT anyContact")
+ .join("CONTACT orgContact", newWhere("anyContact.ORGANISATION_ID = orgContact.ORGANISATION_ID")
+ .and("orgContact.PERSON_ID is null")
+ )
+ .where("anyContact.CONTACTID = CONTACT.CONTACTID")
)
)
var cond = pNoRestriction ? SqlBuilder.NOT_EXISTS() : SqlBuilder.EXISTS();
@@ -627,10 +644,10 @@ ContactUtils.hasCommRestriction = function (pContactId, pMedium)
}
return newSelect("CONTACTID")
- .from("CONTACT")
- .where("CONTACT.CONTACTID", pContactId)
- .and(commSettingsCond.rejected().existSettings().buildCondition())
- .cell() != "";
+ .from("CONTACT")
+ .where("CONTACT.CONTACTID", pContactId)
+ .and(commSettingsCond.rejected().existSettings().buildCondition())
+ .cell() != "";
}
/**
@@ -643,13 +660,13 @@ ContactUtils.getCommunicationRejectionSummary = function (pContactId)
{
var mediumTitleSql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.communicationMediumCampaign(), "COMMUNICATIONSETTINGS.MEDIUM");
var communicationRejections = newSelect(["CHANNEL_TYPE", "MEDIUM", mediumTitleSql])
- .from("COMMUNICATIONSETTINGS")
- .where("COMMUNICATIONSETTINGS.CONTACT_ID", pContactId)
- .and("COMMUNICATIONSETTINGS.ISACTIVE",1)
- .and("COMMUNICATIONSETTINGS.CHANNEL_TYPE", $KeywordRegistry.communicationChannelType$profiling(), SqlBuilder.NOT_EQUAL())
- .and("COMMUNICATIONSETTINGS.STATUS", $KeywordRegistry.communicationSettingStatus$rejected())
- .orderBy(mediumTitleSql)
- .table();
+ .from("COMMUNICATIONSETTINGS")
+ .where("COMMUNICATIONSETTINGS.CONTACT_ID", pContactId)
+ .and("COMMUNICATIONSETTINGS.ISACTIVE",1)
+ .and("COMMUNICATIONSETTINGS.CHANNEL_TYPE", $KeywordRegistry.communicationChannelType$profiling(), SqlBuilder.NOT_EQUAL())
+ .and("COMMUNICATIONSETTINGS.STATUS", $KeywordRegistry.communicationSettingStatus$rejected())
+ .orderBy(mediumTitleSql)
+ .table();
if (communicationRejections.length > 0)
{
@@ -683,20 +700,20 @@ ContactUtils.getCommRestrictionCount = function(pMedium, pStartDate)
if (!pStartDate && pStartDate !== 0)
pStartDate = datetime.date();
var firstLevel = new SqlBuilder()
- .select("count(*)")
- .from("COMMRESTRICTION")
- .whereIfSet("COMMRESTRICTION.MEDIUM", pMedium)
- .and("COMMRESTRICTION.STARTDATE", pStartDate, SqlBuilder.LESS_OR_EQUAL())
- .and("COMMRESTRICTION.CONTACT_ID = CONTACT.CONTACTID");
+ .select("count(*)")
+ .from("COMMRESTRICTION")
+ .whereIfSet("COMMRESTRICTION.MEDIUM", pMedium)
+ .and("COMMRESTRICTION.STARTDATE", pStartDate, SqlBuilder.LESS_OR_EQUAL())
+ .and("COMMRESTRICTION.CONTACT_ID = CONTACT.CONTACTID");
var secondLevel = new SqlBuilder()
- .select("count(*)")
- .from("COMMRESTRICTION")
- .whereIfSet("COMMRESTRICTION.MEDIUM", pMedium)
- .and("COMMRESTRICTION.STARTDATE", pStartDate, SqlBuilder.LESS_OR_EQUAL())
- .and("COMMRESTRICTION.CONTACT_ID", newSelect("c1.CONTACTID").from("CONTACT", "c1")
- .join("CONTACT", "c2.ORGANISATION_ID = c1.ORGANISATION_ID and c1.PERSON_ID is null", "c2")
- .where("c2.CONTACTID = CONTACT.CONTACTID")
+ .select("count(*)")
+ .from("COMMRESTRICTION")
+ .whereIfSet("COMMRESTRICTION.MEDIUM", pMedium)
+ .and("COMMRESTRICTION.STARTDATE", pStartDate, SqlBuilder.LESS_OR_EQUAL())
+ .and("COMMRESTRICTION.CONTACT_ID", newSelect("c1.CONTACTID").from("CONTACT", "c1")
+ .join("CONTACT", "c2.ORGANISATION_ID = c1.ORGANISATION_ID and c1.PERSON_ID is null", "c2")
+ .where("c2.CONTACTID = CONTACT.CONTACTID")
, SqlBuilder.IN());
return firstLevel.toString() +") + ("+secondLevel.toString();
@@ -722,7 +739,7 @@ ContactUtils.getCommFilter = function(pOperator, pRawvalue, pFilterOperatorName,
.join("AB_KEYWORD_ENTRY", "AB_KEYWORD_ENTRY.KEYID = COMMUNICATION.MEDIUM_ID")
.join("AB_KEYWORD_ATTRIBUTERELATION", "AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID = AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID")
.where("AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE", pType)
- .and("COMMUNICATION.OBJECT_TYPE", "Contact");
+ .and("COMMUNICATION.OBJECT_TYPE", ContextUtils.getCurrentContextId());
//SqlBuilder not implemented as the statement needs to be finished in the switch case
resultSqlCond = "CONTACTID in (" + commpart.toString() + " and COMMUNICATION.ADDR " + pFilterOperatorName;
@@ -767,10 +784,10 @@ ContactUtils.getContactIdByEmail = function(pEmail)
{
var email = EmailUtils.extractAddress(pEmail).toUpperCase();
var contactId = newSelect("CONTACT.CONTACTID")
- .from("COMMUNICATION")
- .join("CONTACT", newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", "Contact"))
- .where("COMMUNICATION.ADDR", email, "upper(#) = ?")
- .cell();
+ .from("COMMUNICATION")
+ .join("CONTACT", newWhere("COMMUNICATION.OBJECT_ROWID = CONTACT.CONTACTID").and("COMMUNICATION.OBJECT_TYPE", ContactUtils.getContextBySubsql("COMMUNICATION.OBJECT_ROWID")))
+ .where("COMMUNICATION.ADDR", email, "upper(#) = ?")
+ .cell();
return contactId;
}
@@ -786,16 +803,38 @@ ContactUtils.getContactIdByEmail = function(pEmail)
ContactUtils.isDeletable = function (pCurrentContext, pContactId, pPersonId)
{
return new HasLinkedObjectTester()
- .andNoEntityRows("Activity_entity", "LinkedObjects", {ObjectId_param : pCurrentContext, RowId_param : pContactId}) //Activities
- .andNoEntityRows("Task_entity", "Tasks", {ObjectId_param : pCurrentContext, RowId_param : pContactId}) //Tasks
- .andNoEntityRows("Document_entity", "Documents", {AssignmentTable_param : "CONTACT", AssignmentRowId_param : pContactId}) //Documents
- .and(function () {return !EmployeeUtils.isUser(pContactId);})
- .andNoEntityRows("Offer_entity", "ContactOffers", {ContactId_param : pContactId}) //Offers
- .andNoEntityRows("Contract_entity", "Contracts", {ContactId_param : pContactId}) //Contracts
- .andNoEntityRows("ObjectTree_entity", "TreeProvider", {ObjectIds_param : pPersonId ? JSON.stringify([pContactId, pPersonId]) : pContactId, ObjectTypes_param : pPersonId ? JSON.stringify([pCurrentContext, "PrivatePerson"]) : pCurrentContext})
- .andNoEntityRows("CampaignParticipant_entity", "CampaignParticipantsProvider", {ContactId_param : pContactId})
- .andNoEntityRows("Order_entity", "#PROVIDER", {ContactId_param : pContactId})
- .validate();
+ .andNoEntityRows("Activity_entity", "LinkedObjects", {
+ ObjectId_param : pCurrentContext,
+ RowId_param : pContactId
+ }) //Activities
+ .andNoEntityRows("Task_entity", "Tasks", {
+ ObjectId_param : pCurrentContext,
+ RowId_param : pContactId
+ }) //Tasks
+ .andNoEntityRows("Document_entity", "Documents", {
+ AssignmentTable_param : "CONTACT",
+ AssignmentRowId_param : pContactId
+ }) //Documents
+ .and(function () {
+ return !EmployeeUtils.isUser(pContactId);
+ })
+ .andNoEntityRows("Offer_entity", "ContactOffers", {
+ ContactId_param : pContactId
+ }) //Offers
+ .andNoEntityRows("Contract_entity", "Contracts", {
+ ContactId_param : pContactId
+ }) //Contracts
+ .andNoEntityRows("ObjectTree_entity", "TreeProvider", {
+ ObjectIds_param : pPersonId ? JSON.stringify([pContactId, pPersonId]) : pContactId,
+ ObjectTypes_param : pPersonId ? JSON.stringify([pCurrentContext, "PrivatePerson"]) : pCurrentContext
+ })
+ .andNoEntityRows("CampaignParticipant_entity", "CampaignParticipantsProvider", {
+ ContactId_param : pContactId
+ })
+ .andNoEntityRows("Order_entity", "#PROVIDER", {
+ ContactId_param : pContactId
+ })
+ .validate();
}
/**
@@ -841,17 +880,17 @@ ContactUtils.getContactSalutationSubSql = function(pGetHeadline, pGetLetterSalut
}
return sqlHelper.isNull(
- "(" + newSelect(SqlBuilder.caseWhen("CONTACT.PERSON_ID is null").then(salutationColumn).elseValue(personSelect))
- .from("SALUTATION")
- .where("SALUTATION.ISOLANGUAGE = CONTACT.ISOLANGUAGE")
- .and(newWhere("SALUTATION.SEX = PERSON.GENDER").or("SALUTATION.SEX is null"))
- .and(newWhere("SALUTATION.TITLE = PERSON.TITLE").or("SALUTATION.TITLE is null"))
- .and(newWhere("SALUTATION.SALUTATION = PERSON.SALUTATION").or("SALUTATION.SALUTATION is null"))
- .orderBy("SALUTATION.SEX desc, SALUTATION.TITLE desc")
- .toString()
- + " " + sqlHelper.limit(1)
- + ")"
- , sqlHelper.concatWithSeparator(["PERSON.TITLE", "PERSON.FIRSTNAME", "PERSON.LASTNAME"], " "));
+ "(" + newSelect(SqlBuilder.caseWhen("CONTACT.PERSON_ID is null").then(salutationColumn).elseValue(personSelect))
+ .from("SALUTATION")
+ .where("SALUTATION.ISOLANGUAGE = CONTACT.ISOLANGUAGE")
+ .and(newWhere("SALUTATION.SEX = PERSON.GENDER").or("SALUTATION.SEX is null"))
+ .and(newWhere("SALUTATION.TITLE = PERSON.TITLE").or("SALUTATION.TITLE is null"))
+ .and(newWhere("SALUTATION.SALUTATION = PERSON.SALUTATION").or("SALUTATION.SALUTATION is null"))
+ .orderBy("SALUTATION.SEX desc, SALUTATION.TITLE desc")
+ .toString()
+ + " " + sqlHelper.limit(1)
+ + ")"
+ , sqlHelper.concatWithSeparator(["PERSON.TITLE", "PERSON.FIRSTNAME", "PERSON.LASTNAME"], " "));
}
/**
diff --git a/process/DSGVOAnonymize_serverProcess/process.js b/process/DSGVOAnonymize_serverProcess/process.js
index c6bacd4d60a4effed14500ca43e0aa47ad850c87..1a1aebb4df6eb5a9c6c8f426136fdf203ecb8240 100644
--- a/process/DSGVOAnonymize_serverProcess/process.js
+++ b/process/DSGVOAnonymize_serverProcess/process.js
@@ -189,7 +189,7 @@ if (contacts.length > 0)
.buildDeleteStatement(true, "ADDRESS"));
statements.push(newWhere("COMMUNICATION.OBJECT_ROWID", tempContactIds, SqlBuilder.IN())
- .and("COMMUNICATION.OBJECT_TYPE", "Contact")
+ .and("COMMUNICATION.OBJECT_TYPE", "Person")
.buildDeleteStatement(true, "COMMUNICATION"));
statements.push(newWhere("AB_ATTRIBUTERELATION.OBJECT_ROWID", tempContactIds, SqlBuilder.IN())
diff --git a/process/DataPrivacy_lib/process.js b/process/DataPrivacy_lib/process.js
index 405e0d0645f1e86d2e0b67d750292937f33aea3f..d71b064907ef3529d42f64725ff9935f0a155bd4 100644
--- a/process/DataPrivacy_lib/process.js
+++ b/process/DataPrivacy_lib/process.js
@@ -249,7 +249,7 @@ DataPrivacyType.get = function(pKey)
{
entityConfig.provider("AllCommunications")
.addParameter("ObjectRowId_param", pContactId)
- .addParameter("ObjectType_param", "Contact");
+ .addParameter("ObjectType_param", "Person");
}
return entities.getRows(entityConfig).map(function(pComm)
diff --git a/process/Dependency_lib/process.js b/process/Dependency_lib/process.js
index efe81c43ef8249475a569c9732b3fe96a3149a33..20e0d32b4cefaddf9386a32dbadc0dac70c206e1 100644
--- a/process/Dependency_lib/process.js
+++ b/process/Dependency_lib/process.js
@@ -1,6 +1,6 @@
+import("system.tag");
import("Util_lib");
import("Sql_lib");
-import("system.favorite");
function Dependency(){}
@@ -112,8 +112,8 @@ Dependency.defaultFunctionForFavorites = function (pTableField, pContext)
let rowIds = Dependency.defaultFunctionForField(pTableField)(pNewData, pOldData);
let ids = [];
- let config = favorite.createGetFavoritesConfig().setObjectType(pContext);
- let favos = favorite.getFavorites(config);
+ let config = tag.createGetTaggedObjectsConfig().setObjectType(pContext);
+ let favos = tag.getTaggedObjects(config);
for(let i = 0; i < favos.length; i++)
{
diff --git a/process/District_lib/process.js b/process/District_lib/process.js
index b3efdb43075655be59ec8d8e8c8e3c51fd7559cc..93d26cf8a3aac3bf8044450c7cf5b0b7741665e5 100644
--- a/process/District_lib/process.js
+++ b/process/District_lib/process.js
@@ -119,8 +119,12 @@ DistrictUtils.assignDistrictOnServer = function (pArrDistrictIds, pUser, pContac
*/
DistrictUtils.assignDistrict = function (pDistrictId, pAppliedFilter, pContactId)
{
- if (pContactId == undefined)
+ if(pContactId == undefined)
+ {
pContactId = null;
+ }
+
+ var districtName = DistrictUtils.getDistrictName(pDistrictId);
var newAssigned = 0;
var unchanged = 0;
@@ -158,24 +162,24 @@ DistrictUtils.assignDistrict = function (pDistrictId, pAppliedFilter, pContactId
}
var colsInsert = [
- "DISTRICTCONTACTID",
- "CONTACT_ID",
- "DISTRICT_ID",
- "ADVISER_CONTACT_ID",
- "ADVISER_ROLE",
- "STATUS",
- "VALID_FROM",
- "VALID_UNTIL",
- "ORIGIN",
- "VISITFREQUENCY",
- "USER_NEW",
- "DATE_NEW"
+ "DISTRICTCONTACTID",
+ "CONTACT_ID",
+ "DISTRICT_ID",
+ "ADVISER_CONTACT_ID",
+ "ADVISER_ROLE",
+ "STATUS",
+ "VALID_FROM",
+ "VALID_UNTIL",
+ "ORIGIN",
+ "VISITFREQUENCY",
+ "USER_NEW",
+ "DATE_NEW"
];
var colsUpdate = [
- "STATUS",
- "USER_EDIT",
- "DATE_EDIT"
+ "STATUS",
+ "USER_EDIT",
+ "DATE_EDIT"
];
//create districtContact datasets
@@ -193,8 +197,8 @@ DistrictUtils.assignDistrict = function (pDistrictId, pAppliedFilter, pContactId
if(!pContactId)
{
arrExistingEntries = new SqlBuilder()
- .select(["DISTRICTCONTACT.DISTRICT_ID", "DISTRICTCONTACT.CONTACT_ID", "DISTRICTCONTACT.ADVISER_CONTACT_ID", "DISTRICTCONTACT.DISTRICTCONTACTID"
- , "DISTRICTCONTACT.STATUS", "DISTRICTCONTACT.ADVISER_ROLE", "DISTRICTCONTACT.VISITFREQUENCY", "DISTRICTCONTACT.VALID_FROM", "DISTRICTCONTACT.VALID_UNTIL"])
+ .select(["DISTRICTCONTACT.DISTRICT_ID", "DISTRICTCONTACT.CONTACT_ID", "DISTRICTCONTACT.ADVISER_CONTACT_ID", "DISTRICTCONTACT.DISTRICTCONTACTID",
+ "DISTRICTCONTACT.STATUS", "DISTRICTCONTACT.ADVISER_ROLE", "DISTRICTCONTACT.VISITFREQUENCY", "DISTRICTCONTACT.VALID_FROM", "DISTRICTCONTACT.VALID_UNTIL"])
.from("DISTRICTCONTACT")
.where("DISTRICTCONTACT.DISTRICT_ID", pDistrictId)
.and("DISTRICTCONTACT.ADVISER_CONTACT_ID", resContactId)
@@ -203,14 +207,17 @@ DistrictUtils.assignDistrict = function (pDistrictId, pAppliedFilter, pContactId
}
//create associative object so we don't have too loop trough an array to check wheter or not exisiting Entries already exist.
- for (var aee = 0; aee < arrExistingEntries.length; aee++) {
+ for (var aee = 0; aee < arrExistingEntries.length; aee++)
+ {
//existingEnriesObject[DISTRICT_ID + CONTACT_ID + ADVISER_CONTACT_ID] = [ID, STATUS]
- existingEnriesObject[ arrExistingEntries[aee][0] + arrExistingEntries[aee][1] + arrExistingEntries[aee][2] ] = {"districtContactId": arrExistingEntries[aee][3]
- , "status": arrExistingEntries[aee][4]
- , "role": arrExistingEntries[aee][5]
- , "visitFrequency" : arrExistingEntries[aee][6]
- , "vlaidFrom" : arrExistingEntries[aee][7]
- , "vlaidUntil" : arrExistingEntries[aee][8]};
+ existingEnriesObject[ arrExistingEntries[aee][0] + arrExistingEntries[aee][1] + arrExistingEntries[aee][2] ] = {
+ "districtContactId": arrExistingEntries[aee][3],
+ "status": arrExistingEntries[aee][4],
+ "role": arrExistingEntries[aee][5],
+ "visitFrequency": arrExistingEntries[aee][6],
+ "vlaidFrom": arrExistingEntries[aee][7],
+ "vlaidUntil": arrExistingEntries[aee][8]
+ };
}
for (var i = 0; i < arrOrgContactIds.length; i++)
@@ -219,26 +226,27 @@ DistrictUtils.assignDistrict = function (pDistrictId, pAppliedFilter, pContactId
//insert new assignments
var valsInsert = [
- util.getNewUUID(),
- arrOrgContactIds[i],
- pDistrictId,
- resContactId,
- resRole,
- newResStatus,
- resValidFrom,
- resValidUntil,
- $KeywordRegistry.districtOrigin$auto(), //origin
- resVisitFrequency,
- vars.get("$sys.user"),
- vars.get("$sys.date")
- ];
+ util.getNewUUID(),
+ arrOrgContactIds[i],
+ pDistrictId,
+ resContactId,
+ resRole,
+ newResStatus,
+ resValidFrom,
+ resValidUntil,
+ $KeywordRegistry.districtOrigin$auto(), //origin
+ resVisitFrequency,
+ vars.get("$sys.user"),
+ vars.get("$sys.date")
+ ];
//association = DISTRICT_ID + CONTACT_ID + ADVISER_CONTACT_ID
var existingEntryAssoz = pDistrictId + arrOrgContactIds[i] + arrResponsibleIds[j][0];
var checkexistingEntry = existingEnriesObject[existingEntryAssoz]; //existingEnriesObject[pDistrictId + arrOrgContactIds[i] + arrResponsibleIds[j][0]]
//check associative Array
- if (checkexistingEntry == undefined) { //insert missing entries
+ if (checkexistingEntry == undefined) //insert missing entries
+ {
newAssigned++
insertArray.push(["DISTRICTCONTACT", colsInsert, null, valsInsert]);
}
@@ -249,59 +257,73 @@ DistrictUtils.assignDistrict = function (pDistrictId, pAppliedFilter, pContactId
{
updated++;
updateStatements.push(newWhere("DISTRICTCONTACT.DISTRICTCONTACTID", checkexistingEntry["districtContactId"]).buildUpdateStatement({
- "ADVISER_ROLE": resRole,
- "STATUS": newResStatus,
- "VALID_FROM": resValidFrom,
- "VALID_UNTIL": resValidUntil,
- "VISITFREQUENCY": resVisitFrequency,
- "USER_EDIT": vars.get("$sys.user"),
- "DATE_EDIT": vars.get("$sys.date")
- })
- )
+ "ADVISER_ROLE": resRole,
+ "STATUS": newResStatus,
+ "VALID_FROM": resValidFrom,
+ "VALID_UNTIL": resValidUntil,
+ "VISITFREQUENCY": resVisitFrequency,
+ "USER_EDIT": vars.get("$sys.user"),
+ "DATE_EDIT": vars.get("$sys.date")
+ })
+ );
//delete from Object (we need to use association here) to sieve for invalid entries
delete existingEnriesObject[existingEntryAssoz];
}
- else if (checkexistingEntry != undefined){ //don't touch existing entries with valid status
+ else if (checkexistingEntry != undefined) //don't touch existing entries with valid status
+ {
unchanged++;
//delete from Object (we need to use association here) to sieve for invalid entries
delete existingEnriesObject[existingEntryAssoz];
- }
- }
+ }
+ }
//invalid entries (Assignments, that where already exisitng, but don't fit into said district because of changes -> set status to "In review")
- for (index in existingEnriesObject) {
+ for (index in existingEnriesObject)
+ {
invalid++;
existingEntryId = existingEnriesObject[index]["districtContactId"];
updateStatements.push(newWhere("DISTRICTCONTACT.DISTRICTCONTACTID", existingEntryId).buildUpdateStatement({
- "STATUS": $KeywordRegistry.contactStatus$inReview(),
- "USER_EDIT": vars.get("$sys.user"),
- "DATE_EDIT": vars.get("$sys.date")
- })
- )
+ "STATUS": $KeywordRegistry.contactStatus$inReview(),
+ "USER_EDIT": vars.get("$sys.user"),
+ "DATE_EDIT": vars.get("$sys.date")
+ })
+ );
}
-
+
var pageSize = 5000;//paging to prevent timeouts
-
+
while(insertArray.length > pageSize)
- {
+ {
db.inserts(insertArray.splice(0, pageSize), "Data_alias", 6 * datetime.ONE_MINUTE);
- }
+ }
db.inserts(insertArray);
while(updateStatements.length > pageSize)
{
db.execute(updateStatements.splice(0, pageSize), "Data_alias", 6 * datetime.ONE_MINUTE);
- }
+ }
db.execute(updateStatements);
- }
+ // notifications
+ var user = tools.getUserByAttribute(tools.CONTACTID, resContactId, tools.PROFILE_DEFAULT);
+ if(user)
+ {
+ var message = translate.text("Assignment to a new district/company!");
+ var description = translate.withArguments("You were assigned as new district contact to district %0 and %1 organisation(s).", [districtName, arrOrgContactIds.length]);
+ notification.addNotification(
+ util.getNewUUID(), text.encodeMS(["District", pDistrictId]), null, null, "DistrictAssigned",
+ notification.PRIO_NORMAL, 2, notification.STATE_UNSEEN, [user[tools.NAME]], message, description
+ );
+ }
+ }
+
return {
- newAssigned : newAssigned,
- invalid : invalid,
- unchanged : unchanged,
+ newAssigned: newAssigned,
+ invalid: invalid,
+ unchanged: unchanged,
updated: updated
- };
+ };
}
/**
@@ -447,31 +469,10 @@ DistrictUtils.setDistrictContactStatus = function (pArrIds, pStatus)
db.updates(updateArray);
}
-
-/**
- * This function will notificate the district contact that he/she was assigned
- *
- * @param {String} pDistrictContactId <p>
- * DistrictContact-ID of the new Dataset<br>
- * @return <none> <p>
+/*
+ * See DistrictChangeField_entity
*/
-DistrictUtils.notificateNewDistrictContact = function(pDistrictContactId){
- message = translate.text("Assignment to a new district/company!");
+DistrictChangeField = function() {}
- //[0]: DISTRICT_ID, [1]: ADVISER_CONTACT_ID, [2]: CONTACT_ID
- var arrayDistrictContact = DistrictUtils.getDataFromDistrictContact(pDistrictContactId);
- //get corresponding profile information of the systemalias
- var user = tools.getUserByAttribute(tools.CONTACTID, arrayDistrictContact[1], tools.PROFILE_DEFAULT);
-
- //You can only send a notification, if the user is an employee
- if (user)
- {
- var userName = user[tools.NAME];
- var districtName = DistrictUtils.getDistrictName(arrayDistrictContact[0]);
- var organisationName = ContactUtils.getFullTitleByContactId(arrayDistrictContact[2]);
- // Benachrichtigung am Ende der Zuordnungen
- description = translate.withArguments("You were assigned as new district contact to district %0 and organisation %1.",
- [districtName, organisationName]);
- notification.addNotification(util.getNewUUID(), text.encodeMS(["Organisation", arrayDistrictContact[2]]), null, null, "DistrictAssigned", notification.PRIO_NORMAL, 2, notification.STATE_UNSEEN, [userName], message, description);
- }
-}
+DistrictChangeField.autoadd = function(){return "DISTRICT_AUTOADD";};
+DistrictChangeField.parent = function(){return "PARENTDISTRICT_DISTRICTID";};
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 7700b24877d7f879d04e344f177d856fc09b1b77..f6af351bfa937adc769ba5ee92156b0a01ceb438 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -407,7 +407,7 @@ DocumentTemplate.getSelectedTemplate = function (pTemplateId, pDocumentUpload, p
else
template = new DocumentTemplate(null, pDefaultType || DocumentTemplate.types.TXT, null, true);
- if (pEditedContent)
+ if (pEditedContent || (!pTemplateId && !pDocumentUpload.isFilled()))
{
if (template.type == DocumentTemplate.types.EML || template.type == DocumentTemplate.types.HTML)
pEditedContent = "<html>" + pEditedContent + "</html>";
diff --git a/process/Document_lib/process.js b/process/Document_lib/process.js
index bf9a2ba925aded0949cd372c045c5c343e44673f..4b84aea61c1b51641cc75b07151282ba15ce5acb 100644
--- a/process/Document_lib/process.js
+++ b/process/Document_lib/process.js
@@ -1,3 +1,4 @@
+import("ZippingUtil_lib");
import("Context_lib");
import("system.util");
import("system.translate");
@@ -38,6 +39,7 @@ DocumentUtil.downloadSelectedDocuments = function(pAssignmentName) {
var fileNames = rows.map(function(value) {
return value["NAME"];
});
+ fileNames = ZippingUtil.renameDuplicateFilenamesForZip(fileNames);
neon.downloadToZip(translate.text("Files") + ".zip", binaryContents, fileNames);
}
else if(pAssignmentName == "ERRORLOG")
diff --git a/process/DocxTemplater_lib/process.js b/process/DocxTemplater_lib/process.js
index 9fecd012b74882f6e972df34ea7fbc7156eb5b34..553140cb4f044f4e7919d6c598cd0e03a8aac784 100644
--- a/process/DocxTemplater_lib/process.js
+++ b/process/DocxTemplater_lib/process.js
@@ -10106,10 +10106,10 @@ function tagMatcher(content, textMatchArray, othersMatchArray) {
var tagText = content.slice(offset, cursor + 1);
var _getTag = getTag(tagText),
- tag = _getTag.tag,
+ tagName = _getTag.tag,
position = _getTag.position;
- var text1 = allMatches[tag];
+ var text1 = allMatches[tagName];
if (text1 == null) {
continue;
}
@@ -10387,11 +10387,11 @@ function throwUnmatchedLoopException(options) {
var T = location === "start" ? "Unclosed" : "Unopened";
var err = new Errors.XTTemplateError(T + " loop");
- var tag = options.part.value;
+ var tagName = options.part.value;
err.properties = {
id: t + "_loop",
- explanation: "The loop with tag " + tag + " is " + t,
- xtag: tag
+ explanation: "The loop with tag " + tagName + " is " + t,
+ xtag: tagName
};
throw err;
}
@@ -10578,10 +10578,10 @@ var wrapper = require("../module-wrapper");
function throwRawTagShouldBeOnlyTextInParagraph(options) {
var err = new Errors.XTTemplateError("Raw tag should be the only text in paragraph");
- var tag = options.part.value;
+ var tagName = options.part.value;
err.properties = {
id: "raw_xml_tag_should_be_only_text_in_paragraph",
- explanation: "The tag " + tag,
+ explanation: "The tag " + tagName,
xtag: options.part.value,
paragraphParts: options.paragraphParts
};
@@ -10979,12 +10979,12 @@ var Errors = require("./errors");
function throwRawTagNotInParagraph(options) {
var err = new Errors.XTTemplateError("Raw tag not in paragraph");
- var tag = options.part.value;
+ var tagName = options.part.value;
err.properties = {
id: "raw_tag_outerxml_invalid",
- explanation: "The tag \"" + tag + "\"",
+ explanation: "The tag \"" + tagName + "\"",
rootError: options.rootError,
- xtag: tag,
+ xtag: tagName,
postparsed: options.postparsed,
expandTo: options.expandTo,
index: options.index
@@ -11020,17 +11020,17 @@ function getListXmlElements(parts) {
var res = [];
- for (var i = 0, tag; i < tags.length; i++) {
- tag = tags[i];
+ for (var i = 0, tagName; i < tags.length; i++) {
+ tagName = tags[i];
// closing tag
- if (tag[1] === "/") {
- if (lastTagIsOpenTag(res, tag)) {
+ if (tagName[1] === "/") {
+ if (lastTagIsOpenTag(res, tagName)) {
res.pop();
} else {
- res = addTag(res, tag);
+ res = addTag(res, tagName);
}
- } else if (tag[tag.length - 1] !== "/") {
- res = addTag(res, tag);
+ } else if (tagName[tagName.length - 1] !== "/") {
+ res = addTag(res, tagName);
}
}
return res;
diff --git a/process/DuplicateMerge_lib/process.js b/process/DuplicateMerge_lib/process.js
index ea3200222f529a8db70ef7330891eebcdccda75a..c345d0ecf45783b6a7326e85a72c35e7bc56f503 100644
--- a/process/DuplicateMerge_lib/process.js
+++ b/process/DuplicateMerge_lib/process.js
@@ -76,8 +76,7 @@ DuplicateMergeUtils.mergeContext = function(pContext, pSourceContactId, pTargetC
*/
DuplicateMergeUtils.mergePerson = function(pSourceContactId, pTargetContactId)
{
- //@Workaround @TODO because COMMUNICATION.OBJECT_TYPE is not right -> has to be "Person"
- var pObjectType = "Contact";
+ var pObjectType = "Person";
var sourcePersonId = newSelect("PERSON_ID")
.from("CONTACT")
@@ -118,8 +117,7 @@ DuplicateMergeUtils.mergePerson = function(pSourceContactId, pTargetContactId)
DuplicateMergeUtils.mergeOrganisation = function(pSourceContactId, pTargetContactId)
{
- //@Workaround @TODO because COMMUNICATION.OBJECT_TYPE is not right -> has to be "Organisation"
- var pObjectType = "Contact";
+ var pObjectType = "Organisation";
var sourceOrganisationId = newSelect("ORGANISATION_ID")
.from("CONTACT")
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index 1988968dd95830ffe22b8f90287cb5c6b7528c28..e70f94f853382c39a8c45b92380ac42ce0da7311 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -40,7 +40,9 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
pEmailFilename, pAdditionalPlaceholders)
{
if (pToRecipients && typeof(pToRecipients) == "string")
+ {
pToRecipients = [pToRecipients];
+ }
var email, retVal, isBinaryExistent;
isBinaryExistent = db.getBinaryCount("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, SqlUtils.getBinariesAlias(), null);
@@ -49,7 +51,9 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
{
email = Email.fromTemplate(pTemplateId, pRecipientContactId, pBindata, pAdditionalPlaceholders);
if (!email)
+ {
email = new Email();
+ }
}
else
{
@@ -58,8 +62,10 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
email.setSender(pSenderContactId);
- if (pToRecipients)
+ if (pToRecipients)
+ {
email.toRecipients = pToRecipients;
+ }
email.bccRecipients = [EmailWritingUtils.getMailbridgeAddress()];
@@ -68,8 +74,10 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
for (var i = 0; i < pAttachments.length; i++)
{
if (pAttachments[i] != null || pAttachments[i] != "")
- email.attachmentTemplates[i] = pAttachments[i];
- }
+ {
+ email.attachmentTemplates.push(pAttachments[i]);
+ }
+ }
}
if (pSubject)
diff --git a/process/EwsClientSync_lib/process.js b/process/EwsClientSync_lib/process.js
index f0f5cbfb59be4cd541d737624b9b3632b435e664..0fe43af79e9dd8228b13ad361e58bd97927c8590 100644
--- a/process/EwsClientSync_lib/process.js
+++ b/process/EwsClientSync_lib/process.js
@@ -1,3 +1,4 @@
+import("system.tag");
import("system.neonFilter");
import("system.neon");
import("Util_lib");
@@ -9,7 +10,6 @@ import("system.vars");
import("system.datetime");
import("system.util");
import("system.tools");
-import("system.favorite");
import("system.logging");
import("Sql_lib");
import("system.db");
@@ -191,7 +191,7 @@ EwsClientSyncUtils.setContactToSync = function(pTableName, pDataSetID, pDate){
.union(newSelect("CONTACT.CONTACTID").from("CONTACT").where("CONTACT.ADDRESS_ID", pDataSetID)).arrayColumn();
break;
case "COMMUNICATION":
- affectedIDs = newSelect("COMMUNICATION.OBJECT_ROWID").from("COMMUNICATION").where("COMMUNICATION.COMMUNICATIONID", pDataSetID).and("COMMUNICATION.OBJECT_TYPE", "Contact").arrayColumn();
+ affectedIDs = newSelect("COMMUNICATION.OBJECT_ROWID").from("COMMUNICATION").where("COMMUNICATION.COMMUNICATIONID", pDataSetID).arrayColumn();
break;
}
@@ -276,12 +276,12 @@ EwsClientSyncUtils.removeFromFavorite = function(pToDelete, pUserId ){
//maybe in a future version there will be a way to remove favorites on a better way
//all ews related Favorites for the user
- var config = favorite.createGetFavoritesConfig()
+ var config = tag.createGetTaggedObjectsConfig()
.setFavoriteGroupTitle(EwsClientSyncUtils.EWSSYNCTAG())
- .setGroupType(favorite.FAVORITE_GROUP).setObjectType("Person")
+ .setGroupType(tag.FAVORITE_GROUP).setObjectType("Person")
.setUserId(pUserId);
- var ewsFavorite = favorite.getFavorites(config);
+ var ewsFavorite = tag.getTaggedObjects(config);
var favsToDelete = [];
var dataIndex = {
@@ -310,9 +310,9 @@ EwsClientSyncUtils.removeFromFavorite = function(pToDelete, pUserId ){
favsToDelete.push(row["id"]);
}
- var delConfig = favorite.createRemoveMultipleByIdConfig().setFavoriteRecordIds(favsToDelete);
+ var delConfig = tag.createUntagMultipleByIdConfig().setFavoriteRecordIds(favsToDelete);
- return favorite.remove(delConfig);
+ return tag.untag(delConfig);
}
/*
@@ -323,15 +323,15 @@ EwsClientSyncUtils.removeFromFavorite = function(pToDelete, pUserId ){
EwsClientSyncUtils.addToEwsFavorite = function(pToInsert){
var userID = tools.getCurrentUser()[tools.NAME]
- var config = favorite.createAddFavoriteConfig();
+ var config = tag.createAddTagConfig();
config.setFavoriteGroupTitle(EwsClientSyncUtils.EWSSYNCTAG());
config.setObjectType("Person");
config.setUserId(userID);
- config.setGroupType(favorite.FAVORITE_GROUP)
+ config.setGroupType(tag.FAVORITE_GROUP)
for(let i = 0, l = pToInsert.length; i < l; i++){
config.setRowId(pToInsert[i]);
- favorite.add(config);
+ tag.add(config);
}
}
diff --git a/process/ExportTemplate_lib/process.js b/process/ExportTemplate_lib/process.js
index 0c7b4b920559b8d3a088c8e5b4dd3e13e3ae0019..9160964a0ff254f2f8c585112010e9703eb95d64 100644
--- a/process/ExportTemplate_lib/process.js
+++ b/process/ExportTemplate_lib/process.js
@@ -485,8 +485,10 @@ ExportTemplateUtils.addParticipants = function (pSelection, pSourceTableName)
ExportTemplateUtils.excludedFields = function ()
{
return {
+ "Person_entity" : ["Information"],
"Offer_entity":["OFFER_ID"],
- "Offeritem_entity":["ASSIGNEDTO", "ITEMSORT", "OFFER_ID"]
+ "Offeritem_entity":["ASSIGNEDTO", "ITEMSORT", "OFFER_ID"],
+ "Organisation_entity" : ["Information"]
};
}
diff --git a/process/Favorites_lib/process.js b/process/Favorites_lib/process.js
index 151f9b73a6ceb930b44921b17decd4caa2e6b42d..c44f97e496a4f8bbe8469e31010e166017f472ad 100644
--- a/process/Favorites_lib/process.js
+++ b/process/Favorites_lib/process.js
@@ -1,6 +1,6 @@
+import("system.tag");
import("system.translate");
import("system.vars");
-import("system.favorite");
import("system.tools");
import("system.result");
import("Sql_lib");
@@ -10,7 +10,7 @@ function FavoritesUtil(){}
FavoritesUtil.getUserFavoriteGroups = function()
{
var allTypes = [];
- var alias = favorite.getFavoritesAlias();
+ var alias = tag.getTagAlias();
var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()["name"], null, null, alias);
@@ -57,7 +57,7 @@ FavoritesUtil.getFilterDisplayCondition = function(pObjecttype, pOperator, pRawv
*/
FavoritesUtil.getRowIdsOfFavorites = function(pObjecttype, pOperator, pRawvalue)
{
- var sysAlias = favorite.getFavoritesAlias();
+ var sysAlias = tag.getTagAlias();
var op = "";
if(pOperator == "1")
@@ -85,7 +85,7 @@ FavoritesUtil.getRowIdsOfFavorites = function(pObjecttype, pOperator, pRawvalue)
FavoritesUtil.getUserFavoriteGroupsByContext = function(pContext)
{
var allTypes = [];
- var alias = favorite.getFavoritesAlias();
+ var alias = tag.getTagAlias();
var filterCond = newWhere("ASYS_RECORDGROUP.USER_ID", tools.getCurrentUser()[tools.NAME], null, null, alias);
diff --git a/process/FileUtil_lib/FileUtil_lib.aod b/process/FileUtil_lib/FileUtil_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..a32531311b3d57d1ae3da5981ba76bd3a1c43fbb
--- /dev/null
+++ b/process/FileUtil_lib/FileUtil_lib.aod
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>FileUtil_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/FileUtil_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/FileUtil_lib/process.js b/process/FileUtil_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..52627abc975976a6b831787d0060a21c633211cb
--- /dev/null
+++ b/process/FileUtil_lib/process.js
@@ -0,0 +1,34 @@
+import("system.fileIO");
+
+/**
+ * functions for files
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function FileUtils () {}
+
+/**
+ * deletes a folder.
+ * @param {String} pPath location of the folder
+ */
+FileUtils.removeFolder = function(pPath)
+{
+ if (!fileIO.isDirectory(pPath))
+ {
+ return;
+ }
+ fileIO.listFiles(pPath).forEach(function (pFileOrFolder)
+ {
+ var newPath = pPath+"/"+pFileOrFolder;
+ if(fileIO.isDirectory(newPath))
+ {
+ FileUtils.removeFolder(newPath);
+ }
+ else
+ {
+ fileIO.remove(newPath);
+ }
+ });
+ fileIO.remove(pPath);
+}
\ No newline at end of file
diff --git a/process/FilterViewAction_lib/process.js b/process/FilterViewAction_lib/process.js
index f79e4d3d548b181bf63dd9098ca8584d5db05c81..2ceb9bfc1fe2fdb55cc77020ed1fed08a79ed32a 100644
--- a/process/FilterViewAction_lib/process.js
+++ b/process/FilterViewAction_lib/process.js
@@ -71,12 +71,12 @@ FilterViewActionUtils.getUidsByEntityFilter = function (pContext, pFilter, pPara
.entity(ContextUtils.getEntity(pContext))
.fields(["#UID"]);
- if (Utils.isNullOrEmpty(pFilter.filter))
+ if (!Utils.isNullOrEmpty(pFilter.filter))
{
loadRowsConfig.filter(JSON.stringify(pFilter.filter));
}
- if(Utils.isNullOrEmpty(pParameters))
+ if(!Utils.isNullOrEmpty(pParameters))
{
Object.keys(pParameters).forEach(function(key){
loadRowsConfig.addParameter(key, pParameters[key])
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 845b08db27cebc5aaf9b4e03667d6b175521ed9b..81c5617dcaf7a58b99ba847c4a8b0f52a9e5dcd0 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -219,6 +219,7 @@ $KeywordRegistry.documentTemplateType$letter = function(){return "LET";};
$KeywordRegistry.documentTemplateType$textModular = function(){return "TEX";};
$KeywordRegistry.documentTemplateType$mail = function(){return "MAI";};
$KeywordRegistry.documentTemplateType$attachment = function(){return "ATT";};
+$KeywordRegistry.documentTemplateType$download = function(){return "DOWNLOAD";};
$KeywordRegistry.documentTemplateType$signature = function(){return "SIGNATURE";};
$KeywordRegistry.documentTemplateType$replymail = function(){return "REPLY_MAIL";};
@@ -291,6 +292,7 @@ $KeywordRegistry.bulkMailStatus$beingSent = function(){return "BULKMAILBEINGSENT
$KeywordRegistry.bulkMailStatus$sent = function(){return "BULKMAILSENT";};
$KeywordRegistry.bulkMailStatus$planned = function(){return "BULKMAILPLANNED";};
$KeywordRegistry.bulkMailStatus$missed = function(){return "BULKMAILMISSED";};
+$KeywordRegistry.bulkMailStatus$adHoc = function(){return "BULKMAILADHOC";};
$KeywordRegistry.serialLetterStatus = function(){return "SerialLetterStatus";};
$KeywordRegistry.serialLetterStatus$notSent = function(){return "SERIALLETTERNOTSENT";};
@@ -424,6 +426,7 @@ $KeywordRegistry.inboxFilterComponent = function(){return "InboxFilterComponent"
$KeywordRegistry.inboxFilterComponent$body = function(){return "BODY";};
$KeywordRegistry.inboxFilterComponent$subject = function(){return "SUBJECT";};
$KeywordRegistry.inboxFilterComponent$sender = function(){return "SENDER";};
+$KeywordRegistry.inboxFilterComponent$subject_body = function(){return "SUBJECT_BODY";};
$KeywordRegistry.inboxFilterTarget = function(){return "InboxFilterTarget";};
$KeywordRegistry.inboxFilterTarget$category = function(){return "CATEGORY";};
@@ -523,6 +526,8 @@ $KeywordRegistry.linkEvaluationType$default = function(){return "LINKEVALUATION_
$KeywordRegistry.linkEvaluationType$ignore = function(){return "LINKEVALUATION_IGNORE";};
$KeywordRegistry.linkEvaluationType$unsubscribe = function(){return "LINKEVALUATION_UNSUBSCRIBE";};
-$KeywordRegistry.mosaicoBaseTemplate = function(){return "MosaicoBaseTemplate";};
+$KeywordRegistry.bulkMailSenderAddress = function() {return "BulkmailSenderAddress";};
+$KeywordRegistry.mosaicoBaseTemplate = function(){return "MosaicoBaseTemplate";};
+$KeywordRegistry.mosaicoColor = function(){return "MosaicoColor";};
$KeywordRegistry.mosaicoTemplateCategory = function(){return "MosaicoTemplateCategory";};
\ No newline at end of file
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 85e06f008c9b38cdd40cf7b1387e623e47d446c3..eaaae894c0d1cedabc8f49f28aa3bba3ad39f91e 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -343,16 +343,15 @@ KeywordUtils.getFirst = function(pContainerName, pLocale)
*/
KeywordUtils.getTranslatedContainer = function(pContainerName)
{
- switch (pContainerName)
+ switch(pContainerName)
{
case "SalesprojectPhase":
return translate.text("Phase");
case "SalesprojectState":
return translate.text("State");
default:
- return "Please add '" + pContainerName + "' to the switch case in Salesproject_lib";
+ return "Please add '" + pContainerName + "' to the switch case in Keyword_lib";
}
-
}
/**
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index f92149a9377ecbc47ea11108097e9d441d3f71d2..cf97886af5a4a72f917842d0c628d8eb44f8cad5 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -502,7 +502,7 @@ LeadImportUtils.insertComm = function(pDataFields, pDataTypes, pLeadValues, cont
for (let i = 0; i < Fields.length; i++) DataValues[Fields[i]] = "";
DataValues["OBJECT_ROWID"] = contactId;
- DataValues["OBJECT_TYPE"] = "Contact";
+ DataValues["OBJECT_TYPE"] = pObjectID;
for (let i = 0; i < commMedium.length; i++)
{
@@ -936,7 +936,7 @@ LeadImportUtils.scanLeadDups = function(pAllContactData)
updDupVals = [dupStatus];
- toUpdate.push([dupUpdateLeadTable, ["DUPSTATUS"], null, updDupVals, newWhere([dupUpdateLeadTable, "LEADID"], leadID).build()]);
+ toUpdate.push([dupUpdateLeadTable, ["DUPSTATUS"], null, updDupVals, newWhere([dupUpdateLeadTable, "LEADSID"], leadID).build()]);
}
db.updates(toUpdate);//update Leads with the new status
}
diff --git a/process/Location_lib/process.js b/process/Location_lib/process.js
index 98a3aba621804153d9911ff1d69466de95863e25..21069bc5eac24193cecdea6e8891e457d6db313d 100644
--- a/process/Location_lib/process.js
+++ b/process/Location_lib/process.js
@@ -295,8 +295,8 @@ LocationFinder.prototype.getGeoLocation = function (pAddress)
* Update LAT, LON and VALIDATION of the given Addresses
* This function is call-by-reference and the errors of the updates will be returned by pMalformedAddressData.
*
- * @param {pMalformedAddressData} to collect the errors of the updates
- * @param {pAddresses} pAddress an object containing the address data
+ * @param {Array} pMalformedAddressData to collect the errors of the updates
+ * @param {Array} pAddresses an object containing the address data
*
* @return {void}
*/
diff --git a/process/Loghistory_lib/process.js b/process/Loghistory_lib/process.js
index 03c42abab2aedf2bf54e2a89bc904e35ededeaab..99a4e42755aa52ed8bb2aa155ec88cff135efe8a 100644
--- a/process/Loghistory_lib/process.js
+++ b/process/Loghistory_lib/process.js
@@ -541,7 +541,7 @@ AuditUpdateSyncEntries.prototype.execute = function()
switch (this.sqlAction + "-" + this.table)
{
case "U-CONTACT":
- subSQL = this.idValue;
+ subSQL = [this.idValue];
break;
case "U-PERSON":
subSQL = newSelect("CONTACT.CONTACTID").from("CONTACT").where("CONTACT.PERSON_ID", this.idValue);
@@ -555,7 +555,7 @@ AuditUpdateSyncEntries.prototype.execute = function()
check = subSQL.arrayColumn().length > 0;
break;
case "D-ADDRESS":
- subSQL = this.oldValues[this.columns.indexOf("CONTACT_ID")];
+ subSQL = [this.oldValues[this.columns.indexOf("CONTACT_ID")]];
break;
case "I-COMMUNICATION":
case "U-COMMUNICATION":
@@ -563,11 +563,14 @@ AuditUpdateSyncEntries.prototype.execute = function()
check = subSQL.arrayColumn().length > 0;
break;
case "D-COMMUNICATION":
- subSQL = this.oldValues[this.columns.indexOf("CONTACT_ID")];
+ subSQL = [this.oldValues[this.columns.indexOf("CONTACT_ID")]];
+ break;
+ default:
+ check = false;
break;
}
- if(check)
+ if(check && !Utils.isNullOrEmpty(subSQL))
{
newWhere("AB_SYNCCONTACT.CONTACT_ID", subSQL, SqlBuilder.IN())
.updateData(true, "AB_SYNCCONTACT", ["DATE_EDIT", "UPDATECONTACT"] , null, [vars.getString("$sys.date"), '1'], datetime.ONE_MINUTE * 5);
diff --git a/process/MosaicoTemplate_lib/process.js b/process/MosaicoTemplate_lib/process.js
index 849855de8a1626632e7cd732482b5a69155b2b12..e967d3efa6add0372fb1d566469e3d30de308da0 100644
--- a/process/MosaicoTemplate_lib/process.js
+++ b/process/MosaicoTemplate_lib/process.js
@@ -24,8 +24,9 @@ function MosaicoUtils () {}
*/
MosaicoUtils.openInMosaico = function (pMosaicoTemplateId)
{
- var baseurl = project.getPreferenceValue("custom.mosaico.url");
-
+ var defaultUrl = vars.get("$sys.origin").replace("https://","https://mosaico.");
+ var baseurl = project.getInstanceConfigValue("custom.mosaico.url",defaultUrl);
+
var aditoWebserviceBaseUrl = vars.get("$sys.origin");
var baseTemplate = newSelect("BASETEMPLATE")
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index 4d6198b15fc4ff2e09e8ba9806b9578ba988fce8..8a32f66427dab379e8eb468d58d36afc3a06b3d3 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -355,7 +355,8 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
//recursive function for building item insert statements
function __itemInsertStatement(partsListObj, assignedTo, currency, contactId) {
- for (var i = 0; i < partsListObj.ids.length; i++) {
+ for (var i = 0; i < partsListObj.ids.length; i++)
+ {
var newid = util.getNewUUID();
self._appendNode(newid, assignedTo);
var pos = self.ItemTree[newid].pos;
@@ -384,7 +385,6 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
priceObject[newid]["vat"] = vat;
priceObject[newid]["quantity"] = P2pObject["quantity"];
}
-
}
else if(pSumUpPrices)//also build priceObject if pSumUpPrices is set to true
{
@@ -397,16 +397,19 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
treeStructure = ItemUtils.buildTreeStructure(treeStructure, assignedTo, newid);
}
- var vals = [newid
- , self.offerOrderId
- , prodid
- , ProductDetails.groupCode
- , assignedTo
- , ProductDetails.productName
- , ProductDetails.unit
- , price
- , vat == null || vat == undefined || vat == "" ? 0 : vat
- , P2pObject.quantity];
+ var vals = [
+ newid,
+ self.offerOrderId,
+ prodid,
+ ProductDetails.groupCode,
+ assignedTo,
+ ProductDetails.productName,
+ ProductDetails.unit,
+ price,
+ vat == null || vat == undefined || vat == "" ? 0 : vat,
+ P2pObject.quantity,
+ "0"
+ ];
if(_optionalIsIncluded(columns) == true)//add optional if needed
@@ -933,4 +936,4 @@ ItemUtils.getNode = function (pObject, pName, pCurrName){
return res;
}
return null;
- }
\ No newline at end of file
+ }
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index ca4ef4820c50a97f1cb15d6d6abaf2fe4ebdd727..92c23cc653fb4f72d64a480d888f238b70d145be 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -151,8 +151,8 @@ OfferUtils.buildOfferReport = function (pOfferID, pExclDiscountGroupcodes)
"LETTERSALUTATION", // 15
"DISCOUNT",
"NET",
- "DISCOUNTED_NET",
- "DISCOUNTED_VAT"
+ "OFFER.NET - OFFER.NET * OFFER.DISCOUNT / 100",
+ "OFFER.VAT - OFFER.VAT * OFFER.DISCOUNT / 100"
];
var offerData = newSelect(offerFields)
@@ -234,14 +234,17 @@ OfferUtils.buildOfferReport = function (pOfferID, pExclDiscountGroupcodes)
offeritemData = offeritemData.map(function (offeritem)
{
- if(offeritem[4] != "1")
+ if (!offeritem[5].includes(".")) //only if it's no child
{
//quantity * price
fullPrice = eMath.mulDec(parseFloat(offeritem[9]), parseFloat(offeritem[10])); //price without discount
//itemSum = (fullPrice * (100 - discount)) / 100
itemSum = eMath.roundDec(eMath.divDec(eMath.mulDec(fullPrice, eMath.subDec(100, offeritem[11])), 100), 2, eMath.ROUND_HALF_EVEN); //sum of the item (with discount)
+ if(!Utils.toBoolean(parseInt(offeritem[4])))//is optional
+ {
sumItemSum += itemSum; //total sum (without vat)
+ }
let excluded = -1
if(pExclDiscountGroupcodes)
@@ -262,7 +265,7 @@ OfferUtils.buildOfferReport = function (pOfferID, pExclDiscountGroupcodes)
if(offeritem[12] > 0)
{
- sums.push([offeritem[12], vatsum]); //MWSteuerwerte für Map vorbereiten
+ sums.push([offeritem[12], vatsum]); //Prepare VAT for map
}
}
@@ -277,6 +280,14 @@ OfferUtils.buildOfferReport = function (pOfferID, pExclDiscountGroupcodes)
printDiscount = true;
}
+ if(!isNaN(itemSum))
+ {
+ itemSum = text.formatDouble(itemSum, "#,##0.00", true)
+ }
+ if(Utils.toBoolean(parseInt(offeritem[4])))//is optional
+ {
+ itemSum = "(" + itemSum + ")";
+ }
return [
offerData[6], //currency
offerData[7], //offerdate
@@ -295,7 +306,7 @@ OfferUtils.buildOfferReport = function (pOfferID, pExclDiscountGroupcodes)
offerData[10], //versnr
offerData[5], //offercode
text.formatDouble(offeritem[12], "#,##0.00", true), //vat
- text.formatDouble(itemSum, "#,##0.00", true), //itemsum
+ itemSum, //itemsum
KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), offeritem[8]), //unittext
discValue,
offerData[18],
@@ -452,25 +463,12 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId, pDiscount)
//update order price
var [netPrice, vat] = oiUtils.getNetAndVat();
- var discountedVals = OfferItemUtils.getDiscountedNet(null, pSourceOfferId, pDiscount);
-
- if(discountedVals){
- newWhere("OFFER.OFFERID", pTargetOfferId)
- .updateFields({
- "NET": netPrice,
- "VAT": vat,
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else{
newWhere("OFFER.OFFERID", pTargetOfferId)
.updateFields({
"NET": netPrice,
"VAT": vat
});
}
-}
/**
* opens an order in NEW mode with values from an offer
@@ -595,19 +593,22 @@ OfferItemUtils.prototype.roundPrice = function(pPrice) {
OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId, pLanguage, pQuantity, pSumUpPrices, pOfferId, pSumUpTopPrice) {
this.initItemTree();
- var cols = ["OFFERITEMID"
- , "OFFER_ID"
- , "PRODUCT_ID"
- , "GROUPCODEID"
- , "ASSIGNEDTO"
- , "ITEMNAME"
- , "UNIT"
- , "PRICE"
- , "VAT"
- , "QUANTITY"
- , "OPTIONAL"
- , "ITEMPOSITION"
- , "ITEMSORT"];
+ var cols = [
+ "OFFERITEMID",
+ "OFFER_ID",
+ "PRODUCT_ID",
+ "GROUPCODEID",
+ "ASSIGNEDTO",
+ "ITEMNAME",
+ "UNIT",
+ "PRICE",
+ "VAT",
+ "QUANTITY",
+ "DISCOUNT",
+ "OPTIONAL",
+ "ITEMPOSITION",
+ "ITEMSORT"
+ ];
return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, [[["info", "INFO"], ["info",
"( " + newSelect("DESCRIPTION")
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 6ba4f050722ec99ce71142b31baf278b86a37db3..62868bfff12a1e69d4233f205a97132279fb6cac 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -198,25 +198,11 @@ OrderUtils.copyOfferItemsToOrder = function (pSourceOfferId, pOrderId, pDiscount
var oiUtils = new OrderItemUtils(pOrderId);
//update order price
var [netPrice, vat] = oiUtils.getNetAndVat();
- var discountedVals = OrderItemUtils.getDiscountedNet(null, pOrderId, pDiscount);
-
- if(discountedVals){
- newWhere("SALESORDER.SALESORDERID", pOrderId)
- .updateFields({
- "NET": netPrice,
- "VAT": vat,
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else
- {
- newWhere("SALESORDER.SALESORDERID", pTargetOfferId)
- .updateFields({
- "NET": netPrice,
- "VAT": vat
- });
- }
+ newWhere("SALESORDER.SALESORDERID", pTargetOfferId)
+ .updateFields({
+ "NET": netPrice,
+ "VAT": vat
+ });
}
/**
@@ -242,26 +228,11 @@ OrderUtils.copyOrderItems = function (pSourceOrderId, pTargetOrderId, pDiscount)
//update order price
var [netPrice, vat] = oiUtils.getNetAndVat();
- var discountedVals = OrderItemUtils.getDiscountedNet(null, pSourceOrderId, pDiscount);
-
- if(discountedVals){
- newWhere("SALESORDER.SALESORDERID", pTargetOrderId)
- .updateFields({
- "NET": netPrice,
- "VAT": vat,
- "DISCOUNTED_NET": discountedVals[0],
- "DISCOUNTED_VAT": discountedVals[1]
- });
- }
- else
- {
- newWhere("SALESORDER.SALESORDERID", pTargetOfferId)
- .updateFields({
- "NET": netPrice,
- "VAT": vat
- });
- }
-
+ newWhere("SALESORDER.SALESORDERID", pTargetOfferId)
+ .updateFields({
+ "NET": netPrice,
+ "VAT": vat
+ });
}
/**
@@ -404,7 +375,7 @@ OrderUtils.buildOrderReport = function (pOrderID)
"PaymentConditions" : translate.text("Conditions of payment", language),
"Articledescription" : translate.text("Article Description", language),
"DeliveryConditions" : translate.text("Deliveryspecification", language),
- "OrderType" : KeywordUtils.getViewValue($KeywordRegistry.orderType(), orderData[15]),
+ "OrderType" : KeywordUtils.getViewValue($KeywordRegistry.orderType(), orderData[14]),
"Articlenumber" : translate.text("Article Number", language),
"SALESORDERAddr" : translate.text(orderData[0].trim(), language),
"zzglUMST" : translate.text("Plus Salestax", language),
@@ -501,15 +472,15 @@ OrderUtils.buildReminderReport = function (pOrderID)
"HEADER", //8
"VAT",
sqlUtil.isNull("SALESORDERCODE", "0"),
- "OBJECT_TYPE", //12
- "OBJECT_ROWID", //13
- "FOOTER", //14
- "ORDERTYPE", // 15
- "PAID", //16
- "NET", //17
- "DUNNINGDATE", //18
- "DUNNINGLEVEL",//19
- "DUNNINGTEXT" //20
+ "OBJECT_TYPE", //11
+ "OBJECT_ROWID", //12
+ "FOOTER", //13
+ "ORDERTYPE", // 14
+ "PAID", //15
+ "NET", //16
+ "DUNNINGDATE", //17
+ "DUNNINGLEVEL",//18
+ "DUNNINGTEXT" //19
];
var orderData = newSelect(orderFields)
@@ -734,18 +705,21 @@ OrderItemUtils.prototype.roundPrice = function(pPrice) {
OrderItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId, pQuantity, pSumUpPrices, pOrderId, pSumUpTopPrice) {
this.initItemTree();
- var cols = ["SALESORDERITEMID"
- , "SALESORDER_ID"
- , "PRODUCT_ID"
- , "GROUPCODEID"
- , "ASSIGNEDTO"
- , "ITEMNAME"
- , "UNIT"
- , "PRICE"
- , "VAT"
- , "QUANTITY"
- , "ITEMPOSITION"
- , "ITEMSORT"];
+ var cols = [
+ "SALESORDERITEMID",
+ "SALESORDER_ID",
+ "PRODUCT_ID",
+ "GROUPCODEID",
+ "ASSIGNEDTO",
+ "ITEMNAME",
+ "UNIT",
+ "PRICE",
+ "VAT",
+ "QUANTITY",
+ "DISCOUNT",
+ "ITEMPOSITION",
+ "ITEMSORT"
+ ];
return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, undefined, pQuantity, pSumUpPrices, "Order", pOrderId, pAssignedTo, pSumUpTopPrice, true]);
}
@@ -797,67 +771,8 @@ OrderItemUtils.updateOrderNet = function(pOrderId, pDiscount)
{
var oiUtils = new OrderItemUtils(pOrderId);
var vals = oiUtils.getNetAndVat();
- var discountedVals = OrderItemUtils.getDiscountedNet(null, pOrderId, pDiscount);
- if(discountedVals)
- {
- newWhere("SALESORDER.SALESORDERID", pOrderId).updateFields({
- NET: vals[0], VAT: vals[1],
- DISCOUNTED_NET: discountedVals[0],
- DISCOUNTED_VAT: discountedVals[1]
- });
- }
-}
-
-OrderItemUtils.getDiscountedNet = function(pExcludedIs, pOrderId, pDiscount, pExcludedProductgroups){
- pDiscount = pDiscount || 0;
- var ret;
- var sum = 0;
- var sumExcluded = 0;
- var vat = 0;
- var vatExcluded = 0;
- if(pOrderId){
- var orderitemData = newSelect("QUANTITY, PRICE, DISCOUNT, VAT")
- .from("SALESORDERITEM")
- .where("SALESORDERITEM.SALESORDER_ID", pOrderId)
- .andIfSet("SALESORDERITEM.GROUPCODEID", pExcludedProductgroups, SqlBuilder.NOT_IN())
- .andIfSet("SALESORDERITEM.SALESORDERITEMID", pExcludedIs, SqlBuilder.NOT_IN())
- .table();
-
- for (var i = 0; i < orderitemData.length; i++)
- {
- sum = eMath.addDec(sum, ItemUtils.prototype.getItemSum(orderitemData[i][0], orderitemData[i][1], orderitemData[i][2]));
- vat = eMath.addDec(vat, ItemUtils.prototype.getItemVAT(orderitemData[i][0], orderitemData[i][1], orderitemData[i][2], orderitemData[i][3]));
- }
-
- sum = eMath.subDec(sum, eMath.divDec(eMath.mulDec(sum, pDiscount), "100"));
- vat = eMath.subDec(vat, eMath.divDec(eMath.mulDec(vat, pDiscount), "100"));
-
-
- if(pExcludedProductgroups)
- {
- var excludedOrderitemData = newSelect("QUANTITY, PRICE, DISCOUNT, VAT")
- .from("SALESORDERITEM")
- .where("SALESORDERITEM.SALESORDERITEM_ID", pOrderId)
- .and("SALESORDERITEM.GROUPCODEID", pExcludedProductgroups, SqlBuilder.IN())
- .andIfSet("OFFERITEM.SALESORDERITEMID", pExcludedIs, SqlBuilder.NOT_IN())
- .table();
-
- excludedOrderitemData.forEach(function(excludedOrderItem){
- sumExcluded = eMath.addDec(sumExcluded, ItemUtils.prototype.getItemSum(excludedOrderItem[0], excludedOrderItem[1], excludedOrderItem[2]));
- vatExcluded = eMath.addDec(vatExcluded, ItemUtils.prototype.getItemVAT(excludedOrderitemData[i][0], excludedOrderitemData[i][1], excludedOrderitemData[i][2], excludedOrderitemData[i][3]));
- });
- }
- if(sumExcluded)
- {
- sum = eMath.addDec(sum, sumExcluded);
- }
- if(vatExcluded)
- {
- vat = eMath.addDec(vat, vatExcluded);
- }
- }
- ret = [sum, vat];
- return ret;
+ newWhere("SALESORDER.SALESORDERID", pOrderId)
+ .updateFields({ NET: vals[0], VAT: vals[1] });
}
/**
diff --git a/process/Organisation_lib/process.js b/process/Organisation_lib/process.js
index b0a01a2d755524ddc06d80f936a4fcc57a15d672..cddf728c788c7be4487e66b3faf0cc79bb8af5af 100644
--- a/process/Organisation_lib/process.js
+++ b/process/Organisation_lib/process.js
@@ -123,7 +123,7 @@ OrgUtils.buildOrgReport = function(pOrgId, pContactId)
var commData = newSelect("MEDIUM_ID, ADDR")
.from("COMMUNICATION")
.where("COMMUNICATION.OBJECT_ROWID", pContactId)
- .and("COMMUNICATION.OBJECT_TYPE", "Contact")
+ .and("COMMUNICATION.OBJECT_TYPE", "Organisation")
.and("ISSTANDARD = 1")
.table();
diff --git a/process/Permission_lib/process.js b/process/Permission_lib/process.js
index bcd5ad4035ff94f8d62aa4daa1fa23035ee59d87..0c7cdcfdca04cf2861f0748a2405713b53d4870b 100644
--- a/process/Permission_lib/process.js
+++ b/process/Permission_lib/process.js
@@ -1075,6 +1075,13 @@ function PermissionUtil () {}
};
}
}
+ else
+ {
+ res = {
+ status: null, // if pRecordState == NEW -> status is not relevant for display
+ title: ContextUtils.getTitleByContext(pObjectType, pObjectRowId)
+ };
+ }
return res;
}
diff --git a/process/SetCampaignStep_workflowService/serviceTaskParameterProcess.js b/process/SetCampaignStep_workflowService/serviceTaskParameterProcess.js
index 5978f70ed26e20dcd576602e0d8e0fc2996517a1..78760ef3ddec78551ac73243559d10e144f2ac2c 100644
--- a/process/SetCampaignStep_workflowService/serviceTaskParameterProcess.js
+++ b/process/SetCampaignStep_workflowService/serviceTaskParameterProcess.js
@@ -3,7 +3,7 @@ import("system.vars");
import("Sql_lib");
import("Workflow_lib");
-var currentValues = JSON.parse(vars.get("$local.value"));
+var currentValues = vars.get("$local.value");
var campaigns = newSelect(["CAMPAIGNID", "NAME"])
.from("CAMPAIGN")
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 91a17dfabf4784c1ca241f28851bc4dff9ae8201..ae874eb736eb437be055965db7eaea41479d1127 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -1882,7 +1882,9 @@ SqlBuilder.prototype.build = function(pDefaultConditionIfNone)
* @param {String[]} pColumns The columns where you want to update.
* @param {SQLTYPES[]} [pColumnTypes=null] normally you can set this to null as the types are calculated if not provided
* @param {String[]} pValues The values to be updated.
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {Number} the number of rows affected
* @throws {Error} if no table is defined
*/
@@ -2008,7 +2010,9 @@ SqlBuilder.prototype.buildInsertStatement = function (pFieldValues, pTableName,
* @param {String[]} pColumns The columns where you want to insert into.
* @param {SQLTYPES[]} [pColumnTypes=null] normally you can set this to null as the types are calculated if not provided
* @param {String[]} pValues The values to be inserted.
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {Number} the number of rows affected
* @throws {Error} if no table is defined
*/
@@ -2106,7 +2110,9 @@ SqlBuilder._columnsValuesFromObject = function (pFieldValues, pIncludeNullValues
* <strong>IMPORTANT: If this is set to false and there is no condition, every row in the table will be deleted!</strong>
* @param {String} [pTableName] The table for deleting data. If undefined, the from part of the SqlBuilder will be used. If no from is set,
* the table of the first where-condition is used.
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {Number} the number of rows affected
* @throws {Error} if no table is defined
* @example
@@ -2189,8 +2195,12 @@ SqlBuilder.prototype.cell = function(pExecuteOnlyIfConditionExists, pFallbackVal
* Note: the default for pExecuteOnlyIfConditionExists is false becausse it is more natural to select all rows if no condition exists.
*
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pMaxRows=0]
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pMaxRows=0] The maximum number of rows to be returned (ORDER BY must be defined in the SQL statement!).
+ * If you specify maxRows, this restriction might apply to all tables indicated in the JOIN part of the query.
+ * If you do not want to restrict this value, enter 0.
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {String[]} the result of the query
*/
SqlBuilder.prototype.arrayRow = function (pExecuteOnlyIfConditionExists, pMaxRows, pTimeout)
@@ -2203,8 +2213,12 @@ SqlBuilder.prototype.arrayRow = function (pExecuteOnlyIfConditionExists, pMaxRow
* Note: the default for pExecuteOnlyIfConditionExists is false becausse it is more natural to select all rows if no condition exists.
*
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pMaxRows=0]
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pMaxRows=0] The maximum number of rows to be returned (ORDER BY must be defined in the SQL statement!).
+ * If you specify maxRows, this restriction might apply to all tables indicated in the JOIN part of the query.
+ * If you do not want to restrict this value, enter 0.
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {String[]} the result of the query
*/
SqlBuilder.prototype.arrayColumn = function (pExecuteOnlyIfConditionExists, pMaxRows, pTimeout)
@@ -2218,8 +2232,12 @@ SqlBuilder.prototype.arrayColumn = function (pExecuteOnlyIfConditionExists, pMax
*
* @param {Number} pType db.ROW or db.COLUMN
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pMaxRows=0]
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pMaxRows=0] The maximum number of rows to be returned (ORDER BY must be defined in the SQL statement!).
+ * If you specify maxRows, this restriction might apply to all tables indicated in the JOIN part of the query.
+ * If you do not want to restrict this value, enter 0.
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {String[]} the result of the query
*/
SqlBuilder.prototype.array = function(pType, pExecuteOnlyIfConditionExists, pMaxRows, pTimeout)
@@ -2245,7 +2263,9 @@ SqlBuilder.prototype.array = function(pType, pExecuteOnlyIfConditionExists, pMax
* @param {Number} pStartIndex
* @param {Number} pRowCount
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {String[]} the result of the query
*/
SqlBuilder.prototype.arrayPage = function(pType, pStartIndex, pRowCount, pExecuteOnlyIfConditionExists, pTimeout)
@@ -2269,8 +2289,12 @@ SqlBuilder.prototype.arrayPage = function(pType, pStartIndex, pRowCount, pExecut
* Note: the default for pExecuteOnlyIfConditionExists is false becausse it is more natural to select all rows if no condition exists.
*
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pMaxRows=0]
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pMaxRows=0] The maximum number of rows to be returned (ORDER BY must be defined in the SQL statement!).
+ * If you specify maxRows, this restriction might apply to all tables indicated in the JOIN part of the query.
+ * If you do not want to restrict this value, enter 0.
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {String[][]} the result of the query
*/
SqlBuilder.prototype.table = function(pExecuteOnlyIfConditionExists, pMaxRows, pTimeout)
@@ -2295,7 +2319,9 @@ SqlBuilder.prototype.table = function(pExecuteOnlyIfConditionExists, pMaxRows, p
* @param {Number} pStartIndex
* @param {Number} pRowCount
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {String[][]} the result of the query
*/
SqlBuilder.prototype.tablePage = function(pStartIndex, pRowCount, pExecuteOnlyIfConditionExists, pTimeout)
@@ -2343,7 +2369,9 @@ SqlBuilder.prototype.startRow = function (pStartRow)
* for iterating over the table pages. You can use SqlBuilder.prototype.hasMoreRows() to check if the end of rows was reached.
*
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
* @return {String[][]} the result of the query
*/
SqlBuilder.prototype.nextTablePage = function (pExecuteOnlyIfConditionExists, pTimeout)
@@ -2383,7 +2411,9 @@ SqlBuilder.prototype.hasMoreRows = function ()
*
* @param {Function} pCallBackFn CallBack-Function to execute for every page. If the function returns false, the execution will be stopped.
* @param {Boolean} [pExecuteOnlyIfConditionExists=false] if true and there is no condition, [] is returned
- * @param {Number} [pTimeout=-1]
+ * @param {Number} [pTimeout=-1] Specifies the period, in milliseconds, after which the query will be aborted.
+ * This timeout value overwrites DBSyncTimeout for the SQL command to be executed (this value was predefined in the
+ * server defaults). If you omit this parameter, DBSyncTimeout will be used.
*/
SqlBuilder.prototype.forEachPage = function (pCallBackFn, pExecuteOnlyIfConditionExists, pTimeout)
{
@@ -3374,8 +3404,9 @@ SqlMaskingUtils.prototype.isNull = function (pField, pReplacement)
case db.DBTYPE_DERBY10:
case db.DBTYPE_MYSQL4:
case db.DBTYPE_MARIADB10:
- default:
return "coalesce(" + pField + ", " + pReplacement + ")";
+ default:
+ throw new Error(translate.withArguments("${SQL_LIB_UNSUPPORTED_DBTYPE} function: %0", ["SqlMaskingUtils.prototype.isNull"]));
}
}
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index fbc566801e827f744dd95518c2fa1d25e495ba84..df49017646284aed3eba44c6e480ffeed67b4161 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -5,6 +5,7 @@ import("Keyword_lib");
import("KeywordRegistry_basic");
import("Contact_lib");
import("Communication_lib");
+import("Context_lib");
function StandardObject (pObjectType, pObjectID, pScopeType, pScopeID) {
if (!this._isValidType("object", pObjectType))
@@ -159,7 +160,7 @@ StandardObject.prototype.onCommunicationInsert = function (pMediumID) {
var mediumCategory = this._getMediumCategory(pMediumID);
- var hasStandard = this._hasStandardCommunicationByMedium(this.scopeID, mediumCategory);
+ var hasStandard = this._hasStandardCommunicationByMedium(this.scopeID, mediumCategory, this.scopeType);
if (!hasStandard) {
this._setStandardCommunication(this.objectID, 1);
}
@@ -178,7 +179,7 @@ StandardObject.prototype.onCommunicationUpdate = function (pMediumID) {
return null;
var contactID = this._getRowIdByCommunication(this.objectID);
- var hasStandard = this._hasStandardCommunicationByMedium(contactID, mediumCategory);
+ var hasStandard = this._hasStandardCommunicationByMedium(contactID, mediumCategory, this.scopeType);
if (!hasStandard)
this._setStandardCommunication(this.objectID, 1);
@@ -246,7 +247,7 @@ StandardObject.prototype._getCompanyStandardAddress = function (pOrganisationID)
*
* @param {String} pObjectRowId The rowid of the communication to check.
* @param {String} pMediumCategory Medium category to check.
- * @param {String} pObjectType=Contact (Optional) The type of the rowid
+ * @param {String} pObjectType=CurrentContextId (Optional) The type of the rowid
* @return {Boolean} If the contact already has a standard addres with the given
* medium category.
*/
@@ -258,7 +259,7 @@ StandardObject.prototype._hasStandardCommunicationByMedium = function (pObjectRo
.leftJoin("AB_KEYWORD_ATTRIBUTERELATION", "AB_KEYWORD_ENTRY_ID = AB_KEYWORD_ENTRYID")
.where("ISSTANDARD = 1")
.and("COMMUNICATION.OBJECT_ROWID", pObjectRowId)
- .and("COMMUNICATION.OBJECT_TYPE", (pObjectType ? pObjectType : CommUtil.defaultObjectType()))
+ .and("COMMUNICATION.OBJECT_TYPE", (pObjectType ? pObjectType : ContextUtils.getCurrentContextId()))
.and("AB_KEYWORD_ENTRY.KEYID", CommUtil.getMediumIdsByCategory(pMediumCategory), SqlBuilder.IN())
.arrayColumn()
.indexOf(pMediumCategory) !== -1;
diff --git a/process/TopicTree_lib/process.js b/process/TopicTree_lib/process.js
index cc46b867ed55675a04cafacd39721b2ce6ab962b..3c0d5cb685a64d25c69369fd4c884e12ebb93cdb 100644
--- a/process/TopicTree_lib/process.js
+++ b/process/TopicTree_lib/process.js
@@ -421,7 +421,7 @@ TopicTreeUtils.returnNumberOfLayerName = function(pLayerName)
/*
* Returns the amount of layers<br>
* So basically how deep this topic is from pTopicTreeDataset to the deepest one
- * @param {String} pTopicTreeDataset as returned by vars.get("$sys.selectionRows")[0];
+ * @param {Object} pTopicTreeDataset;
*
* @return {Number} Number of layers (e.g: when topLayer = SORTING_LAYER_2 and the deepest subtopic is SORTING_LAYER_5 --> "4" (4layers: 2, 3, 4, 5)
*/
@@ -818,15 +818,14 @@ TopicTreeUtils.paste = function (pIsTopTopic)
var pLayerDeeper = "SORTING_LAYER_2";
var cond = newWhere("TOPICTREE.ASSIGNEDTO is null");
if(!pIsTopTopic)
- {
- var paste = vars.get("$sys.selectionRows")[0]; //paste data
- var pTopicTreeId = paste["#UID"];
- var pSorting_Layer_1 = paste.SORTING_LAYER_1;
- var pSorting_Layer_2 = paste.SORTING_LAYER_2;
- var pSorting_Layer_3 = paste.SORTING_LAYER_3;
- var pSorting_Layer_4 = paste.SORTING_LAYER_4;
- var pSorting_Layer_5 = paste.SORTING_LAYER_5;
- var pSorting_Layer_6 = paste.SORTING_LAYER_6;
+ {
+ var pTopicTreeId = vars.get("$field.UID");
+ var pSorting_Layer_1 = vars.get("$field.SORTING_LAYER_1");
+ var pSorting_Layer_2 = vars.get("$field.SORTING_LAYER_2");
+ var pSorting_Layer_3 = vars.get("$field.SORTING_LAYER_3");
+ var pSorting_Layer_4 = vars.get("$field.SORTING_LAYER_4");
+ var pSorting_Layer_5 = vars.get("$field.SORTING_LAYER_5");
+ var pSorting_Layer_6 = vars.get("$field.SORTING_LAYER_6");
pLayer = TopicTreeUtils.getLayer(pSorting_Layer_1, pSorting_Layer_2, pSorting_Layer_3, pSorting_Layer_4, pSorting_Layer_5, pSorting_Layer_6);
pLayerDeeper = TopicTreeUtils.getDeeperLayer(pSorting_Layer_1, pSorting_Layer_2, pSorting_Layer_3, pSorting_Layer_4, pSorting_Layer_5, pSorting_Layer_6);
cond = newWhere("TOPICTREE.ASSIGNEDTO", pTopicTreeId);
@@ -853,8 +852,7 @@ TopicTreeUtils.paste = function (pIsTopTopic)
, "ACTIVE"
, pLayer
, "USER_NEW"
- , "DATE_NEW"
- , "ASSIGNEDTO"];
+ , "DATE_NEW"];
var uid = isCut == true ? cTopicTreeId : util.getNewUUID();//new uuid is old uuid if cut, since we "move" the topic instead of copying
var values = [uid
@@ -863,10 +861,14 @@ TopicTreeUtils.paste = function (pIsTopTopic)
, cActive
, eMath.addInt(maxSortingOneLayerDeeper, 1)
, vars.get("$sys.user")
- , vars.get("$sys.date")
- , pTopicTreeId];
-
+ , vars.get("$sys.date")];
+
+ if(!pIsTopTopic)
+ {
+ columns.push("ASSIGNEDTO");
+ values.push(pTopicTreeId);
+ }
if(isCut)
{
_updateSortingValuesOfOtherTopics(cLayer, cOwnSortingValue, cAssignedTo);
@@ -886,7 +888,7 @@ TopicTreeUtils.paste = function (pIsTopTopic)
//update child topics accordingly
while(stop == false)
{
- topicTreeDatasets = newSelect(["TOPICTREE.TOPICTREEID"
+ var topicTreeDatasets = newSelect(["TOPICTREE.TOPICTREEID"
, TopicTreeUtils.relevantSortingValueCaseWhen() + " as sortingValue"
, TopicTreeUtils.layerNameCaseWhen()
, "TOPICTREE.TOPIC"
@@ -911,13 +913,12 @@ TopicTreeUtils.paste = function (pIsTopTopic)
topicTreeIds.push(subTopicId);
topicTreeIdsToUpdate.push(subTopicId);
- subColumns = ["TOPICTREEID"
+ var subColumns = ["TOPICTREEID"
, "TOPIC"
, "DESCRIPTION"
, "ACTIVE"
, "USER_NEW"
, "DATE_NEW"
- , "ASSIGNEDTO"
, subTopicRelevantSortingLayer];//relevant sorting value
var newSubUid
if(isCut == true)
@@ -930,15 +931,20 @@ TopicTreeUtils.paste = function (pIsTopTopic)
newSubUid = util.getNewUUID();
}
oldToNewIdHelperObj[subTopicId] = newSubUid;
-
- subValues = [newSubUid
+
+ var subValues = [newSubUid
, subTopic
, subDescription
, subActive
, vars.get("$sys.user")
, vars.get("$sys.date")
- , oldToNewIdHelperObj[subAssignedTo]
, subTopicRelevantSortingValue];
+
+ if(Utils.isNotNullOrEmptyString(oldToNewIdHelperObj[subAssignedTo]))
+ {
+ subValues.push(oldToNewIdHelperObj[subAssignedTo]);
+ subColumns.push("ASSIGNEDTO");
+ }
var previousLayer = subTopicRelevantSortingLayer;
var stopper = false;
diff --git a/process/UnitTest_lib/process.js b/process/UnitTest_lib/process.js
index e39e6bf4caf998b0c584b4a0fc3a57aa35730ad3..ea90797d2ce9c9293cedb0c9ae06dc5464ac563e 100644
--- a/process/UnitTest_lib/process.js
+++ b/process/UnitTest_lib/process.js
@@ -261,7 +261,7 @@ Tester.prototype.equals = function(pExpect, pCustomDescription)
if(Utils.isObject(this.actualValue) || Utils.isObject(this.expectedValue))
{
- this.expectedDisplayValue = JSON.stringify(this.actualValue, _getCircularReplacer());
+ this.expectedDisplayValue = Array.isArray(this.expectedValue) ? this.expectedValue : JSON.stringify(this.expectedValue, _getCircularReplacer());
this._testResult = Utils.isEqual(this.actualValue, this.expectedValue);
this._generateAssertDescription({custom: pCustomDescription, operator: "===", name: "Object value"});
}
@@ -735,7 +735,7 @@ Tester.prototype.hasMaxLength = function(pExpect, pCustomDescription)
/**
* Test if a callback function throws an exception
*
- * @param {Number} pExpect the expected error
+ * @param {Error} pExpect the expected error
* @param {(String|Object)} pCustomDescription an optional custom assert description or config object overwrite
* @return {Tester}
*/
diff --git a/process/UpdateAdvertisingItem_workflowService/process.js b/process/UpdateAdvertisingItem_workflowService/process.js
index 5d279eb5865fc7bd8ae84308a6aa1006deebc9f4..a0d3b4281a4ca76f7844398d116517e8f97b23c7 100644
--- a/process/UpdateAdvertisingItem_workflowService/process.js
+++ b/process/UpdateAdvertisingItem_workflowService/process.js
@@ -1,3 +1,4 @@
+import("KeywordRegistry_basic");
import("Sql_lib");
import("system.vars");
@@ -8,4 +9,8 @@ if (variables.targetContext && variables.targetContext == "Advertising" && varia
newWhere("ADVERTISINGITEM.ADVERTISING_ID", variables.targetId).and("ADVERTISINGITEM.DELIVERY", variables.handover).updateFields({
"SENT": '1'
});
+
+ newWhere("ADVERTISING.ADVERTISINGID", variables.targetId).updateFields({
+ "STATUS": $KeywordRegistry.advertisingStatus$Sent()
+ });
}
\ No newline at end of file
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index ada0e3f465462c2959c61f639b5dc3d379cb38e1..5baa6ba7c6517bb00640530ffbcd085e759eaaa0 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -981,23 +981,51 @@ ArrayUtils.sortArrayOfObjects = function(targetArray, key, sortAsc, isNumber) {
/**
* sorts an array with columns
*
-* @param {Array} targetArray the array with data
-* @param {Array} sortOrder array with the format [columnIndex1, sortDescending1, columnIndex2, sortDescending2, ...],
+* @param {Array} pTargetArray the array with data
+* @param {Array} pSortOrder array with the format [columnIndex1, sortDescending1, columnIndex2, sortDescending2, ...],
* the columnIndex must be an integer, sortDescending must be boolean (true -> descending, just like db.DESCENDING)
* @example
* ArrayUtils.sortMulti(rows, [1, true, 2, true, 5, false]);
*
* @return {void}
*/
-ArrayUtils.sortMulti = function(targetArray, sortOrder) {
+ArrayUtils.sortMulti = function(pTargetArray, pSortOrder)
+{
+ var sortFn = ArrayUtils.getMultiSortCompareFn(ArrayUtils.chunk(pSortOrder, 2));
+
+ pTargetArray.sort(sortFn);
+ return pTargetArray;
+}
+
+/**
+* makes a sorting function for an array with columns
+*
+* @param {Map|Array} pSortOrder Map with columnIndex as keys and direction as values, or
+* array with the format [[columnIndex1, direction1], [columnIndex2, direction2], ...],
+* the columnIndex must be an integer, direction must be boolean (true -> descending, just like db.DESCENDING)
+* @example
+* var sortFn = ArrayUtils.getMultiSortCompareFn([[1, true], [2, true], [5, false]]);
+* rows.sort(sortFn);
+*
+* @return {void}
+*/
+ArrayUtils.getMultiSortCompareFn = function (pSortOrder)
+{
+ if (Array.isArray(pSortOrder))
+ {
+ pSortOrder = new Map(pSortOrder);
+ }
+
/*
* @param {String} a req value 1, first compared element
* @param {String} b req value 2, sencond compared element
*
* @return {Integer} -1 - set a below b, 0 - equal, 1 - set b below a
*/
- var sortFn = function(a, b) {
- var stringComparison = function(a, b) {
+ return function(a, b)
+ {
+ var stringComparison = function(a, b)
+ {
a = a.toLowerCase();
a = a.replace(/ä/g,"ae");
a = a.replace(/ö/g,"oe");
@@ -1015,28 +1043,31 @@ ArrayUtils.sortMulti = function(targetArray, sortOrder) {
var swap = 0;
- for (let i = 0, l = sortOrder.length; i < l; i += 2)
+ pSortOrder.forEach(function (sortDesc, colIndex)
{
- let colIndex = sortOrder[i];
- let sortDesc = sortOrder[i+1];
if (swap || colIndex == undefined || sortDesc == undefined)
- return swap;
+ return;
if (isNaN(a[colIndex] - b[colIndex]))
+ {
if ((isNaN(a[colIndex])) && (isNaN(b[colIndex])))
- swap = stringComparison(a[colIndex], b[colIndex]);
+ {
+ swap = stringComparison(a[colIndex], b[colIndex]);
+ }
else
+ {
swap = (isNaN(a[colIndex]) ? 1 : -1);
+ }
+ }
else
+ {
swap = (a[colIndex] - b[colIndex]);
+ }
swap *= (sortDesc ? -1 : 1);
- }
+ });
return swap;
}
-
- targetArray.sort(sortFn);
- return targetArray;
}
/**
diff --git a/process/Workflow_lib/process.js b/process/Workflow_lib/process.js
index 9fcd029adb869db690b74b2ea94f944c9be34225..6062e0eece258228cca8b633b727014a4377e442 100644
--- a/process/Workflow_lib/process.js
+++ b/process/Workflow_lib/process.js
@@ -75,7 +75,6 @@ WorkflowUtils.getPossibleTargetContexts = function ()
"Person",
"Offer",
"Salesproject",
- "MarketingWorkflowLauncher",
"AdvertisingItem",
];
}
diff --git a/process/ZippingUtil_lib/ZippingUtil_lib.aod b/process/ZippingUtil_lib/ZippingUtil_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d69d519c6cdc5fd0f9f2278f65b5fc50671f404b
--- /dev/null
+++ b/process/ZippingUtil_lib/ZippingUtil_lib.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>ZippingUtil_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/process/ZippingUtil_lib/documentation.adoc</documentation>
+ <process>%aditoprj%/process/ZippingUtil_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ZippingUtil_lib/documentation.adoc b/process/ZippingUtil_lib/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..d4b7fb6fba780b9089495638767aa0dacf0571c2
--- /dev/null
+++ b/process/ZippingUtil_lib/documentation.adoc
@@ -0,0 +1 @@
+Provides versatile utility functions for packing/unpacking zip-files.
\ No newline at end of file
diff --git a/process/ZippingUtil_lib/process.js b/process/ZippingUtil_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..e3371fc1ed4a1b4a1f24818381b82ed92364ae92
--- /dev/null
+++ b/process/ZippingUtil_lib/process.js
@@ -0,0 +1,98 @@
+import("system.translate");
+
+/**
+ * Provides static methods for zipping/unzipping.
+ * Do not create an instance of this
+ *
+ * @class
+ * @static
+ */
+function ZippingUtil()
+{
+ throw new Error(translate.text("[ZippingUtil.constructor]Cannot instantiate a static class."));
+}
+
+/**
+ * This function will determine duplicates in a list of filenames for a zip file and search for a matching, unique name for the duplicate. <br/>
+ * That is done by adding a number in bracets to the filename. That number is increased for each occurence and the first element ("the origin") is not
+ * changed at all.<br/>
+ * <br/>
+ * This function is perfect for preparing filenames for the neon.downloadToZip-Method, as the neon.downloadToZip would throw an error when filenames
+ * contain duplicates.<br/>
+ * <br/>
+ * Does not modify the input-array and if the input-array is emtpy a new empty array is returned.<br/>
+ *
+ * @param {Array} pFileNames Not nullable parameter to provide the filenames that are searched for duplicates.
+ * However it is not required that there are duplicates in the filelist. Example: ["offer.pdf", "offer.pdf"]
+ * @return {Array} Unique elements for the filenames; for the example of the pFileNames param this would be: ["offer.pdf", "offer(1).pdf"]. <br/>
+ * The amount of elements does not change, nor the position of the elements. Only duplicates are renamed.
+ *
+ * @throws <p><i>TypeError</i> when the pFileNames param is not an array or null.
+ * <br/> <i>Error</i> when the limit of possible filenames is reached, the current limit is 1024. This does prevent endless loops
+ * </p>
+ */
+ZippingUtil.renameDuplicateFilenamesForZip = function(pFileNames)
+{
+ if (pFileNames == null || !Array.isArray(pFileNames))
+ {
+ throw new TypeError(translate.text("[ZippingUtil.renameDuplicateFilenamesForZip]FileNames type is invalid. An Array of filenames is required."));
+ }
+
+ if (pFileNames.length == 0)
+ {
+ return [];
+ }
+
+ var resultFileNameList = [];
+ var originFileNames = pFileNames; // this is only a reference -> do not modify this array!
+
+ // map to skip known duplicates (if a lot of files are named the same key); key: name of the originated filename, value: the POSSIBLE next version
+ var duplicationInfo = new Map();
+
+ // anonymous helper function to determine the next possible filename
+ var _findNextBestFilename = function(pFileName)
+ {
+ var additionalNo = duplicationInfo.has(pFileName) ? duplicationInfo.get(pFileName) : 0;
+ while (++additionalNo <= 1024) // 1024 is a random value we choosed to prevent endless attempts
+ {
+ // if we are in this function, the pFileName is already a duplicated entry, so we do NOT have to check this here at first
+ var firstDot = pFileName.indexOf("."); // first position because of filenames like "myFile.tar.gz"
+ var primaryFileName;
+ var secondaryFileName = "";
+ if (firstDot <= 0)
+ {
+ primaryFileName = pFileName;
+ }
+ else
+ {
+ primaryFileName = pFileName.substring(0, firstDot);
+ secondaryFileName = pFileName.substring(firstDot);
+ }
+ var composedFileName = primaryFileName + "(" + additionalNo + ")" + secondaryFileName;
+ duplicationInfo.set(pFileName, additionalNo);
+ if (!originFileNames.includes(composedFileName) && !resultFileNameList.includes(composedFileName))
+ {
+ return composedFileName
+ }
+ }
+ throw new Error(translate.text("[ZippingUtil.renameDuplicateFilenamesForZip]Limit for max length of filename iteration reached."));
+ }
+
+ for (var i = 0, l = originFileNames.length; i < l; i++)
+ {
+ var fileName = originFileNames[i];
+ if (resultFileNameList.includes(fileName))
+ {
+ // now there is a problem and we want to add a more specific version of the filename to be unique
+ resultFileNameList.push(_findNextBestFilename(fileName));
+ }
+ else
+ {
+ // all good
+ resultFileNameList.push(fileName);
+
+ }
+ }
+
+ return resultFileNameList;
+}
diff --git a/process/ZippingUtil_test/ZippingUtil_test.aod b/process/ZippingUtil_test/ZippingUtil_test.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e830bb6470541bed913614f049c3b115a8df7d92
--- /dev/null
+++ b/process/ZippingUtil_test/ZippingUtil_test.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>ZippingUtil_test</name>
+ <title>[TEST] ZippingUtil_lib</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:CHECK_CIRCLE</icon>
+ <process>%aditoprj%/process/ZippingUtil_test/process.js</process>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/ZippingUtil_test/process.js b/process/ZippingUtil_test/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd11cab654bb8f9dcc885b6ab79eff54ccb66ef5
--- /dev/null
+++ b/process/ZippingUtil_test/process.js
@@ -0,0 +1,159 @@
+import("system.translate");
+import("system.result");
+import("UnitTest_lib");
+import("ZippingUtil_lib");
+
+var constructorTests = new TestSuite("ZippingUtil.constructor", [
+
+ new Test("should throw exception when trying to instantiate",
+ function(pTester) {
+ var expected = new Error(translate.text("[ZippingUtil.constructor]Cannot instantiate a static class."));
+
+ // do be able to catch the exception it is required to determine the actual value in a callback function
+ pTester.expectThat(function (){
+ return new ZippingUtil();
+ }).throwsException(expected).assert();
+ }
+ )
+ ]);
+
+var extendFlatFilesTests = new TestSuite("ZippingUtil.renameDuplicateFilenamesForZip", [
+ new Test("should not modify unique filenames",
+ function(pTester) {
+ var fileNameInput = ["file1.pdf", "file2.pdf", "file3.pdf"];
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals(fileNameInput).assert();
+ }
+ ),
+
+ new Test("should return empty array when zero filenames are given",
+ function(pTester) {
+ var fileNameInput = [];
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals([]).assert();
+ }
+ ),
+
+ new Test("should modify duplicate filenames (where duplicated entries do not already exist)",
+ function(pTester) {
+ var fileNameInput = ["file1.pdf", "file1.pdf", "file1.pdf", "file2.pdf"];
+ var expectedResult = ["file1.pdf", "file1(1).pdf", "file1(2).pdf", "file2.pdf"];
+
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals(expectedResult).assert();
+ }
+ ),
+
+ new Test("should modify duplicate filenames (where duplicated entries do already exist once)",
+ function(pTester) {
+ var fileNameInput = ["file1.pdf", "file1.pdf", "file1(1).pdf", "file2.pdf"];
+ var expectedResult = ["file1.pdf", "file1(2).pdf", "file1(1).pdf", "file2.pdf"];
+
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals(expectedResult).assert();
+ }
+ ),
+
+ new Test("should modify duplicate filenames (where duplicated entries do already exist several times)",
+ function(pTester) {
+ var fileNameInput = ["file1(1).pdf", "file1(1).pdf", "file1(1).pdf", "file2.pdf"];
+ var expectedResult = ["file1(1).pdf", "file1(1)(1).pdf", "file1(1)(2).pdf", "file2.pdf"];
+
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals(expectedResult).assert();
+ }
+ ),
+
+ new Test("should throw exception when no array is passed as filenames",
+ function(pTester) {
+ var fileNameInput = "not an array";
+ var expected = new TypeError(translate.text("[ZippingUtil.renameDuplicateFilenamesForZip]FileNames type is invalid. An Array of filenames is required."));
+
+ // do be able to catch the exception it is required to determine the actual value in a callback function
+ pTester.expectThat(function (){
+ return ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+ }).throwsException(expected).assert();
+ }
+ ),
+
+ new Test("should throw exception when null is passed as filenames",
+ function(pTester) {
+ var fileNameInput = null;
+ var expected = new TypeError(translate.text("[ZippingUtil.renameDuplicateFilenamesForZip]FileNames type is invalid. An Array of filenames is required."));
+
+ // do be able to catch the exception it is required to determine the actual value in a callback function
+ pTester.expectThat(function (){
+ return ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+ }).throwsException(expected).assert();
+ }
+ ),
+
+ new Test("should rename files without filextension",
+ function(pTester) {
+ var fileNameInput = ["file1", "file1", "file1", "file2"];
+ var expectedResult = ["file1", "file1(1)", "file1(2)", "file2"];
+
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals(expectedResult).assert();
+ }
+ ),
+
+ new Test("should throw error when limit of loop renamings are exceeded",
+ function(pTester) {
+ var fileNameInput = new Array(1025 + 1).fill("filename.pdf");//"+ 1" because the first filename is always kept the same
+ var expected = new Error(translate.text("[ZippingUtil.renameDuplicateFilenamesForZip]Limit for max length of filename iteration reached."));
+
+ // do be able to catch the exception it is required to determine the actual value in a callback function
+ pTester.expectThat(function (){
+ var res = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+ return res;
+ }).throwsException(expected).assert();
+ }
+ ),
+
+ new Test("should split at correct dot of file extension",
+ function(pTester) {
+ var fileNameInput = ["file1.tar.gz", "file1.tar.gz"];
+ var expectedResult = ["file1.tar.gz", "file1(1).tar.gz"];
+
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals(expectedResult).assert();
+ }
+ ),
+
+ new Test("should handle filenames with starting dot",
+ function(pTester) {
+ var fileNameInput = [".file1", ".file1", "...", "..."];
+ var expectedResult = [".file1", ".file1(1)", "...", "...(1)"];
+
+ var actualValue = ZippingUtil.renameDuplicateFilenamesForZip(fileNameInput);
+
+ pTester.expectThat(actualValue).isArray().assert();
+ pTester.expectThat(actualValue).equals(expectedResult).assert();
+ }
+ )
+ ]);
+
+var tester = new Tester("Test ZippingUtil_lib");
+
+tester.initCoverage(ZippingUtil);
+tester.test(constructorTests);
+tester.test(extendFlatFilesTests);
+
+tester.summary();
+
+result.object(tester.getResults());
diff --git a/process/downloadDocument_rest/downloadDocument_rest.aod b/process/downloadDocument_rest/downloadDocument_rest.aod
new file mode 100644
index 0000000000000000000000000000000000000000..32f57b6d4183fe2b73c52a6b2596a6159c63d108
--- /dev/null
+++ b/process/downloadDocument_rest/downloadDocument_rest.aod
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>downloadDocument_rest</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/downloadDocument_rest/process.js</process>
+ <webserviceEnabled v="true" />
+ <publishAsWebservice v="true" />
+ <style>REST</style>
+ <loginTypeId>
+ <element>internal.none</element>
+ </loginTypeId>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/downloadDocument_rest/process.js b/process/downloadDocument_rest/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..99df142f06a8d548e3c2169b87cb84df20a7cc14
--- /dev/null
+++ b/process/downloadDocument_rest/process.js
@@ -0,0 +1,50 @@
+import("system.logging");
+import("KeywordRegistry_basic");
+import("DocumentTemplate_lib");
+import("Email_lib");
+import("Sql_lib");
+import("Workflow_lib");
+import("Util_lib");
+import("system.util");
+import("Bulkmail_lib");
+import("system.db");
+
+function restget (pRequest)
+{
+ var request = JSON.parse(pRequest);
+ var documentTemplateId = request.query.documenttemplate;
+
+ //check if id exists and has the correct category
+ documentTemplateId = newSelect("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID")
+ .from("DOCUMENTTEMPLATE")
+ .where("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID",documentTemplateId)
+ .and("DOCUMENTTEMPLATE.KIND",$KeywordRegistry.documentTemplateType$download())
+ .cell();
+
+
+ if (documentTemplateId)
+ {
+ try
+ {
+ var documentTemplate = DocumentTemplate.loadTemplate(documentTemplateId);
+
+ request.response.httpStatusCode = 200; //Ok
+ request.response.isBase64 = true;
+ request.response.header["Content-Type"] = documentTemplate.mimeType;
+ request.response.header["Content-Disposition"] = 'attachment; filename='+documentTemplate.filename
+ request.response.body = documentTemplate.content;
+ }
+ catch (ex)
+ {
+ request.response.httpStatusCode = 404; //not found
+ }
+ }
+ else
+ {
+ request.response.httpStatusCode = 400; //bad request
+ }
+
+ return JSON.stringify(request);
+}
+
+
diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js
index 5df148c50463a5b7c21768b73322598f374c45bd..d460263ecc026db9160ef16dc6031266724f90f0 100644
--- a/process/getDocxDocument_serverProcess/process.js
+++ b/process/getDocxDocument_serverProcess/process.js
@@ -10089,10 +10089,10 @@ function getTag(tag) {
function tagMatcher(content, textMatchArray, othersMatchArray) {
var cursor = 0;
var contentLength = content.length;
- var allMatches = DocUtils.concatArrays([textMatchArray.map(function (tag) {
- return { tag: tag, text: true };
- }), othersMatchArray.map(function (tag) {
- return { tag: tag, text: false };
+ var allMatches = DocUtils.concatArrays([textMatchArray.map(function (pTag) {
+ return { tag: pTag, text: true };
+ }), othersMatchArray.map(function (pTag) {
+ return { tag: pTag, text: false };
})]).reduce(function (allMatches, t) {
allMatches[t.tag] = t.text;
return allMatches;
@@ -10109,10 +10109,10 @@ function tagMatcher(content, textMatchArray, othersMatchArray) {
var tagText = content.slice(offset, cursor + 1);
var _getTag = getTag(tagText),
- tag = _getTag.tag,
+ tagName = _getTag.tag,
position = _getTag.position;
- var text1 = allMatches[tag];
+ var text1 = allMatches[tagName];
if (text1 == null) {
continue;
}
@@ -10390,11 +10390,11 @@ function throwUnmatchedLoopException(options) {
var T = location === "start" ? "Unclosed" : "Unopened";
var err = new Errors.XTTemplateError(T + " loop");
- var tag = options.part.value;
+ var tagName = options.part.value;
err.properties = {
id: t + "_loop",
- explanation: "The loop with tag " + tag + " is " + t,
- xtag: tag
+ explanation: "The loop with tag " + tagName + " is " + t,
+ xtag: tagName
};
throw err;
}
@@ -10581,10 +10581,10 @@ var wrapper = require("../module-wrapper");
function throwRawTagShouldBeOnlyTextInParagraph(options) {
var err = new Errors.XTTemplateError("Raw tag should be the only text in paragraph");
- var tag = options.part.value;
+ var tagName = options.part.value;
err.properties = {
id: "raw_xml_tag_should_be_only_text_in_paragraph",
- explanation: "The tag " + tag,
+ explanation: "The tag " + tagName,
xtag: options.part.value,
paragraphParts: options.paragraphParts
};
@@ -10982,12 +10982,12 @@ var Errors = require("./errors");
function throwRawTagNotInParagraph(options) {
var err = new Errors.XTTemplateError("Raw tag not in paragraph");
- var tag = options.part.value;
+ var tagName = options.part.value;
err.properties = {
id: "raw_tag_outerxml_invalid",
- explanation: "The tag \"" + tag + "\"",
+ explanation: "The tag \"" + tagName + "\"",
rootError: options.rootError,
- xtag: tag,
+ xtag: tagName,
postparsed: options.postparsed,
expandTo: options.expandTo,
index: options.index
@@ -11023,17 +11023,17 @@ function getListXmlElements(parts) {
var res = [];
- for (var i = 0, tag; i < tags.length; i++) {
- tag = tags[i];
+ for (var i = 0, tagName; i < tags.length; i++) {
+ tagName = tags[i];
// closing tag
- if (tag[1] === "/") {
- if (lastTagIsOpenTag(res, tag)) {
+ if (tagName[1] === "/") {
+ if (lastTagIsOpenTag(res, tagName)) {
res.pop();
} else {
- res = addTag(res, tag);
+ res = addTag(res, tagName);
}
- } else if (tag[tag.length - 1] !== "/") {
- res = addTag(res, tag);
+ } else if (tagName[tagName.length - 1] !== "/") {
+ res = addTag(res, tagName);
}
}
return res;
diff --git a/process/mailbridge_service/process.js b/process/mailbridge_service/process.js
index d05860bd63f461478032db7608b67490aabc4839..c26b4a2792708a6fc8d71856308bf0b7f4d2aa10 100644
--- a/process/mailbridge_service/process.js
+++ b/process/mailbridge_service/process.js
@@ -49,7 +49,6 @@ TicketMailbridgeUtils.insertLog = function(pTicketId, pDescription)
"USER_NEW" : "adito.server"
}
new SqlBuilder().insertFields(valueFields, "AB_LOGHISTORY", "AB_LOGHISTORYID");
-
}
/*
@@ -105,47 +104,47 @@ TicketMailbridgeUtils.getDefaultInbox = function ()
*/
TicketMailbridgeUtils.getInboxInformationAllRecipients = function(pRecipients, pSender, possibleBCC, possibleBCCUnfiltered)
{
- var inboxObj = {};
+ var inboxObj = {};
var inboxFound = false;
var inboxInformation;
-
+
// try to find an Inbox via Recipients
if (pRecipients != "")
{
inboxObj["inboxID"] = TicketMailbridgeUtils.getInbox(pRecipients);
if(inboxObj.inboxID.length > 0)
- {
- inboxInformation = TicketMailbridgeUtils.getInboxInformation(pRecipients,inboxObj["inboxID"][0]);
- inboxObj["reopenDelay"] = inboxInformation[0];
- inboxObj["mailSignatureID"] = inboxInformation[1];
- inboxFound = true;
+ {
+ inboxInformation = TicketMailbridgeUtils.getInboxInformation(pRecipients,inboxObj["inboxID"][0]);
+ inboxObj["reopenDelay"] = inboxInformation[0];
+ inboxObj["mailSignatureID"] = inboxInformation[1];
+ inboxFound = true;
}
}
// try to find inbox from possible BCC without INBOX-Mails
if (possibleBCC != "" && inboxFound == false )
{
- inboxObj["inboxID"] = TicketMailbridgeUtils.getInbox(possibleBCC);
+ inboxObj["inboxID"] = TicketMailbridgeUtils.getInbox(possibleBCC);
// found an Inbox?
if(inboxObj.inboxID.length > 0)
- {
- inboxInformation = TicketMailbridgeUtils.getInboxInformation(possibleBCC,inboxObj["inboxID"][0]);
- inboxObj["reopenDelay"] = inboxInformation[0];
- inboxObj["mailSignatureID"] = inboxInformation[1];
- inboxFound = true;
- }
+ {
+ inboxInformation = TicketMailbridgeUtils.getInboxInformation(possibleBCC,inboxObj["inboxID"][0]);
+ inboxObj["reopenDelay"] = inboxInformation[0];
+ inboxObj["mailSignatureID"] = inboxInformation[1];
+ inboxFound = true;
+ }
}
// use BACKUP INBOX-Mails
if (possibleBCCUnfiltered != "" && inboxFound == false )
{
- inboxObj["inboxID"] = TicketMailbridgeUtils.getInbox(possibleBCCUnfiltered);
+ inboxObj["inboxID"] = TicketMailbridgeUtils.getInbox(possibleBCCUnfiltered);
// found an Inbox?
if(inboxObj.inboxID.length > 0)
- {
- inboxInformation = TicketMailbridgeUtils.getInboxInformation(possibleBCCUnfiltered,inboxObj["inboxID"][0]);
- inboxObj["reopenDelay"] = inboxInformation[0];
- inboxObj["mailSignatureID"] = inboxInformation[1];
- inboxFound = true;
- }
+ {
+ inboxInformation = TicketMailbridgeUtils.getInboxInformation(possibleBCCUnfiltered,inboxObj["inboxID"][0]);
+ inboxObj["reopenDelay"] = inboxInformation[0];
+ inboxObj["mailSignatureID"] = inboxInformation[1];
+ inboxFound = true;
+ }
}
// else use the Inbox with the default mailsignature
if (inboxFound == false)
@@ -373,18 +372,27 @@ TicketMailbridgeUtils.findTicket = function(pSubject, pInboxObject, pMailObj)
if(ticketData.length > 0)
{
- if(ticketData.length > 1) { //if ticketcode is not unique -> check for sender email
- var singleTicket = ticketData.findIndex(function(mail) {
+ if(ticketData.length > 1)
+ { //if ticketcode is not unique -> check for sender email
+ var singleTicket = ticketData.findIndex(function(mail)
+ {
return mail[5] == pMailObj.send;
});
- if(singleTicket > -1) {
+ if(singleTicket > -1)
+ {
ticketData = ticketData[singleTicket];
- } else {
+ }
+ else
+ {
ticketData = ticketData[0];
}
- } else
+ }
+
+ else
+
ticketData = ticketData[0];
+ }
// set TicketID
ticketID = ticketData[0];
@@ -506,7 +514,6 @@ TicketMailbridgeUtils.findTicket = function(pSubject, pInboxObject, pMailObj)
.and("TICKET.INBOX_ID", pInboxObject.inboxID[0])
.cell();
}
-
if(ticketID != "")
{
// insert for ACTIVITY
@@ -717,7 +724,7 @@ TicketMailbridgeUtils.createTicket = function(pMailObject, pFilterResult, pInbox
// sending Automatic Answeremail
if(answerMail != "" && answerMail != undefined && answerMailActive !="" && answerMailActive == true)
{
- var eml = new Email();
+ var eml = new Email();
// use answer mail address, if answer mail address is set for the selected inbox
var commAddr = pInboxObj.mailSignatureID[6]; // answer_mail_address
if (commAddr)
@@ -726,7 +733,7 @@ TicketMailbridgeUtils.createTicket = function(pMailObject, pFilterResult, pInbox
}
else
{
- eml.sender = mailRec || inboxUser;
+ eml.sender = mailRec || inboxUser;
}
// use individual answer, if individual answer template is set for the selected ticket template
@@ -740,7 +747,7 @@ TicketMailbridgeUtils.createTicket = function(pMailObject, pFilterResult, pInbox
{
eml.body = StringUtils.replaceAll(bodyDocuTempl.toString(), "{@Service@}", DocumentTemplateUtils.getTemplate(answerMail, false));
}
-
+
eml.subject = ticketSub +" ["+ ticketCode +"]";
eml.toRecipients = [persFrom];
@@ -773,14 +780,15 @@ TicketMailbridgeUtils.createTicket = function(pMailObject, pFilterResult, pInbox
//start workflow
var workflowKey = pInboxObj["mailSignatureID"][4]; // workflow
- if(workflowKey){
- var processVariables = {
+ if(workflowKey)
+ {
+ var processVariables =
+ {
"targetId": ticketID,
"targetContext": "SupportTicket"
};
workflow.startProcessByKey(workflowKey, processVariables);
}
-
}
@@ -814,6 +822,7 @@ TicketMailbridgeUtils.useFiler = function(pInboxObj, pMailObject, pTicketfromOld
componentType = pMailObject[mail.MAIL_TEXT] || " ";
break;
case "SUBJECT":
+ case "SUBJECT_BODY":
componentType = pMailObject[mail.MAIL_SUBJECT] || " ";
break;
case "RECIPIENT":
@@ -835,15 +844,27 @@ TicketMailbridgeUtils.useFiler = function(pInboxObj, pMailObject, pTicketfromOld
scoreObject["scoreData"].push([prioCriteria, tickettemplateId]); // Adding Score to Object
categoriesFormatted += translate.text("Search term") + " '" + searchTerm.toString() +"' " + translate.text("determined in") + " "+ KeywordUtils.getViewValue($KeywordRegistry.inboxFilterComponent(), component) + "\n";
}
- }
+ // If subject and body are selected for search, repeat process with body
+ if (component == "SUBJECT_BODY")
+ {
+ componentType = pMailObject[mail.MAIL_TEXT]
+ var score = text.analyzeText(componentType, patternArr, false);
+ if(score[searchTerm] > 0)
+ {
+ scoreObject["scoreData"] = scoreObject["scoreData"] || [];
+ scoreObject["scoreData"].push([prioCriteria, tickettemplateId]); // Adding Score to Object
+ categoriesFormatted += translate.text("Search term") + " '" + searchTerm.toString() +"' " + translate.text("determined in") + " "+ KeywordUtils.getViewValue($KeywordRegistry.inboxFilterComponent(), component) + "\n";
+ }
+ }
+ }
scoreObject["CategoryLogInfo"] = categoriesFormatted;
this.createTicket(pMailObject ,scoreObject, pInboxObj, pTicketfromOldOne);
-
}
-TicketMailbridgeUtils.setTicketCodeRegex = function(pRegexString){
+TicketMailbridgeUtils.setTicketCodeRegex = function(pRegexString)
+{
this.codeRegex = new RegExp(pRegexString, "g");
}
@@ -858,6 +879,7 @@ TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailO
var IDX_EXISTING_ATTRS = 1;
var IDX_ATTRIBUTEID = 0;
var attributeCountObj = {};
+
if (attributeFilters.length > 0)
{
// searches for the appropriate fix attribute filter ids
@@ -878,7 +900,8 @@ TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailO
// creates the max count object so that the maximum number of the attribute can be checked
if(attributesToInsert.length > 0)
{
- attributesToInsert.forEach(function(attribute){
+ attributesToInsert.forEach(function(attribute)
+ {
attributeIds.push(attribute[IDX_ATTRIBUTEID]);
attributeCountObj[attribute[IDX_ATTRIBUTEID]] = [0, 0]; // [maxCount, alreadyExistingAttributes]
});
@@ -891,13 +914,15 @@ TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailO
.table();
- attributeCounts.forEach(function([attributeId, maxCount]){
+ attributeCounts.forEach(function([attributeId, maxCount])
+ {
attributeCountObj[attributeId][IDX_MAX_COUNT] = maxCount;
});
var table = "AB_ATTRIBUTERELATION";
var vals = [];
- var attributeTypeIdx = {
+ var attributeTypeIdx =
+ {
"CHAR_VALUE": 1,
"ID_VALUE": 2,
"DATE_VALUE": 3,
@@ -905,7 +930,8 @@ TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailO
"INT_VALUE": 5
}
- attributesToInsert.forEach(function(attribute){
+ attributesToInsert.forEach(function(attribute)
+ {
// if there is no maximum count or the maximum count of the attribute has not been exceeded the attribute will be inserted
if(attributeCountObj[attribute[IDX_ATTRIBUTEID]][IDX_MAX_COUNT] == 0 ||
attributeCountObj[attribute[IDX_ATTRIBUTEID]][IDX_EXISTING_ATTRS] <
@@ -925,7 +951,6 @@ TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailO
}
});
-
new db.inserts(inserts);
}
}
@@ -933,8 +958,6 @@ TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailO
{
TicketMailbridgeUtils.insertLog(pTicketID, translate.text("Attribute determination") + ":\n" + logMessage);
}
-
-
}
/*
@@ -949,8 +972,8 @@ TicketMailbridgeUtils.checkAttributeFilters = function(pAttributeFilters, pMailO
{
var filterResult;
- pAttributeFilters.forEach(function([attributeFilterId, component, searchterm]){
-
+ pAttributeFilters.forEach(function([attributeFilterId, component, searchterm])
+ {
var textToSearch;
searchterm = searchterm || "";
diff --git a/process/migrateCommunicationType_serverProcess/documentation.adoc b/process/migrateCommunicationType_serverProcess/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..269ad41d6c6d1dc08a305c2d458c34167945a936
--- /dev/null
+++ b/process/migrateCommunicationType_serverProcess/documentation.adoc
@@ -0,0 +1,4 @@
+= Communication Type Migration
+This process can be used to, either directly migrate the communications in the database.
+
+All communications of type contact will be transformed in to "Person" and "Organisation".
\ No newline at end of file
diff --git a/process/migrateCommunicationType_serverProcess/migrateCommunicationType_serverProcess.aod b/process/migrateCommunicationType_serverProcess/migrateCommunicationType_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ac81315020b25afcec16d7f91eb53b4e6cd1978a
--- /dev/null
+++ b/process/migrateCommunicationType_serverProcess/migrateCommunicationType_serverProcess.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>migrateCommunicationType_serverProcess</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/process/migrateCommunicationType_serverProcess/documentation.adoc</documentation>
+ <process>%aditoprj%/process/migrateCommunicationType_serverProcess/process.js</process>
+ <alias>Data_alias_noAudit</alias>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/migrateCommunicationType_serverProcess/process.js b/process/migrateCommunicationType_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..677a28d8793c9992a46548bb5c618a86a0a1d068
--- /dev/null
+++ b/process/migrateCommunicationType_serverProcess/process.js
@@ -0,0 +1,23 @@
+import("Contact_lib");
+import("KeywordRegistry_basic");
+import("system.logging");
+import("system.db");
+import("system.vars");
+import("system.util");
+import("system.text");
+import("Sql_lib");
+
+var communications = newSelect(["COMMUNICATION.COMMUNICATIONID", ContactUtils.getContextBySubsql("COMMUNICATION.OBJECT_ROWID")])
+.from("COMMUNICATION")
+.where("COMMUNICATION.OBJECT_TYPE", 'Contact')
+.table();
+
+communications.map(function (pCommunication) {
+ return newWhereIfSet("COMMUNICATION.COMMUNICATIONID", pCommunication[0])
+ .buildUpdateStatement({
+ "COMMUNICATION.OBJECT_TYPE" : pCommunication[1]
+ }, "COMMUNICATION");
+});
+
+let migratedCommunications = db.updates(communications)
+logging.log("Migrate " + migratedCommunications + " of " + communications.length + " communications.");
diff --git a/process/migrateTask/process.js b/process/migrateTask/process.js
index d4b0cc4cac116f044ea8c3d033030d988e60304c..8ecf69cdba13774d423d9d7e9bab36aaecb7848a 100644
--- a/process/migrateTask/process.js
+++ b/process/migrateTask/process.js
@@ -24,7 +24,7 @@ oldTasks.forEach(function (pTask) {
logging.log(text.text2html(pTask[0], true));
statements.push(newWhereIfSet("TASK.TASKID", pTask[1])
.buildUpdateStatement({
- "TASK.DESCRIPTION" : text.text2html(pTask[0], true)
+ "DESCRIPTION" : text.text2html(pTask[0], true)
}, "TASK"));
statements.push(new SqlBuilder().buildInsertStatement({
diff --git a/process/mosaico_rest/process.js b/process/mosaico_rest/process.js
index 8674e22c97ce68f7f1f013c100f79cbd7ba2b990..418ea4b277fb390df97ad304bc2e97d6d51efe2f 100644
--- a/process/mosaico_rest/process.js
+++ b/process/mosaico_rest/process.js
@@ -1,3 +1,4 @@
+import("Keyword_lib");
import("system.vars");
import("Placeholder_lib");
import("Binary_lib");
@@ -82,6 +83,7 @@ function restget(pRequest)
responseBody.links = _getMosaicoLinks();
responseBody.placeholders = _getMosaicoPlaceholders(userName);
+ responseBody.colors = KeywordUtils.getEntryArray($KeywordRegistry.mosaicoColor());
if(responseBody.hasOwnProperty("metadata"))
{
diff --git a/process/process_audit/process.js b/process/process_audit/process.js
index 234137317a0ec9c4d0b543e8be72f9117ca2b3bd..ec9a0b75fafc881e0cbf508a87a3560a742aa262 100644
--- a/process/process_audit/process.js
+++ b/process/process_audit/process.js
@@ -25,17 +25,6 @@ if (sqlAction != 'X')
}
}
-if(sqlAction == 'I' && tableName == 'DISTRICTCONTACT'){
- try
- {
- DistrictUtils.notificateNewDistrictContact(id);
- }
- catch(err)
- {
- logging.log("Error while district notification:" + err);
- }
-}
-
try
{
(new AuditUpdateSyncEntries(tableName, userLogin, columns, newvalues, oldvalues, timestamp, sqlAction, id)).execute();
diff --git a/process/redirect_rest/process.js b/process/redirect_rest/process.js
index 990ccc2701ee7391dc1179763e324c6425d98bc5..eb1da60e6fc71fb4c8eca92f8bf88c0a795b13c5 100644
--- a/process/redirect_rest/process.js
+++ b/process/redirect_rest/process.js
@@ -1,21 +1,59 @@
+import("KeywordRegistry_basic");
+import("Sql_lib");
import("Workflow_lib");
import("Util_lib");
import("system.util");
import("Bulkmail_lib");
import("UserAgentParser_lib");
+import("system.workflow");
function restget (pRequest)
{
var request = JSON.parse(pRequest);
var linkId = request.query.link;
var mailLogId = request.query.log;
+ var workflowInstanceId = request.query.workflowinstance;
+ var workflowKey = request.query.workflowkey
var ipAddress = BulkMailUtils.getIpAddressFromHeader(request.header);
- var redirectLink = BulkMailUtils.getRedirectLink(linkId);
+ var origin =request.header["X-forwarded-proto"]+"://"+request.header["X-forwarded-host"]
+ var redirectLink = BulkMailUtils.getRedirectLink(linkId, origin);
var UserAgentObject = new UAParser(request.header["User-agent"]).getResult();
BulkMailUtils.insertClick(mailLogId, ipAddress, linkId, UserAgentObject.browser.name, UserAgentObject.os.name, UserAgentObject.device.type);
+
+ var skipNewWorkflow = false;
+
+ var linkWorkflowKey = newSelect("WORKFLOWPROCESSDEFINITION_KEY")
+ .from("WEBLINK")
+ .where("WEBLINK.WEBLINKID",linkId)
+ .and("WEBLINK.ACTION_TYPE",$KeywordRegistry.weblinkActionType$startWorkflow())
+ .cell(true);
+
+ //temporary workaround for sending events to a specific workflowinstance not working:
+ //when the same workflow is triggered in a mailing send by itself we continue it
+ //by completing a task instead of starting a new one
+ if(workflowInstanceId && workflowKey == linkWorkflowKey)
+ {
+ skipNewWorkflow = true;
- BulkMailUtils.startBulkmailWorkFlow(mailLogId, linkId);
+ var loadConfig = workflow.createConfigForLoadingProcessInstances().processInstanceIds([workflowInstanceId]);
+ var workflowData = JSON.parse(workflow.getProcessInstances(loadConfig));
+ if(workflowData[0] && workflowData[0].key == workflowKey)
+ {
+ var taskConfig = workflow.createConfigForLoadingTasks().active(true).processInstanceId(workflowInstanceId);
+ var tasks = JSON.parse(workflow.getTasks(taskConfig));
+ tasks.forEach(function(task)
+ {
+ workflow.completeTask(task.id,{});
+ });
+ }
+ }
+
+ if(!skipNewWorkflow)
+ {
+ BulkMailUtils.startBulkmailWorkFlow(mailLogId, linkId);
+ }
+
if (redirectLink)
{
diff --git a/process/register_rest/process.js b/process/register_rest/process.js
index ecc5f3f8f04262f8921e5327b1ef969cbe8afc6d..cc8f61fe80e87b105d4fdd65e72690493b097489 100644
--- a/process/register_rest/process.js
+++ b/process/register_rest/process.js
@@ -15,8 +15,7 @@ function restget (pRequest)
var salutation = request.query.salutation;
var mailAddress = request.query.mailaddress;
var workflowKey = request.query.workflow;
-
-
+
if (mailAddress)
{
var contactid = _findPerson(firstname, lastname, mailAddress);
@@ -29,13 +28,15 @@ function restget (pRequest)
{
var origin =request.header["X-forwarded-proto"]+"://"+request.header["X-forwarded-host"]
var variables = {
- "targetId":contactid,
- "senderName" : "admin",
- "recipientEmail":mailAddress,
- "originUrl":origin.toString(),
- "mailSubject":translate.text("Your newsletter registration")};
+ "targetId": contactid,
+ "senderName": "admin",
+ "recipientEmail": mailAddress,
+ "originUrl": origin.toString(),
+ "mailSubject": translate.text("Your newsletter registration"),
+ "workflowKey": workflowKey};
workflow.startProcessByKey(workflowKey, variables);
+
}
}
return JSON.stringify(request);
diff --git a/report/Salesorder_report/reportData.jrxml b/report/Salesorder_report/reportData.jrxml
index de40d4296db8e207a4f843841e4601ca1eda934b..5c64bc17c53b7f3e1a036c4350d805ffc248890a 100644
--- a/report/Salesorder_report/reportData.jrxml
+++ b/report/Salesorder_report/reportData.jrxml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="Beleg" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
- <property name="ireport.zoom" value="2.3579476910000023"/>
- <property name="ireport.x" value="29"/>
- <property name="ireport.y" value="905"/>
+ <property name="ireport.zoom" value="1.5"/>
+ <property name="ireport.x" value="0"/>
+ <property name="ireport.y" value="463"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Artikelbezeichnung" class="java.lang.String"/>
<parameter name="Artikel-Nr" class="java.lang.String"/>
@@ -27,7 +27,7 @@
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
<parameter name="TOTAL" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\Entwicklung\\2020.2\\project\\basic2\\report\\Salesorder_report\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\dev\\project\\xRM-Basic\\report\\Salesorder_report\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object" isForPrompting="false"/>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
@@ -89,35 +89,35 @@
<textFieldExpression><![CDATA[$P{SALESORDERAddr}]]></textFieldExpression>
</textField>
<textField>
- <reportElement x="347" y="0" width="100" height="15" uuid="358dc7c8-e5fe-430d-bd83-a2d76d2e2179"/>
+ <reportElement x="449" y="0" width="105" height="15" uuid="358dc7c8-e5fe-430d-bd83-a2d76d2e2179"/>
<textElement>
<font size="8" isBold="true"/>
</textElement>
<textFieldExpression><![CDATA[$P{OrderType}]]></textFieldExpression>
</textField>
<textField>
- <reportElement x="347" y="20" width="50" height="15" uuid="f27d5581-b73b-4a1c-97fe-809debd77775"/>
+ <reportElement x="449" y="20" width="50" height="15" uuid="f27d5581-b73b-4a1c-97fe-809debd77775"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Number}]]></textFieldExpression>
</textField>
<textField>
- <reportElement x="348" y="35" width="50" height="15" uuid="731882eb-328c-4e30-b44a-fd17b8a8b95a"/>
+ <reportElement x="450" y="35" width="50" height="15" uuid="731882eb-328c-4e30-b44a-fd17b8a8b95a"/>
<textElement>
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$P{Date}]]></textFieldExpression>
</textField>
<textField>
- <reportElement x="397" y="20" width="55" height="15" uuid="14ec5c0b-29bf-4719-95c0-05e3779175b6"/>
+ <reportElement x="499" y="20" width="55" height="15" uuid="14ec5c0b-29bf-4719-95c0-05e3779175b6"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
<textFieldExpression><![CDATA[$F{ORDERCODE}]]></textFieldExpression>
</textField>
<textField>
- <reportElement x="397" y="35" width="55" height="15" uuid="3451e207-2ac2-4045-b2be-0d1476b21380"/>
+ <reportElement x="499" y="35" width="55" height="15" uuid="3451e207-2ac2-4045-b2be-0d1476b21380"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
@@ -182,9 +182,7 @@
<textFieldExpression><![CDATA[$P{Amount}]]></textFieldExpression>
</textField>
<textField isStretchWithOverflow="true">
- <reportElement x="330" y="9" width="53" height="15" uuid="b0482e3e-3e46-4867-bef5-69febaa17928">
- <printWhenExpression><![CDATA[!$P{anzahl}.equals("0")]]></printWhenExpression>
- </reportElement>
+ <reportElement x="330" y="9" width="53" height="15" uuid="b0482e3e-3e46-4867-bef5-69febaa17928"/>
<textElement textAlignment="Right">
<font size="8"/>
</textElement>
@@ -409,7 +407,7 @@
<pageFooter>
<band height="46" splitType="Stretch">
<textField pattern="EEEEE dd MMMMM yyyy">
- <reportElement x="370" y="24" width="83" height="20" forecolor="#999999" uuid="07424005-2256-4514-a2da-6b00b8e5e5c9"/>
+ <reportElement x="319" y="24" width="134" height="20" forecolor="#999999" uuid="07424005-2256-4514-a2da-6b00b8e5e5c9"/>
<textElement>
<font size="8"/>
</textElement>