diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 77248a98d35b3a662e3f84ab23a14062e553f082..9d93f1adf9ff6c4c939810f149808f61a49d2641 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Tue Jun 18 13:20:50 CEST 2019
-version=5.1.17
+#Thu Jun 27 07:34:31 CEST 2019
+version=5.1.18
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml
index bb786527e4b9ae046d8e63dce9123e8ad696779f..98df295df48c2495602c943e560ca4ce794ceaac 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/extendKeywordOrganisationType.xml
@@ -11,7 +11,7 @@
</update>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7ac75d3d-243c-49d2-9f50-25403fab003a"/>
- <column name="KEYID" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+ <column name="KEYID" value="ORGMANUF"/>
<column name="TITLE" value="Manufacturer"/>
<column name="CONTAINER" value="OrganisationType"/>
<column name="SORTING" valueNumeric="3"/>
@@ -29,7 +29,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="45438bcf-74cf-408f-bc4d-5d70595369c8"/>
- <column name="KEYID" value="e9f133a7-27b4-4ce1-ab93-03876ec3de61"/>
+ <column name="KEYID" value="ORGPARTNER"/>
<column name="TITLE" value="Partner"/>
<column name="CONTAINER" value="OrganisationType"/>
<column name="SORTING" valueNumeric="5"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
index c3b1b17794e650d31c496f887a3af8f594684d25..2e96c0c73f54b0f1bc0e2d46e18159c73cf9c5f5 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ActivityCategory.xml
@@ -11,7 +11,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="94529505-1913-4827-9812-026053bfcb51"/>
- <column name="KEYID" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="KEYID" value="VISIT"/>
<column name="TITLE" value="Visit"/>
<column name="CONTAINER" value="ActivityCategory"/>
<column name="SORTING" valueNumeric="0"/>
@@ -27,7 +27,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3b677654-84e2-4b9c-b5d0-ed2b359c45af"/>
- <column name="KEYID" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="KEYID" value="MAIL"/>
<column name="TITLE" value="E-Mail"/>
<column name="CONTAINER" value="ActivityCategory"/>
<column name="SORTING" valueNumeric="1"/>
@@ -43,7 +43,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6febeb71-a8a4-400c-80fd-da27ac935260"/>
- <column name="KEYID" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="KEYID" value="PHONE"/>
<column name="TITLE" value="Phone"/>
<column name="CONTAINER" value="ActivityCategory"/>
<column name="SORTING" valueNumeric="2"/>
@@ -59,7 +59,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="68c3b1f7-2555-4d3b-a252-7df978173884"/>
- <column name="KEYID" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+ <column name="KEYID" value="ONLINE-MEETING"/>
<column name="TITLE" value="Online-Meeting"/>
<column name="CONTAINER" value="ActivityCategory"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
index 05ba4b1d3994ba0f914d96dfc5ad2e08461876ee..38fae576ae0d2683bf922e746e4983b006a3c799 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_AddressType.xml
@@ -18,7 +18,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="49bb6904-dd20-4ede-aaff-ae80131ed274"/>
- <column name="KEYID" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="KEYID" value="OFFICEADDR"/>
<column name="TITLE" value="Office address"/>
<column name="CONTAINER" value="AddressType"/>
<column name="SORTING" valueNumeric="1"/>
@@ -40,7 +40,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="5213a48a-b6d2-47ee-8409-a4af7477535f"/>
- <column name="KEYID" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="KEYID" value="HOMEADDR"/>
<column name="TITLE" value="Home address"/>
<column name="CONTAINER" value="AddressType"/>
<column name="SORTING" valueNumeric="2"/>
@@ -62,7 +62,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="045d0567-4535-4d22-84f2-95b3b0e23000"/>
- <column name="KEYID" value="cf1c4cab-d24e-4690-ba52-54bae711cd47"/>
+ <column name="KEYID" value="DELIVERADDR"/>
<column name="TITLE" value="Delivery address"/>
<column name="CONTAINER" value="AddressType"/>
<column name="SORTING" valueNumeric="3"/>
@@ -84,7 +84,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="e62da2f2-6352-4660-b2ff-1e8a552d298a"/>
- <column name="KEYID" value="dd0ddde2-9add-4309-b3ef-0f1dfb6d4aac"/>
+ <column name="KEYID" value="POSTADDR"/>
<column name="TITLE" value="Post office box"/>
<column name="CONTAINER" value="AddressType"/>
<column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
index 14da74fff976569710a26ebb18a7b23bded7a802..f03f93fd3ed0c0c9a3c284fbab8d866be95b26bd 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMedium.xml
@@ -18,7 +18,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cc16d938-b95f-4e07-a3b4-73f8524bb664"/>
- <column name="KEYID" value="1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79"/>
+ <column name="KEYID" value="COMMMOBIL"/>
<column name="TITLE" value="Mobil"/>
<column name="CONTAINER" value="CommunicationMedium"/>
<column name="SORTING" valueNumeric="0"/>
@@ -40,7 +40,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="66950de5-fa8b-465c-8db1-4eb7aac98bd3"/>
- <column name="KEYID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="KEYID" value="COMMEMAIL"/>
<column name="TITLE" value="E-Mail"/>
<column name="CONTAINER" value="CommunicationMedium"/>
<column name="SORTING" valueNumeric="1"/>
@@ -62,7 +62,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="aa2b9cc9-3e87-4fe9-98a2-a4e417a3324f"/>
- <column name="KEYID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="KEYID" value="COMMPHONE"/>
<column name="TITLE" value="Phone"/>
<column name="CONTAINER" value="CommunicationMedium"/>
<column name="SORTING" valueNumeric="2"/>
@@ -84,8 +84,8 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cfebe176-0a64-428d-b0ec-bba454d2ca3e"/>
- <column name="KEYID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
- <column name="TITLE" value="Internet"/>
+ <column name="KEYID" value="COMMINTERNET"/>
+ <column name="TITLE" value="Website"/>
<column name="CONTAINER" value="CommunicationMedium"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
@@ -103,91 +103,68 @@
<column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
<column name="CHAR_VALUE" value="LINK"/>
</insert>
- <rollback>
- <delete tableName="AB_KEYWORD_ATTRIBUTE">
- <where>AB_KEYWORD_ATTRIBUTEID = ?</where>
- <whereParams>
- <param value="7250ff28-1d48-41cc-bb36-8c33ace341bb" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTE">
- <where>AB_KEYWORD_ATTRIBUTEID = ?</where>
- <whereParams>
- <param value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="cc16d938-b95f-4e07-a3b4-73f8524bb664" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="66950de5-fa8b-465c-8db1-4eb7aac98bd3" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="688fe492-d5df-4af0-8bfe-8a7a4b6946d2" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="e1581c4e-24c6-4461-9340-7b69f5a32a58" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="aa2b9cc9-3e87-4fe9-98a2-a4e417a3324f" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="ace352ee-b9ba-47eb-a55d-4619a4b41e61" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="283695a0-1896-4500-a284-b8fd8c9a38ce" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="cfebe176-0a64-428d-b0ec-bba454d2ca3e" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="22b05555-f152-40e2-8ec8-9c1740fcc0e9" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="0b12da28-e132-4a91-a9ca-beceb811fa44" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="135eef4c-4c98-4f6a-8b9d-a5dee5b60d31" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <where>AB_KEYWORD_ATTRIBUTERELATIONID = ?</where>
- <whereParams>
- <param value="42e5f9eb-a1f7-4aba-81b6-507a935de624" />
- </whereParams>
- </delete>
- </rollback>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="d80c3689-7e0a-45ac-801d-91d199c08bd5"/>
+ <column name="CONTAINER" value="CommunicationMedium"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="KEYID" value="COMMBLOG"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="TITLE" value="Blog"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="780b5026-25f2-4d7e-83e5-aa9c43fbcb29"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="d80c3689-7e0a-45ac-801d-91d199c08bd5"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+ <column name="CHAR_VALUE" value="OTHER"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9af39b77-447f-4e45-8e82-808b75505560"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="d80c3689-7e0a-45ac-801d-91d199c08bd5"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+ <column name="CHAR_VALUE" value="LINK"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="e6c36792-763d-44f8-8afe-157c8f158ef8"/>
+ <column name="CONTAINER" value="CommunicationMedium"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="KEYID" value="COMMXING"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="TITLE" value="Xing"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="5565d7be-ada8-4518-9630-097ad41dcbba"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="e6c36792-763d-44f8-8afe-157c8f158ef8"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+ <column name="CHAR_VALUE" value="OTHER"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9f4265b5-4081-4141-9389-4867bb00dc04"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="e6c36792-763d-44f8-8afe-157c8f158ef8"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+ <column name="CHAR_VALUE" value="LINK"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="7abf7fc5-08a1-4bae-b0ca-ec5e406d154c"/>
+ <column name="CONTAINER" value="CommunicationMedium"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ <column name="KEYID" value="COMMLINKEDIN"/>
+ <column name="SORTING" valueNumeric="7"/>
+ <column name="TITLE" value="LinkedIn"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2eeeb45d-b101-4023-b5f2-5f54a4c485ee"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="7abf7fc5-08a1-4bae-b0ca-ec5e406d154c"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="7250ff28-1d48-41cc-bb36-8c33ace341bb"/>
+ <column name="CHAR_VALUE" value="OTHER"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9f440408-ccd9-4bc7-bd19-93ded0748a02"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="7abf7fc5-08a1-4bae-b0ca-ec5e406d154c"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="3ea2ea72-e615-4e77-befb-e664fa5ec4e1"/>
+ <column name="CHAR_VALUE" value="LINK"/>
+ </insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
index d8d795d2d8684c4ec60a7b1e728f93433efd5538..c9f6397ead225fa63119c38593e29da5df5ef2e1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_CommunicationMediumCampaign.xml
@@ -18,7 +18,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2acd3694-ccef-4d0b-ae7a-b3d31f8d9cc0"/>
- <column name="KEYID" value="97a53bf1-0862-4973-a774-d2b8eeb78006"/>
+ <column name="KEYID" value="CAMPAIGNPHONE"/>
<column name="TITLE" value="Phone"/>
<column name="CONTAINER" value="CommunicationMediumCampaign"/>
<column name="SORTING" valueNumeric="0"/>
@@ -40,7 +40,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cb07397b-a976-4960-b8e5-9edf189c5caf"/>
- <column name="KEYID" value="8d25a426-808d-4f57-8637-7319f3b4be41"/>
+ <column name="KEYID" value="CAMPAIGNEMAIL"/>
<column name="TITLE" value="E-Mail"/>
<column name="CONTAINER" value="CommunicationMediumCampaign"/>
<column name="SORTING" valueNumeric="1"/>
@@ -62,7 +62,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="990a03e0-aeb4-4bdb-9d22-09b66eee6b85"/>
- <column name="KEYID" value="accb9390-757a-4549-9c03-7c8219260055"/>
+ <column name="KEYID" value="CAMPAIGNLETTER"/>
<column name="TITLE" value="Letter"/>
<column name="CONTAINER" value="CommunicationMediumCampaign"/>
<column name="SORTING" valueNumeric="2"/>
@@ -84,7 +84,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="51085b8b-ded0-4d1d-9e85-ae89bd1480fe"/>
- <column name="KEYID" value="1f1bd64b-da10-4c81-84fd-9fa57dff736e"/>
+ <column name="KEYID" value="CAMPAIGNFAX"/>
<column name="TITLE" value="Fax"/>
<column name="CONTAINER" value="CommunicationMediumCampaign"/>
<column name="SORTING" valueNumeric="3"/>
@@ -106,7 +106,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b72ba2f5-612b-4ef6-832e-62089892b8d7"/>
- <column name="KEYID" value="fbf68c7e-655d-42ca-a279-6606004cafe4"/>
+ <column name="KEYID" value="CAMPAIGNSMS"/>
<column name="TITLE" value="SMS"/>
<column name="CONTAINER" value="CommunicationMediumCampaign"/>
<column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml
index e63bb7ba7d4a32faf22bc6e1f01365c7672d7b33..24ac0fa622c7956d54eab284f100d13dd93b6b95 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactContactrole.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="767b89c6-2461-4d0e-9b7a-dda33e5090c9"/>
- <column name="KEYID" value="47abd1f8-d449-4d81-9e6d-c48783119b0b"/>
+ <column name="KEYID" value="CONTACTROLEMANAGING"/>
<column name="TITLE" value="Managing director"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2fa7cddb-1e2c-438f-8f16-92f245af09f4"/>
- <column name="KEYID" value="07ec8a18-c830-4982-a4c6-d2795841b07a"/>
+ <column name="KEYID" value="CONTACTROLEPURCHASING"/>
<column name="TITLE" value="Purchasing manager"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="67ea4d33-b683-4a04-b2e3-4af54d6debcb"/>
- <column name="KEYID" value="91411987-8700-43d7-a101-4bd375c6e3af"/>
+ <column name="KEYID" value="CONTACTROLEEXECUTIVE"/>
<column name="TITLE" value="Executive board"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d7be200e-ffc0-47a7-b0bb-3da92f39b993"/>
- <column name="KEYID" value="bd0c1b58-6c8c-42a4-b68b-7099ef05bc0e"/>
+ <column name="KEYID" value="CONTACTROLEMARKETING"/>
<column name="TITLE" value="Marketing manager"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3b836d42-9ecf-49b9-8df9-570c27860c01"/>
- <column name="KEYID" value="97d0d10d-14a2-4d85-908d-ea14624b2bfd"/>
+ <column name="KEYID" value="CONTACTROLESALES"/>
<column name="TITLE" value="Sales manager"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="4"/>
@@ -54,7 +54,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2a4e6516-8493-4dde-a9df-bf2efd4db0c8"/>
- <column name="KEYID" value="9c3aea50-b402-4e51-b48d-bfc50c107232"/>
+ <column name="KEYID" value="CONTACTROLESUPERVISORY"/>
<column name="TITLE" value="Supervisory board"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="5"/>
@@ -64,7 +64,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3e7f2a42-ad8b-48da-aa11-95525ca36d01"/>
- <column name="KEYID" value="7b71b7e0-fb4a-4557-a4ab-7122574b292b"/>
+ <column name="KEYID" value="CONTACTROLEADMIN"/>
<column name="TITLE" value="Administrator"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="6"/>
@@ -74,7 +74,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="11c05d41-78ec-4d7c-acbe-f94912f2386c"/>
- <column name="KEYID" value="6d6f2261-2dbd-445a-9189-18418e7c44ef"/>
+ <column name="KEYID" value="CONTACTROLEIT"/>
<column name="TITLE" value="IT manager"/>
<column name="CONTAINER" value="ContactContactrole"/>
<column name="SORTING" valueNumeric="7"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml
index 15f81f525dd0bcdd343a3849029af4d14c32df4b..88e2c5a79c3f3e35ae173398147de0fac4af2cc9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactDepartment.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="75bd97bc-56f3-4ea3-a132-df3cb9cda071"/>
- <column name="KEYID" value="c58a028c-772a-444f-8109-37cfde3f60a0"/>
+ <column name="KEYID" value="CONTACTDEPMANAGE"/>
<column name="TITLE" value="Management"/>
<column name="CONTAINER" value="ContactDepartment"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6e30d397-e31f-4ccb-96e9-51cf71d259fa"/>
- <column name="KEYID" value="afc7a9b8-895d-41b9-b68c-e1bdb8ba878f"/>
+ <column name="KEYID" value="CONTACTDEPSALES"/>
<column name="TITLE" value="Sales"/>
<column name="CONTAINER" value="ContactDepartment"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="722e83bc-148a-4762-abda-d491bf590bd5"/>
- <column name="KEYID" value="e00eb3fc-2c8d-46a9-990a-ed2bf1948ffe"/>
+ <column name="KEYID" value="CONTACTDEPPROD"/>
<column name="TITLE" value="Production"/>
<column name="CONTAINER" value="ContactDepartment"/>
<column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="191617b2-09cc-4fe6-bc02-1cee746285d5"/>
- <column name="KEYID" value="bde6d083-517e-45bd-8326-d84e7f8aeba0"/>
+ <column name="KEYID" value="CONTACTDEPMARKETING"/>
<column name="TITLE" value="Marketing"/>
<column name="CONTAINER" value="ContactDepartment"/>
<column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="87f97554-c335-4328-911a-345d8a9abd7d"/>
- <column name="KEYID" value="b1113c19-2f1f-4d0a-806e-b0165ecc1b4a"/>
+ <column name="KEYID" value="CONTACTDEPIT"/>
<column name="TITLE" value="IT"/>
<column name="CONTAINER" value="ContactDepartment"/>
<column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml
index 136f8bbd47dc2b9753b1cdb8d7d98cb2aa853673..a08e2ccf364093a113e9f455c7349be125af4da9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_ContactPosition.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ba369295-c717-48eb-ae76-314087375e06"/>
- <column name="KEYID" value="3308c1e5-cf4d-4934-86b7-981b8f026369"/>
+ <column name="KEYID" value="CONTACTPOSCEO"/>
<column name="TITLE" value="CEO"/>
<column name="CONTAINER" value="ContactPosition"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="dcacb175-4c8a-4941-a417-69a971f52583"/>
- <column name="KEYID" value="a4952791-73e4-41a1-8a78-5a27640ff0fd"/>
+ <column name="KEYID" value="CONTACTPOSCSO"/>
<column name="TITLE" value="CSO"/>
<column name="CONTAINER" value="ContactPosition"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1a508899-e2bf-409d-8a57-3ca31c9c832d"/>
- <column name="KEYID" value="77dcf148-112e-4251-8a0e-9e8bd811f0b7"/>
+ <column name="KEYID" value="CONTACTPOSPROD"/>
<column name="TITLE" value="Production manager"/>
<column name="CONTAINER" value="ContactPosition"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml
index 895edb0305d2c1564a21eaf218aa245b8f1cffb6..d761d292198d1f8eeb170860766907dd4c2ac520 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DeliveryTerm.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9509c6b8-208a-4e97-bdcd-53642d0c7489"/>
- <column name="KEYID" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="KEYID" value="FREE"/>
<column name="TITLE" value="carriage free"/>
<column name="CONTAINER" value="DeliveryTerm"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d713c45a-6f87-4516-ae21-1d8f1c217949"/>
- <column name="KEYID" value="aa8713c9-ae12-4ce3-a588-0303cea11b44"/>
+ <column name="KEYID" value="DELIVERCIF"/>
<column name="TITLE" value="CIF"/>
<column name="CONTAINER" value="DeliveryTerm"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="410a389b-67d4-4155-8d9e-1e8d816ecfb9"/>
- <column name="KEYID" value="a4d40341-a015-4c59-9bde-f8e59582269b"/>
+ <column name="KEYID" value="DELIVEREX"/>
<column name="TITLE" value="ex works"/>
<column name="CONTAINER" value="DeliveryTerm"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/init_DocumentTemplateType.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateType.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/data/init_DocumentTemplateType.xml
rename to .liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateType.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/init_DocumentTemplateTypeCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/data/init_DocumentTemplateTypeCategory.xml
rename to .liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_DocumentTemplateTypeCategory.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
index c80273b4d5a415896841963a2a809ad144912668..9887c9db19130091d058f422e1cb6d276bdbda6e 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_OfferProbability.xml
@@ -11,7 +11,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="e14fab55-4a85-48c2-a109-125eaed9dc3f"/>
- <column name="KEYID" value="834f814d-4e31-4289-be6c-fad2dea3f2f0"/>
+ <column name="KEYID" value="0"/>
<column name="TITLE" value="0%"/>
<column name="CONTAINER" value="OfferProbability"/>
<column name="SORTING" valueNumeric="0"/>
@@ -27,7 +27,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8f55a5e3-00a9-4691-ab79-309a3eda68ec"/>
- <column name="KEYID" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+ <column name="KEYID" value="25"/>
<column name="TITLE" value="25%"/>
<column name="CONTAINER" value="OfferProbability"/>
<column name="SORTING" valueNumeric="1"/>
@@ -43,7 +43,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="808a55bc-5876-4deb-a78f-bb352c41d712"/>
- <column name="KEYID" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="KEYID" value="50"/>
<column name="TITLE" value="50%"/>
<column name="CONTAINER" value="OfferProbability"/>
<column name="SORTING" valueNumeric="2"/>
@@ -59,7 +59,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="941e60df-a4f5-4ae8-9ca1-d9f2b2d01d9d"/>
- <column name="KEYID" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+ <column name="KEYID" value="75"/>
<column name="TITLE" value="75%"/>
<column name="CONTAINER" value="OfferProbability"/>
<column name="SORTING" valueNumeric="3"/>
@@ -75,7 +75,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2f21341b-9991-4967-a785-60216ec8c25e"/>
- <column name="KEYID" value="dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb"/>
+ <column name="KEYID" value="100"/>
<column name="TITLE" value="100%"/>
<column name="CONTAINER" value="OfferProbability"/>
<column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml
index dafc82509cd4f22c65d3d16cd3b944d899e18622..fb62eb621086fe8426d7ef2cba20482d05bd8977 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_PaymentTerm.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b8409c4a-6447-408a-bd06-dfe67054a4f1"/>
- <column name="KEYID" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
+ <column name="KEYID" value="PAYTERM7"/>
<column name="TITLE" value="7 days net"/>
<column name="CONTAINER" value="PaymentTerm"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="edba1a8f-766b-4dfa-9360-1a2aca8569d6"/>
- <column name="KEYID" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="KEYID" value="PAYTERM30"/>
<column name="TITLE" value="30 days net"/>
<column name="CONTAINER" value="PaymentTerm"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ed1b3d39-9cab-4c3c-84c5-438a8b67be53"/>
- <column name="KEYID" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
+ <column name="KEYID" value="PAYTERMDISCOUNT"/>
<column name="TITLE" value="8 days 2% discount, 30 days net"/>
<column name="CONTAINER" value="PaymentTerm"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml
index 30333008faaeecbd5a76da221e63bb57ffe509d0..7de6baca0a1f969a3ecd70a04fd72c37c4f795ff 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectCompetitionState.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6a26d9c5-bc21-455e-828a-26e1b9b278da"/>
- <column name="KEYID" value="90dabaf6-b62a-4a5b-a9ff-449e5a898a24"/>
+ <column name="KEYID" value="COMPSTATEOPEN"/>
<column name="TITLE" value="Open"/>
<column name="CONTAINER" value="CompetitionState"/>
<column name="SORTING" valueNumeric="1"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="946b9f7d-c667-47a2-90f4-57935347aac5"/>
- <column name="KEYID" value="2709acc9-df9c-470b-840c-6ff89fe0bf4e"/>
+ <column name="KEYID" value="COMPSTATEPOST"/>
<column name="TITLE" value="Postponed"/>
<column name="CONTAINER" value="CompetitionState"/>
<column name="SORTING" valueNumeric="2"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="81a8a308-46e1-4cf6-8383-15736e45219c"/>
- <column name="KEYID" value="fb9d270b-a62d-4a78-a3b8-a49dc5afe36d"/>
+ <column name="KEYID" value="COMPSTATEABORT"/>
<column name="TITLE" value="Aborted"/>
<column name="CONTAINER" value="CompetitionState"/>
<column name="SORTING" valueNumeric="3"/>
@@ -34,7 +34,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f4bcb779-ea53-4ad6-bbcd-8681a3813a4c"/>
- <column name="KEYID" value="bae61bdf-ef67-4074-9db6-99a292dc8a6d"/>
+ <column name="KEYID" value="COMPSTATEPARTIAL"/>
<column name="TITLE" value="Partial order"/>
<column name="CONTAINER" value="CompetitionState"/>
<column name="SORTING" valueNumeric="4"/>
@@ -44,7 +44,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="47272e85-ae18-4bd6-950f-449bc531c5c5"/>
- <column name="KEYID" value="aa4aff7e-3c1a-4a48-95f6-297e341cb7aa"/>
+ <column name="KEYID" value="COMPSTATEORDER"/>
<column name="TITLE" value="Order"/>
<column name="CONTAINER" value="CompetitionState"/>
<column name="SORTING" valueNumeric="5"/>
@@ -54,7 +54,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c046313e-d7af-4440-a3c1-0cdf2b6220ca"/>
- <column name="KEYID" value="ff73172c-8517-4b6e-98cb-43aebacd9af1"/>
+ <column name="KEYID" value="COMPSTATELOST"/>
<column name="TITLE" value="Lost"/>
<column name="CONTAINER" value="CompetitionState"/>
<column name="SORTING" valueNumeric="6"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml
index f5216b4ba27d38367662c26a67ba838df31ed72b..9accbd43bd1c4752fce7b0a26b2582050e90e939 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectPhase.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b42caac9-8f8f-46e5-9f1c-d121cdf3ad8f"/>
- <column name="KEYID" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+ <column name="KEYID" value="SALPROJPHASENQC"/>
<column name="TITLE" value="NQC"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8a2d19c9-bc32-437e-9261-78ed30110e92"/>
- <column name="KEYID" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+ <column name="KEYID" value="SALPROJPHASEMAL"/>
<column name="TITLE" value="MAL"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="46f55a58-dbe4-40ae-9306-481df9095088"/>
- <column name="KEYID" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <column name="KEYID" value="SALPROJPHASEMQL"/>
<column name="TITLE" value="MQL"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="afa8cf58-07e8-4ee9-b24e-96cb6fa76aec"/>
- <column name="KEYID" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="KEYID" value="SALPROJPHASESAL"/>
<column name="TITLE" value="SAL"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c9483fb9-c295-43d2-94e0-8c949cf6dc47"/>
- <column name="KEYID" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+ <column name="KEYID" value="SALPROJPHASESQO"/>
<column name="TITLE" value="SQO"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="4"/>
@@ -54,7 +54,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0e8eab64-4c79-4eed-9746-0ac6fc397620"/>
- <column name="KEYID" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+ <column name="KEYID" value="SALPROJPHASEOFFER"/>
<column name="TITLE" value="Offer"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="5"/>
@@ -64,7 +64,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="405e2b7b-20c2-4824-a8b5-c7a533784ef3"/>
- <column name="KEYID" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+ <column name="KEYID" value="SALPROJPHASENEGO"/>
<column name="TITLE" value="Negotiation"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="6"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml
index 19c59bfef3859b3736d8098ec846f1cc25ad3355..e8705ad413b54602f48a5926cdd39c4d41693664 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_SalesprojectState.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="115495eb-dff4-436d-8114-b9a7644586bf"/>
- <column name="KEYID" value="23d38486-4cce-41ce-a8df-164ad44df706"/>
+ <column name="KEYID" value="SALPROJSTATPOSTPONED"/>
<column name="TITLE" value="Postponed"/>
<column name="CONTAINER" value="SalesprojectState"/>
<column name="SORTING" valueNumeric="2"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9212a797-4470-4170-b4d1-330a5d991625"/>
- <column name="KEYID" value="8916e241-9452-4541-a323-d479ad5f2e4d"/>
+ <column name="KEYID" value="SALPROJSTATABORT"/>
<column name="TITLE" value="Aborted"/>
<column name="CONTAINER" value="SalesprojectState"/>
<column name="SORTING" valueNumeric="3"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1f857be1-7de0-479f-bac8-59b22d48fe39"/>
- <column name="KEYID" value="1606cf46-a87b-4797-830e-55ebdd70a001"/>
+ <column name="KEYID" value="SALPROJSTATPARTIAL"/>
<column name="TITLE" value="Partial order"/>
<column name="CONTAINER" value="SalesprojectState"/>
<column name="SORTING" valueNumeric="4"/>
@@ -34,7 +34,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="19997ffa-bfe3-4f6a-82f8-e862acb24655"/>
- <column name="KEYID" value="130bb53a-a97e-455e-8f34-8d445e985474"/>
+ <column name="KEYID" value="SALPROJSTATORDER"/>
<column name="TITLE" value="Order"/>
<column name="CONTAINER" value="SalesprojectState"/>
<column name="SORTING" valueNumeric="5"/>
@@ -44,50 +44,12 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d8e2cc64-cc61-440e-b0fc-3d5b45d75ba0"/>
- <column name="KEYID" value="d8a60f60-a4e6-46ee-88ec-bac53e1afedd"/>
+ <column name="KEYID" value="SALPROJSTATLOST"/>
<column name="TITLE" value="Lost"/>
<column name="CONTAINER" value="SalesprojectState"/>
<column name="SORTING" valueNumeric="6"/>
<column name="ISACTIVE" valueNumeric="1"/>
<column name="ISESSENTIAL" valueNumeric="0"/>
</insert>
- <rollback>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="c6eeab06-cec9-42c3-8f11-468c7e602de4" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="115495eb-dff4-436d-8114-b9a7644586bf" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="9212a797-4470-4170-b4d1-330a5d991625" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="1f857be1-7de0-479f-bac8-59b22d48fe39" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="19997ffa-bfe3-4f6a-82f8-e862acb24655" />
- </whereParams>
- </delete>
- <delete tableName="AB_KEYWORD_ENTRY">
- <where>AB_KEYWORD_ENTRYID = ?</where>
- <whereParams>
- <param value="d8e2cc64-cc61-440e-b0fc-3d5b45d75ba0" />
- </whereParams>
- </delete>
- </rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
index aff35a4847b45ed0876ea7792fa44dca7a2bd2a8..30192dcbe9d125d1c9e9fb2acb02d34095d65859 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskPriority.xml
@@ -11,7 +11,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="97ec9a7e-a1dd-4167-bf7d-57ee3d79d46f"/>
- <column name="KEYID" value="f587f53a-72cc-4b76-9e39-276a26cab2e0"/>
+ <column name="KEYID" value="TASKPRIONONE"/>
<column name="TITLE" value="{$TASK_PRIORITY_NONE}"/>
<column name="CONTAINER" value="TaskPriority"/>
<column name="SORTING" valueNumeric="0"/>
@@ -27,7 +27,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="798c1720-901e-4eae-bab3-80f334830601"/>
- <column name="KEYID" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
+ <column name="KEYID" value="TASKPRIOLOW"/>
<column name="TITLE" value="{$TASK_PRIORITY_LOW}"/>
<column name="CONTAINER" value="TaskPriority"/>
<column name="SORTING" valueNumeric="1"/>
@@ -43,7 +43,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="53a01187-5306-4980-8c40-153e910dd115"/>
- <column name="KEYID" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <column name="KEYID" value="TASKPRIOMEDIUM"/>
<column name="TITLE" value="{$TASK_PRIORITY_NORMAL}"/>
<column name="CONTAINER" value="TaskPriority"/>
<column name="SORTING" valueNumeric="2"/>
@@ -59,7 +59,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3d17defd-5b6e-4e19-816c-f9a19aca3cc0"/>
- <column name="KEYID" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="KEYID" value="TASKPRIOHIGH"/>
<column name="TITLE" value="{$TASK_PRIORITY_HIGH}"/>
<column name="CONTAINER" value="TaskPriority"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml
index 3ece432b8883adb68b8a781a7c0a2f1295cbffa4..08f991c7c26189569e5a9c7df9821eaf47d43184 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_TaskProgress.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9887b380-8e6a-4fab-a99c-46172cb9ecc5"/>
- <column name="KEYID" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+ <column name="KEYID" value="TASKPROG0"/>
<column name="TITLE" value="0%"/>
<column name="CONTAINER" value="TaskProgress"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c228d007-5f1b-41a9-baaf-4bac444e2d63"/>
- <column name="KEYID" value="5098fde4-660f-4381-9ff5-6d29a858e68e"/>
+ <column name="KEYID" value="TASKPROG25"/>
<column name="TITLE" value="25%"/>
<column name="CONTAINER" value="TaskProgress"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9c24af78-bb51-4706-ae3c-35f450fc4034"/>
- <column name="KEYID" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="KEYID" value="TASKPROG50"/>
<column name="TITLE" value="50%"/>
<column name="CONTAINER" value="TaskProgress"/>
<column name="SORTING" valueNumeric="2"/>
@@ -34,7 +34,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="612acb5c-9cde-4229-8910-6ca6eb7bed8c"/>
- <column name="KEYID" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="KEYID" value="TASKPROG75"/>
<column name="TITLE" value="75%"/>
<column name="CONTAINER" value="TaskProgress"/>
<column name="SORTING" valueNumeric="3"/>
@@ -44,7 +44,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="711db73d-eed2-43a6-ac57-a608a831eb8d"/>
- <column name="KEYID" value="5928d5ec-d256-4088-be0c-2cdfd5a8f7fa"/>
+ <column name="KEYID" value="TASKPROG100"/>
<column name="TITLE" value="100%"/>
<column name="CONTAINER" value="TaskProgress"/>
<column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d6ef62d7277175b524ceb33eb21bab4d01259b1f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_UnlinkedMail.xml
@@ -0,0 +1,31 @@
+<?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="j.goderbauer" id="9b8cba08-c1dd-4412-b8bf-a7c341f1cbe0">
+ <createTable tableName="AB_UNLINKEDMAIL">
+ <column name="AB_UNLINKEDMAILID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_AB_UNLINKEDMAIL_AB_UNLINKEDMAILID"/>
+ </column>
+ <column name="USER_NEW" type="NVARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="DATE_NEW" type="DATETIME">
+ <constraints nullable="false"/>
+ </column>
+ <column name="USER_EDIT" type="NVARCHAR(50)" />
+ <column name="DATE_EDIT" type="DATETIME" />
+
+ <column name="SUBJECT" type="NVARCHAR(200)"/>
+ <column name="SENTDATE" type="DATETIME"/>
+ <column name="SENDER" type="NVARCHAR(1000)"/>
+ <column name="RECIPIENTS" type="NVARCHAR(4000)"/>
+ <column name="MAIL" type="NCLOB"/>
+ </createTable>
+ <createIndex indexName="IDX_AB_UNLINKEDMAILID_SENTDATE" tableName="AB_UNLINKEDMAIL">
+ <column name="SENTDATE" descending="true"/>
+ </createIndex>
+ <createIndex indexName="IDX_AB_UNLINKEDMAILID_SENDER" tableName="AB_UNLINKEDMAIL">
+ <column name="SENDER"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml
index 6d6ecabeeacc14d3d4b104e2a65ccdf4e4a9302b..d87cd04380a4c04e7e2765c6f7d4cad8c35dd70f 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/init_YesNo.xml
@@ -3,7 +3,7 @@
<changeSet author="n.bugl" id="65c6bfc8-5de5-479e-8d64-a93cffe8ce89">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="eadf3ecb-ac35-4a94-879a-f6e85a72fa29"/>
- <column name="KEYID" value="d657755e-50e8-409b-8b1e-2d8315c2307a"/>
+ <column name="KEYID" value="YESNOYES"/>
<column name="TITLE" value="Yes"/>
<column name="CONTAINER" value="YesNo"/>
<column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="4dcc3315-8a38-42d9-ba34-f8899b86ca85"/>
- <column name="KEYID" value="3389c206-5916-401b-8aa5-6ebaf012a09b"/>
+ <column name="KEYID" value="YESNONO"/>
<column name="TITLE" value="No"/>
<column name="CONTAINER" value="YesNo"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml
index 4fd7389268c4484ffa9c4768b3656607cae7cf1a..dd23fa1799c42a394d4e45357febda02958eee67 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_offer_status_keyword.xml
@@ -3,7 +3,7 @@
<changeSet author="j.hoermann" id="3e9548bd-2c3e-413f-a8b0-405d926f2790">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3c734077-8677-4732-86ef-7df01d9646b3"/>
- <column name="KEYID" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="KEYID" value="OFFERSTATOPEN"/>
<column name="TITLE" value="Open"/>
<column name="CONTAINER" value="OfferStatus"/>
<column name="SORTING" valueNumeric="-1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml
index ba9ff8eababab916e26ccb7f0c959ee8cee040f5..6365b074fa3130d0b9dc8b90bda7a7be15f06975 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/AditoBasic/insert_salesproject_state_keyword.xml
@@ -3,7 +3,7 @@
<changeSet author="j.hoermann" id="cfe5294c-5f89-4527-bd1d-ebe9d0597f63">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b0123a07-0d21-4365-9aa2-c8be18c56141"/>
- <column name="KEYID" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="KEYID" value="SALPROJSTATOPEN"/>
<column name="TITLE" value="Open"/>
<column name="CONTAINER" value="SalesprojectState"/>
<column name="SORTING" valueNumeric="-1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTE.xml b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
similarity index 99%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTE.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
index ccbf6e85d419fe80105542b309ed4156a3daa85f..60d66a0bdaf743edf78de1eef253b2d00b7c40eb 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTE.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTE.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="3e8ccb05-1f0b-4de4-894a-bbb1d07975f0">
- <delete tableName="AB_ATTRIBUTE"/>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTEUSAGE.xml b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml
similarity index 99%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTEUSAGE.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml
index 799b0a9c91f04ceb1cf67f35f2f7031f16d76030..97d385d676be03f04ed8321adac32646f2e623b1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTEUSAGE.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Attributes/AB_ATTRIBUTEUSAGE.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="97e51aa3-5472-4700-8702-d0b0720eb313">
- <delete tableName="AB_ATTRIBUTEUSAGE"/>
<insert tableName="AB_ATTRIBUTEUSAGE">
<column name="AB_ATTRIBUTEUSAGEID" value="48e9320b-b2b4-4523-bb34-e68749fe1465"/>
<column name="AB_ATTRIBUTE_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
index e970a26e5417dddbbbed5407fc254a5ee93e44e9..8e54b9eef3b41bb4c7e83cbf725f252f8aa31374 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/bulkMail_keywords.xml
@@ -4,27 +4,76 @@
<changeSet author="s.listl" id="c652301e-5510-4e1a-a39d-cdc6a3356d62">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2710c44b-73a7-4da5-b828-c7ac572ab79c"/>
- <column name="KEYID" value="9a0c5608-070e-49fb-92cd-f6abece9242d"/>
+ <column name="KEYID" value="EMAILPENDING "/>
<column name="TITLE" value="Pending"/>
- <column name="CONTAINER" value="BulkMailSentStatus"/>
+ <column name="CONTAINER" value="BulkMailRecipientStatus"/>
<column name="SORTING" valueNumeric="1"/>
<column name="ISACTIVE" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="82d04090-3ef1-4eaf-9836-0490733a078f"/>
- <column name="KEYID" value="147211fb-a1cf-49c8-8e08-c3cfe0404f9b"/>
+ <column name="KEYID" value="EMAILSENT "/>
<column name="TITLE" value="Sent"/>
- <column name="CONTAINER" value="BulkMailSentStatus"/>
+ <column name="CONTAINER" value="BulkMailRecipientStatus"/>
<column name="SORTING" valueNumeric="2"/>
<column name="ISACTIVE" valueNumeric="1"/>
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d1d6a461-1bbf-4f03-ac99-33a2d38a36e3"/>
- <column name="KEYID" value="353e27e9-7491-4bfd-b9f9-f18f2cb2a36c"/>
+ <column name="KEYID" value="EMAILFAILED "/>
<column name="TITLE" value="Failed"/>
- <column name="CONTAINER" value="BulkMailSentStatus"/>
+ <column name="CONTAINER" value="BulkMailRecipientStatus"/>
<column name="SORTING" valueNumeric="3"/>
<column name="ISACTIVE" valueNumeric="1"/>
</insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6e95db61-6991-41c8-b2bb-e2b39c38efa3"/>
+ <column name="KEYID" value="BULKMAILNOTSENT "/>
+ <column name="TITLE" value="Not sent"/>
+ <column name="CONTAINER" value="BulkMailStatus"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="250e5cd6-1842-46b1-b968-03988255eaba"/>
+ <column name="KEYID" value="BULKMAILBEINGSENT "/>
+ <column name="TITLE" value="Is being sent"/>
+ <column name="CONTAINER" value="BulkMailStatus"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+ <column name="KEYID" value="BULKMAILSENT "/>
+ <column name="TITLE" value="Sent"/>
+ <column name="CONTAINER" value="BulkMailStatus"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+ <column name="NAME" value="bulkMailIcon"/>
+ <column name="CONTAINER" value="BulkMailStatus"/>
+ <column name="TYPE" value="CHAR_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="801268a9-e93e-4481-b98d-1e37ca308e10"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="6e95db61-6991-41c8-b2bb-e2b39c38efa3"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+ <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ad58ebca-7b2a-4488-b2e0-3ab8f4740845"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="250e5cd6-1842-46b1-b968-03988255eaba"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+ <column name="CHAR_VALUE" value="VAADIN:ENVELOPE_OPEN"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="fe80ac90-af31-466a-a309-a34edb6be6cf"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="ec51253e-9b45-468d-aafa-42331e54f32b"/>
+ <column name="CHAR_VALUE" value="VAADIN:ENVELOPE"/>
+ </insert>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkMailRecipient.xml b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkMailRecipient.xml
index 69a2328ff422b7ca7bc82f221c83ac554ca454e8..2de77afced015d7ca5ddb273827314f4f4e9d26a 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkMailRecipient.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkMailRecipient.xml
@@ -9,6 +9,7 @@
<column name="BULKMAIL_ID" type="CHAR(36)"/>
<column name="CONTACT_ID" type="CHAR(36)"/>
<column name="STATUS" type="CHAR(36)"/>
+ <column name="SENTDATE" type="DATETIME"/>
</createTable>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml
index 88907bb47f2f7d8d84fb67afe27c0692cbcf8c8b..ba2bdc4fb1d1e794b0e24d2da6d1ac2de7ae22fa 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml
@@ -7,6 +7,7 @@
<constraints primaryKey="true" primaryKeyName="PK_BULKMAIL_BULKMAILID"/>
</column>
<column name="DOCUMENTTEMPLATE_ID" type="CHAR(36)"/>
+ <column name="STATUS" type="CHAR(36)"/>
<column name="DESCRIPTION" type="NVARCHAR(500)"/>
<column name="SENDER" type="NVARCHAR(50)"/>
<column name="NAME" type="NVARCHAR(50)"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml
index cce303ee3c6e5cd61f3707199c572e452cb9ab84..4693175f3eef993091d04963a813400d1735c368 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignCostCategory.xml
@@ -3,7 +3,7 @@
<changeSet author="j.hoermann" id="17b2f361-6d08-4cd7-80da-53ebf84d06fe">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="62cb479d-70b2-4cb4-91f5-5d1352f2131b"/>
- <column name="KEYID" value="74aabda2-fb1f-4ed3-adcc-9509c533b52c"/>
+ <column name="KEYID" value="PRINTCOST"/>
<column name="TITLE" value="Printing costs"/>
<column name="CONTAINER" value="CampaignManagementCostCategory"/>
<column name="SORTING" valueNumeric="1"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="73b34a7c-5921-461c-8cf5-17e3aba01bd0"/>
- <column name="KEYID" value="3c28d838-8bca-4b2d-82af-335f8a48984f"/>
+ <column name="KEYID" value="SHIPCOST"/>
<column name="TITLE" value="Shipping costs"/>
<column name="CONTAINER" value="CampaignManagementCostCategory"/>
<column name="SORTING" valueNumeric="2"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7ef45db6-9151-45da-adb9-8e7759390ecd"/>
- <column name="KEYID" value="94e04ba5-3cd4-42c2-85d7-6488dba75cf2"/>
+ <column name="KEYID" value="LAYOUTCOST"/>
<column name="TITLE" value="Layout costs"/>
<column name="CONTAINER" value="CampaignManagementCostCategory"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml
index ead502807aa3d421af1242ce059178ce8c2085ac..94a799f1352992698e96df34fea6da26fcbdbfec 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignState.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8d95cad1-3ab2-4b6c-9b38-064cb914216d"/>
- <column name="KEYID" value="e04c9c59-0590-463c-a10e-e25c583e9cf2"/>
+ <column name="KEYID" value="PLANNING"/>
<column name="TITLE" value="In planning"/>
<column name="CONTAINER" value="CampaignManagementStates"/>
<column name="SORTING" valueNumeric="1"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3e5036a1-43a1-4bb1-ad56-ed42df7c9538"/>
- <column name="KEYID" value="42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"/>
+ <column name="KEYID" value="APPROVED"/>
<column name="TITLE" value="Approved"/>
<column name="CONTAINER" value="CampaignManagementStates"/>
<column name="SORTING" valueNumeric="2"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0759da45-5a5b-4163-a3a1-6a19f5a196c5"/>
- <column name="KEYID" value="db1f6e61-07ed-4185-abdb-f9103e5ee3e6"/>
+ <column name="KEYID" value="COMPLETED"/>
<column name="TITLE" value="Completed"/>
<column name="CONTAINER" value="CampaignManagementStates"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml
index c7560f94c6359a13bcad0a3982955f6a4a49cc2f..3b4e82b84a84a880ec56ebc49e36cb0a26211561 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/CampaignManagement/create_campaignStepState.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0dc9b27b-56d8-4650-92ee-bf85a3c67cb3"/>
- <column name="KEYID" value="bbf69673-2ec6-46f8-b231-684a31be9fbd"/>
+ <column name="KEYID" value="OPEN"/>
<column name="TITLE" value="Open"/>
<column name="CONTAINER" value="CampaignManagementStepStates"/>
<column name="SORTING" valueNumeric="1"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b1f5ea38-1b8c-47a8-a8ad-4c6ed9c26cda"/>
- <column name="KEYID" value="1df0f89b-836d-4242-99cb-334764a7abac"/>
+ <column name="KEYID" value="ACTIVE"/>
<column name="TITLE" value="Active"/>
<column name="CONTAINER" value="CampaignManagementStepStates"/>
<column name="SORTING" valueNumeric="2"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="98f4cab1-74b8-4a23-a99a-c3624711beab"/>
- <column name="KEYID" value="2b9904ad-41d0-411c-8c3a-6f31d8e742b3"/>
+ <column name="KEYID" value="COMPLETED"/>
<column name="TITLE" value="Completed"/>
<column name="CONTAINER" value="CampaignManagementStepStates"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml b/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml
index ff442c628537faf786a46eeef49c72f179bc4039..2444aa086b7adef665ea576a58e8e8a22ab6fd97 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Classification/insert_classification_types.xml
@@ -3,7 +3,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="789667fe-519f-4dea-b691-62c14447d694"/>
- <column name="KEYID" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="KEYID" value="SALESPROJ"/>
<column name="TITLE" value="Salesproject"/>
<column name="CONTAINER" value="ClassificationType"/>
<column name="SORTING" valueNumeric="1"/>
@@ -13,67 +13,67 @@
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="54128957-c80b-4b5a-ad1b-cfce665dfb10"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="1. Classification"/>
<column name="SCORETYPE" value="ScoreBased"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="4977ba88-074c-4fe5-b04a-97c9a5eae982"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="1. Classification"/>
<column name="SCORETYPE" value="ScoreBranch"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="382b311e-b2b2-49da-b6e1-339afae92657"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="1. Classification"/>
<column name="SCORETYPE" value="ScoreUsers"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="d8091374-f3fd-41dc-8468-91469618c6fc"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="2. Classification"/>
<column name="SCORETYPE" value="ScoreBudget"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="2031525e-6ca3-46b4-91d4-7f90cd31a630"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="2. Classification"/>
<column name="SCORETYPE" value="ScoreCustomizing"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="2a702a31-9907-4f1b-abfd-3342640f1c9e"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="2. Classification"/>
<column name="SCORETYPE" value="ScoreStandard"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="8c1e8f81-145f-4efe-936f-3f4147f4d59a"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="3. Classification"/>
<column name="SCORETYPE" value="ScoreCloud"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="31c169aa-ba5b-4f9d-9dd3-b0d0e8d1b632"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="3. Classification"/>
<column name="SCORETYPE" value="ScoreDepartment"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="57604bc1-d99f-4d61-b28d-55218a72045b"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="3. Classification"/>
<column name="SCORETYPE" value="ScoreDecisionPhase"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="a43189fc-b712-45ed-9398-58d6e15760ca"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="3. Classification"/>
<column name="SCORETYPE" value="ScorePosition"/>
</insert>
<insert tableName="CLASSIFICATIONTYPE">
<column name="CLASSIFICATIONTYPEID" value="f4d3791e-1717-4473-987b-0cd751805387"/>
- <column name="CLASSIFICATIONTYPE" value="968eafa3-3e76-4afa-8999-878e51cc3bab"/>
+ <column name="CLASSIFICATIONTYPE" value="SALESPROJ"/>
<column name="CLASSIFICATIONGROUP" value="3. Classification"/>
<column name="SCORETYPE" value="ScoreProjectStart"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/activity_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/activity_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/activity_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/activity_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/activitylink_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/activitylink_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/activitylink_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/activitylink_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/address_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/address_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/address_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/address_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/attributerelation_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/attributerelation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/attributerelation_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/attributerelation_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/communication_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/communication_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/communication_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/communication_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/contact_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/contact_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/contact_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/contact_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/offer_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/offer_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/offer_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/offer_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/organisation_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/organisation_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/organisation_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/organisation_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/person_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/person_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/person_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/person_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/product_add_date_editnew_user_editnew.xml b/.liquibase/Data_alias/basic/2019.1.4/EditNewFields/product_add_date_editnew_user_editnew.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/product_add_date_editnew_user_editnew.xml
rename to .liquibase/Data_alias/basic/2019.1.4/EditNewFields/product_add_date_editnew_user_editnew.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml
index 35a9a912338a915f9a6dc684e2154e445d267de6..d77e73ac2fd023413b662d4c982529f7c9d31ed0 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/ActivityCategory.xml
@@ -6,19 +6,19 @@
<column name="CATEGORY" type="CHAR(36)"/>
</addColumn>
<update tableName="ACTIVITY">
- <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="CATEGORY" value="VISIT"/>
<where>CATEGORY_OLD = 0</where>
</update>
<update tableName="ACTIVITY">
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<where>CATEGORY_OLD = 1</where>
</update>
<update tableName="ACTIVITY">
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<where>CATEGORY_OLD = 2</where>
</update>
<update tableName="ACTIVITY">
- <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+ <column name="CATEGORY" value="ONLINE-MEETING"/>
<where>CATEGORY_OLD = 3</where>
</update>
<dropColumn tableName="ACTIVITY" columnName="CATEGORY_OLD"/>
@@ -30,19 +30,19 @@
</addColumn>
<update tableName="ACTIVITY">
<column name="CATEGORY" valueNumeric="0"/>
- <where>CATEGORY_OLD = '12ef155a-7be2-405a-af26-d357e5a61c25'</where>
+ <where>CATEGORY_OLD = 'VISIT'</where>
</update>
<update tableName="ACTIVITY">
<column name="CATEGORY" valueNumeric="1"/>
- <where>CATEGORY_OLD = '7c5c8f92-d40e-4204-859c-fd07467e6f8b'</where>
+ <where>CATEGORY_OLD = 'MAIL'</where>
</update>
<update tableName="ACTIVITY">
<column name="CATEGORY" valueNumeric="2"/>
- <where>CATEGORY_OLD = 'f925a037-e869-43c2-8a26-b0a7ade1964e'</where>
+ <where>CATEGORY_OLD = 'PHONE'</where>
</update>
<update tableName="ACTIVITY">
<column name="CATEGORY" valueNumeric="3"/>
- <where>CATEGORY_OLD = '150bae94-1175-4131-9320-a88dadbffcda'</where>
+ <where>CATEGORY_OLD = 'ONLINE-MEETING'</where>
</update>
<dropColumn tableName="ACTIVITY" columnName="CATEGORY_OLD"/>
</rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml
index 8b4d8e7886f04889101b906b026c473b42875045..740c7e534d9db725b18ef15b6bff02b955ab2e84 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/AddressType.xml
@@ -6,7 +6,7 @@
<column name="ADDR_TYPE" type="CHAR(36)"/>
</addColumn>
<update tableName="ADDRESS">
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<where>ADDR_TYPE_OLD = 1</where>
</update>
<update tableName="ADDRESS">
@@ -18,7 +18,7 @@
<where>ADDR_TYPE_OLD = 3</where>
</update>
<update tableName="ADDRESS">
- <column name="ADDR_TYPE" value="dd0ddde2-9add-4309-b3ef-0f1dfb6d4aac"/>
+ <column name="ADDR_TYPE" value="POSTADDR"/>
<where>ADDR_TYPE_OLD = 4</where>
</update>
<dropColumn tableName="ADDRESS" columnName="ADDR_TYPE_OLD"/>
@@ -30,7 +30,7 @@
</addColumn>
<update tableName="ADDRESS">
<column name="ADDR_TYPE" valueNumeric="1"/>
- <where>ADDR_TYPE_OLD = 'b3292432-bca2-4674-8b06-b78b2b06351e'</where>
+ <where>ADDR_TYPE_OLD = 'OFFICEADDR'</where>
</update>
<update tableName="ADDRESS">
<column name="ADDR_TYPE" valueNumeric="2"/>
@@ -42,7 +42,7 @@
</update>
<update tableName="ADDRESS">
<column name="ADDR_TYPE" valueNumeric="4"/>
- <where>ADDR_TYPE_OLD = 'dd0ddde2-9add-4309-b3ef-0f1dfb6d4aac'</where>
+ <where>ADDR_TYPE_OLD = 'POSTADDR'</where>
</update>
<dropColumn tableName="ADDRESS" columnName="ADDR_TYPE_OLD"/>
</rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml
index 56d6b71209b8c6cf46150dfb50202f0908860369..318b57592f287c4f07d566bd24b8558af27ebffb 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/CommunicationMedium.xml
@@ -6,19 +6,19 @@
<column name="MEDIUM_ID" type="CHAR(36)"/>
</addColumn>
<update tableName="COMMUNICATION">
- <column name="MEDIUM_ID" value="1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79"/>
+ <column name="MEDIUM_ID" value="COMMMOBIL"/>
<where>MEDIUM_OLD = 0</where>
</update>
<update tableName="COMMUNICATION">
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<where>MEDIUM_OLD = 1</where>
</update>
<update tableName="COMMUNICATION">
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<where>MEDIUM_OLD = 2</where>
</update>
<update tableName="COMMUNICATION">
- <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+ <column name="MEDIUM_ID" value="COMMINTERNET"/>
<where>MEDIUM_OLD = 3</where>
</update>
<dropColumn tableName="COMMUNICATION" columnName="MEDIUM_OLD"/>
@@ -30,19 +30,19 @@
</addColumn>
<update tableName="COMMUNICATION">
<column name="MEDIUM_ID" valueNumeric="0"/>
- <where>MEDIUM_OLD = '1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79'</where>
+ <where>MEDIUM_OLD = 'COMMMOBIL'</where>
</update>
<update tableName="COMMUNICATION">
<column name="MEDIUM_ID" valueNumeric="1"/>
- <where>MEDIUM_OLD = '85ee16dd-c878-4463-be6a-324c25e76764'</where>
+ <where>MEDIUM_OLD = 'COMMEMAIL'</where>
</update>
<update tableName="COMMUNICATION">
<column name="MEDIUM_ID" valueNumeric="2"/>
- <where>MEDIUM_OLD = '2f48600a-5c3f-4201-a0c6-5ce1eb9fee13'</where>
+ <where>MEDIUM_OLD = 'COMMPHONE'</where>
</update>
<update tableName="COMMUNICATION">
<column name="MEDIUM_ID" valueNumeric="3"/>
- <where>MEDIUM_OLD = 'd08956b8-369e-4b65-88fa-1c37b3368ae3'</where>
+ <where>MEDIUM_OLD = 'COMMINTERNET'</where>
</update>
<dropColumn tableName="COMMUNICATION" columnName="MEDIUM_OLD"/>
</rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml
index e6b9f3298ee8e0de24f9a3f830787f3ddf32c2cc..6ce36416580b1571631f77f1caa2a06e44a590d7 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/OfferProbability.xml
@@ -6,23 +6,23 @@
<column name="PROBABILITY" type="CHAR(36)"/>
</addColumn>
<update tableName="OFFER">
- <column name="PROBABILITY" value="834f814d-4e31-4289-be6c-fad2dea3f2f0"/>
+ <column name="PROBABILITY" value="0"/>
<where>PROBABILITY_OLD = 1</where>
</update>
<update tableName="OFFER">
- <column name="PROBABILITY" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+ <column name="PROBABILITY" value="25"/>
<where>PROBABILITY_OLD = 2</where>
</update>
<update tableName="OFFER">
- <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="PROBABILITY" value="50"/>
<where>PROBABILITY_OLD = 3</where>
</update>
<update tableName="OFFER">
- <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+ <column name="PROBABILITY" value="75"/>
<where>PROBABILITY_OLD = 4</where>
</update>
<update tableName="OFFER">
- <column name="PROBABILITY" value="dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb"/>
+ <column name="PROBABILITY" value="100"/>
<where>PROBABILITY_OLD = 5</where>
</update>
<dropColumn tableName="OFFER" columnName="PROBABILITY_OLD"/>
@@ -34,23 +34,23 @@
</addColumn>
<update tableName="OFFER">
<column name="PROBABILITY" valueNumeric="1"/>
- <where>PROBABILITY_OLD = '834f814d-4e31-4289-be6c-fad2dea3f2f0'</where>
+ <where>PROBABILITY_OLD = '0'</where>
</update>
<update tableName="OFFER">
<column name="PROBABILITY" valueNumeric="2"/>
- <where>PROBABILITY_OLD = '98ce5f41-90f5-434f-9e72-cdac4a0f5214'</where>
+ <where>PROBABILITY_OLD = '25'</where>
</update>
<update tableName="OFFER">
<column name="PROBABILITY" valueNumeric="3"/>
- <where>PROBABILITY_OLD = 'c510907f-8478-471e-b702-5008908504bd'</where>
+ <where>PROBABILITY_OLD = '50'</where>
</update>
<update tableName="OFFER">
<column name="PROBABILITY" valueNumeric="4"/>
- <where>PROBABILITY_OLD = '2dca6f38-b49a-4716-8c83-9d2183c5c065'</where>
+ <where>PROBABILITY_OLD = '75'</where>
</update>
<update tableName="OFFER">
<column name="PROBABILITY" valueNumeric="5"/>
- <where>PROBABILITY_OLD = 'dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb'</where>
+ <where>PROBABILITY_OLD = '100'</where>
</update>
<dropColumn tableName="OFFER" columnName="PROBABILITY_OLD"/>
</rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
index 22a289d2cea610e547f33c32bf3c72ff8dbc7526..c32de811b1cce224362353cc40b2e5a98cfaa510 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectCompetitionPhase.xml
@@ -6,31 +6,31 @@
<column name="PHASE" type="CHAR(36)"/>
</addColumn>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="PHASE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+ <column name="PHASE" value="SALPROJPHASENQC"/>
<where>PHASE_OLD = 1</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="PHASE" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+ <column name="PHASE" value="SALPROJPHASEMAL"/>
<where>PHASE_OLD = 2</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="PHASE" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <column name="PHASE" value="SALPROJPHASEMQL"/>
<where>PHASE_OLD = 3</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="PHASE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="PHASE" value="SALPROJPHASESAL"/>
<where>PHASE_OLD = 4</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+ <column name="PHASE" value="SALPROJPHASESQO"/>
<where>PHASE_OLD = 5</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="PHASE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+ <column name="PHASE" value="SALPROJPHASEOFFER"/>
<where>PHASE_OLD = 6</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="PHASE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+ <column name="PHASE" value="SALPROJPHASENEGO"/>
<where>PHASE_OLD = 7</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
@@ -78,31 +78,31 @@
</addColumn>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="1"/>
- <where>PHASE_OLD = '9f7d1fa9-7c09-4037-8f7c-8458def14d89'</where>
+ <where>PHASE_OLD = 'SALPROJPHASENQC'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="2"/>
- <where>PHASE_OLD = '292628f1-d9a5-432d-8130-f6690c14a5d4'</where>
+ <where>PHASE_OLD = 'SALPROJPHASEMAL'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="3"/>
- <where>PHASE_OLD = '4467b33c-3a68-4c8b-ba4a-1eb666a6c774'</where>
+ <where>PHASE_OLD = 'SALPROJPHASEMQL'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="4"/>
- <where>PHASE_OLD = '1e42f183-fb97-415f-9917-b43ca159fde4'</where>
+ <where>PHASE_OLD = 'SALPROJPHASESAL'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="5"/>
- <where>PHASE_OLD = '972a41dc-a8ae-43cd-a03b-522ea84efbfb'</where>
+ <where>PHASE_OLD = 'SALPROJPHASESQO'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="6"/>
- <where>PHASE_OLD = '60d09bb1-7e02-4003-99bf-18b739a577ad'</where>
+ <where>PHASE_OLD = 'SALPROJPHASEOFFER'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="7"/>
- <where>PHASE_OLD = '213c8184-f930-457e-8605-703baaf21d4a'</where>
+ <where>PHASE_OLD = 'SALPROJPHASENEGO'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="PHASE" valueNumeric="8"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml
index 63c6e4c7f6380ddef196273619356662a86da879..249e610ff9a461dd748f361b3a507b62e29d3876 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectPhase.xml
@@ -6,31 +6,31 @@
<column name="PHASE" type="CHAR(36)"/>
</addColumn>
<update tableName="SALESPROJECT">
- <column name="PHASE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+ <column name="PHASE" value="SALPROJPHASENQC"/>
<where>PHASE_OLD = 1</where>
</update>
<update tableName="SALESPROJECT">
- <column name="PHASE" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+ <column name="PHASE" value="SALPROJPHASEMAL"/>
<where>PHASE_OLD = 2</where>
</update>
<update tableName="SALESPROJECT">
- <column name="PHASE" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <column name="PHASE" value="SALPROJPHASEMQL"/>
<where>PHASE_OLD = 3</where>
</update>
<update tableName="SALESPROJECT">
- <column name="PHASE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="PHASE" value="SALPROJPHASESAL"/>
<where>PHASE_OLD = 4</where>
</update>
<update tableName="SALESPROJECT">
- <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+ <column name="PHASE" value="SALPROJPHASESQO"/>
<where>PHASE_OLD = 5</where>
</update>
<update tableName="SALESPROJECT">
- <column name="PHASE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+ <column name="PHASE" value="SALPROJPHASEOFFER"/>
<where>PHASE_OLD = 6</where>
</update>
<update tableName="SALESPROJECT">
- <column name="PHASE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+ <column name="PHASE" value="SALPROJPHASENEGO"/>
<where>PHASE_OLD = 7</where>
</update>
<update tableName="SALESPROJECT">
@@ -78,31 +78,31 @@
</addColumn>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="1"/>
- <where>PHASE_OLD = '9f7d1fa9-7c09-4037-8f7c-8458def14d89'</where>
+ <where>PHASE_OLD = 'SALPROJPHASENQC'</where>
</update>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="2"/>
- <where>PHASE_OLD = '292628f1-d9a5-432d-8130-f6690c14a5d4'</where>
+ <where>PHASE_OLD = 'SALPROJPHASEMAL'</where>
</update>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="3"/>
- <where>PHASE_OLD = '4467b33c-3a68-4c8b-ba4a-1eb666a6c774'</where>
+ <where>PHASE_OLD = 'SALPROJPHASEMQL'</where>
</update>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="4"/>
- <where>PHASE_OLD = '1e42f183-fb97-415f-9917-b43ca159fde4'</where>
+ <where>PHASE_OLD = 'SALPROJPHASESAL'</where>
</update>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="5"/>
- <where>PHASE_OLD = '972a41dc-a8ae-43cd-a03b-522ea84efbfb'</where>
+ <where>PHASE_OLD = 'SALPROJPHASESQO'</where>
</update>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="6"/>
- <where>PHASE_OLD = '60d09bb1-7e02-4003-99bf-18b739a577ad'</where>
+ <where>PHASE_OLD = 'SALPROJPHASEOFFER'</where>
</update>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="7"/>
- <where>PHASE_OLD = '213c8184-f930-457e-8605-703baaf21d4a'</where>
+ <where>PHASE_OLD = 'SALPROJPHASENEGO'</where>
</update>
<update tableName="SALESPROJECT">
<column name="PHASE" valueNumeric="8"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml
index 773dc4868aec13a097420a2435f82dbe96020bfb..2f63980104102d820e5ab1b1caa9f23167dde818 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectState.xml
@@ -6,61 +6,29 @@
<column name="STATE" type="CHAR(36)"/>
</addColumn>
<update tableName="SALESPROJECT">
- <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="STATE" value="SALPROJSTATOPEN"/>
<where>STATE_OLD = 1</where>
</update>
<update tableName="SALESPROJECT">
- <column name="STATE" value="23d38486-4cce-41ce-a8df-164ad44df706"/>
+ <column name="STATE" value="SALPROJSTATPOSTPONED"/>
<where>STATE_OLD = 2</where>
</update>
<update tableName="SALESPROJECT">
- <column name="STATE" value="8916e241-9452-4541-a323-d479ad5f2e4d"/>
+ <column name="STATE" value="SALPROJSTATABORT"/>
<where>STATE_OLD = 3</where>
</update>
<update tableName="SALESPROJECT">
- <column name="STATE" value="1606cf46-a87b-4797-830e-55ebdd70a001"/>
+ <column name="STATE" value="SALPROJSTATPARTIAL"/>
<where>STATE_OLD = 4</where>
</update>
<update tableName="SALESPROJECT">
- <column name="STATE" value="130bb53a-a97e-455e-8f34-8d445e985474"/>
+ <column name="STATE" value="SALPROJSTATORDER"/>
<where>STATE_OLD = 5</where>
</update>
<update tableName="SALESPROJECT">
- <column name="STATE" value="d8a60f60-a4e6-46ee-88ec-bac53e1afedd"/>
+ <column name="STATE" value="SALPROJSTATLOST"/>
<where>STATE_OLD = 6</where>
</update>
<dropColumn tableName="SALESPROJECT" columnName="STATE_OLD"/>
-
- <rollback>
- <renameColumn newColumnName="STATE_OLD" oldColumnName="STATE" columnDataType="CHAR(36)" tableName="SALESPROJECT"/>
- <addColumn tableName="SALESPROJECT">
- <column name="STATE" type="INTEGER"/>
- </addColumn>
- <update tableName="SALESPROJECT">
- <column name="STATE" valueNumeric="1"/>
- <where>STATE_OLD = '483bcaeb-1e5b-4772-b54e-7d7d8aa65712'</where>
- </update>
- <update tableName="SALESPROJECT">
- <column name="STATE" valueNumeric="2"/>
- <where>STATE_OLD = '23d38486-4cce-41ce-a8df-164ad44df706'</where>
- </update>
- <update tableName="SALESPROJECT">
- <column name="STATE" valueNumeric="3"/>
- <where>STATE_OLD = '8916e241-9452-4541-a323-d479ad5f2e4d'</where>
- </update>
- <update tableName="SALESPROJECT">
- <column name="STATE" valueNumeric="4"/>
- <where>STATE_OLD = '1606cf46-a87b-4797-830e-55ebdd70a001'</where>
- </update>
- <update tableName="SALESPROJECT">
- <column name="STATE" valueNumeric="5"/>
- <where>STATE_OLD = '130bb53a-a97e-455e-8f34-8d445e985474'</where>
- </update>
- <update tableName="SALESPROJECT">
- <column name="STATE" valueNumeric="6"/>
- <where>STATE_OLD = 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd'</where>
- </update>
- <dropColumn tableName="SALESPROJECT" columnName="STATE_OLD"/>
- </rollback>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml
index a5c255d5cb7b4fb3d2dde94a15d8d9c049e19669..cab0f1faf60fcd912fe79dc513a4668666a973b2 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesProjectStrength.xml
@@ -6,15 +6,15 @@
<column name="STRENGTH" type="CHAR(36)"/>
</addColumn>
<update tableName="ORGANISATION">
- <column name="STRENGTH" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+ <column name="STRENGTH" value="SALPROJSTPRICEPOL"/>
<where>STRENGTH_OLD = 0</where>
</update>
<update tableName="ORGANISATION">
- <column name="STRENGTH" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+ <column name="STRENGTH" value="SALPROJSTPERSAPP"/>
<where>STRENGTH_OLD = 1</where>
</update>
<update tableName="ORGANISATION">
- <column name="STRENGTH" value="2eda4875-53e6-4359-b367-464d006cf9b3"/>
+ <column name="STRENGTH" value="SALPROJSTPROD"/>
<where>STRENGTH_OLD = 2</where>
</update>
<dropColumn tableName="ORGANISATION" columnName="STRENGTH_OLD"/>
@@ -26,15 +26,15 @@
</addColumn>
<update tableName="ORGANISATION">
<column name="STRENGTH" valueNumeric="0"/>
- <where>STRENGTH_OLD = 'a30e5d5c-88e2-4674-98d3-8a88622a62a8'</where>
+ <where>STRENGTH_OLD = 'SALPROJSTPRICEPOL'</where>
</update>
<update tableName="ORGANISATION">
<column name="STRENGTH" valueNumeric="1"/>
- <where>STRENGTH_OLD = 'b5def5d7-a843-4e5e-b56e-e18e26fd0bc1'</where>
+ <where>STRENGTH_OLD = 'SALPROJSTPERSAPP'</where>
</update>
<update tableName="ORGANISATION">
<column name="STRENGTH" valueNumeric="2"/>
- <where>STRENGTH_OLD = '2eda4875-53e6-4359-b367-464d006cf9b3'</where>
+ <where>STRENGTH_OLD = 'SALPROJSTPROD'</where>
</update>
<dropColumn tableName="ORGANISATION" columnName="STRENGTH_OLD"/>
</rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
index d4aa8de109c8ceaba72b9e87dacf19098876bf50..5bfcf69fae5f2cde4dad9a077671f7b318bca405 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/SalesprojectCompetitionState.xml
@@ -6,27 +6,27 @@
<column name="STATUS" type="CHAR(36)"/>
</addColumn>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="STATUS" value="90dabaf6-b62a-4a5b-a9ff-449e5a898a24"/>
+ <column name="STATUS" value="COMPSTATEOPEN"/>
<where>STATUS_OLD = 1</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="STATUS" value="2709acc9-df9c-470b-840c-6ff89fe0bf4e"/>
+ <column name="STATUS" value="COMPSTATEPOST"/>
<where>STATUS_OLD = 2</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="STATUS" value="fb9d270b-a62d-4a78-a3b8-a49dc5afe36d"/>
+ <column name="STATUS" value="COMPSTATEABORT"/>
<where>STATUS_OLD = 3</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="STATUS" value="bae61bdf-ef67-4074-9db6-99a292dc8a6d"/>
+ <column name="STATUS" value="COMPSTATEPARTIAL"/>
<where>STATUS_OLD = 4</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="STATUS" value="aa4aff7e-3c1a-4a48-95f6-297e341cb7aa"/>
+ <column name="STATUS" value="COMPSTATEORDER"/>
<where>STATUS_OLD = 5</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
- <column name="STATUS" value="ff73172c-8517-4b6e-98cb-43aebacd9af1"/>
+ <column name="STATUS" value="COMPSTATELOST"/>
<where>STATUS_OLD = 6</where>
</update>
<dropColumn tableName="SALESPROJECT_COMPETITION" columnName="STATUS_OLD"/>
@@ -38,27 +38,27 @@
</addColumn>
<update tableName="SALESPROJECT_COMPETITION">
<column name="STATUS" valueNumeric="1"/>
- <where>STATUS_OLD = '90dabaf6-b62a-4a5b-a9ff-449e5a898a24'</where>
+ <where>STATUS_OLD = 'COMPSTATEOPEN'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="STATUS" valueNumeric="2"/>
- <where>STATUS_OLD = '2709acc9-df9c-470b-840c-6ff89fe0bf4e'</where>
+ <where>STATUS_OLD = 'COMPSTATEPOST'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="STATUS" valueNumeric="3"/>
- <where>STATUS_OLD = 'fb9d270b-a62d-4a78-a3b8-a49dc5afe36d'</where>
+ <where>STATUS_OLD = 'COMPSTATEABORT'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="STATUS" valueNumeric="4"/>
- <where>STATUS_OLD = 'bae61bdf-ef67-4074-9db6-99a292dc8a6d'</where>
+ <where>STATUS_OLD = 'COMPSTATEPARTIAL'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="STATUS" valueNumeric="5"/>
- <where>STATUS_OLD = 'aa4aff7e-3c1a-4a48-95f6-297e341cb7aa'</where>
+ <where>STATUS_OLD = 'COMPSTATEORDER'</where>
</update>
<update tableName="SALESPROJECT_COMPETITION">
<column name="STATUS" valueNumeric="6"/>
- <where>STATUS_OLD = 'ff73172c-8517-4b6e-98cb-43aebacd9af1'</where>
+ <where>STATUS_OLD = 'COMPSTATELOST'</where>
</update>
<dropColumn tableName="SALESPROJECT_COMPETITION" columnName="STATUS_OLD"/>
</rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml
index cf600a9052afad01691051b9535c4735826070e9..e9e3c416ccc2e1a5fd2e8bfc401bc57ab40b2d7a 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/KeywordRelatedStructureChanges/TaskPriority.xml
@@ -6,19 +6,19 @@
<column name="PRIORITY" type="CHAR(36)"/>
</addColumn>
<update tableName="TASK">
- <column name="PRIORITY" value="f587f53a-72cc-4b76-9e39-276a26cab2e0"/>
+ <column name="PRIORITY" value="TASKPRIONONE"/>
<where>PRIORITY_OLD = 0</where>
</update>
<update tableName="TASK">
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
<where>PRIORITY_OLD = 1</where>
</update>
<update tableName="TASK">
- <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <column name="PRIORITY" value="SALPROJPHASEMQL"/>
<where>PRIORITY_OLD = 2</where>
</update>
<update tableName="TASK">
- <column name="PRIORITY" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="PRIORITY" value="SALPROJPHASESAL"/>
<where>PRIORITY_OLD = 3</where>
</update>
<dropColumn tableName="TASK" columnName="PRIORITY_OLD"/>
@@ -29,19 +29,19 @@
</addColumn>
<update tableName="TASK">
<column name="PRIORITY" valueNumeric="0"/>
- <where>PRIORITY_OLD = 'f587f53a-72cc-4b76-9e39-276a26cab2e0'</where>
+ <where>PRIORITY_OLD = 'TASKPRIONONE'</where>
</update>
<update tableName="TASK">
<column name="PRIORITY" valueNumeric="1"/>
- <where>PRIORITY_OLD = '09072b59-d12f-469b-acbd-18a28232ff70'</where>
+ <where>PRIORITY_OLD = 'TASKPRIONORMAL'</where>
</update>
<update tableName="TASK">
<column name="PRIORITY" valueNumeric="2"/>
- <where>PRIORITY_OLD = '4467b33c-3a68-4c8b-ba4a-1eb666a6c774'</where>
+ <where>PRIORITY_OLD = 'SALPROJPHASEMQL'</where>
</update>
<update tableName="TASK">
<column name="PRIORITY" valueNumeric="3"/>
- <where>PRIORITY_OLD = '1e42f183-fb97-415f-9917-b43ca159fde4'</where>
+ <where>PRIORITY_OLD = 'SALPROJPHASESAL'</where>
</update>
<dropColumn tableName="TASK" columnName="PRIORITY_OLD"/>
</rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/ORGANISATION_private.xml b/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
similarity index 88%
rename from .liquibase/Data_alias/basic/2019.1.4/data/ORGANISATION_private.xml
rename to .liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
index 396afa3108f89c7676306554c938882bca21393f..77e650768a11c404c698a720b08e0be8a34f80de 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/data/ORGANISATION_private.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/ORGANISATION_private.xml
@@ -5,13 +5,13 @@
<column name="ORGANISATIONID" value="0"/>
<column name="NAME" value="privat"/>
<column name="CUSTOMERCODE" value=""/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
</insert>
<insert tableName="CONTACT">
<column name="CONTACTID" value="0"/>
<column name="ORGANISATION_ID" value="0"/>
<column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="ADDRESS_ID" value="0"/>
</insert>
<rollback>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9d3be8b53fd4c5c629b78e409d7796af2c2cceda
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/Salesproject_Phase_icons.xml
@@ -0,0 +1,67 @@
+<?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="j.hoermann" id="ac8c5149-67c7-4fb5-b786-7242bd3d69f6">
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="NAME" value="icon"/>
+ <column name="CONTAINER" value="SalesprojectPhase"/>
+ <column name="TYPE" value="CHAR_VALUE"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="10974128-6961-43eb-9605-e747c1b795cd"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="b42caac9-8f8f-46e5-9f1c-d121cdf3ad8f"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:NQC"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="d487ac11-b85b-4489-89e1-1e93353ad9e9"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="028af5dd-1071-4108-8685-ed7124376706"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:MQC"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="d109b169-f14a-4383-af43-f30c6d357971"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="8a2d19c9-bc32-437e-9261-78ed30110e92"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:MAL"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="dbe97653-4b14-4f53-8bd8-ea36714d20e7"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="46f55a58-dbe4-40ae-9306-481df9095088"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:MQL"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="f800d56a-f1e7-443b-849f-e041ff99f70a"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="afa8cf58-07e8-4ee9-b24e-96cb6fa76aec"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:SAL"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="47b06455-e68b-4c1f-a174-6f5c108b0369"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="c9483fb9-c295-43d2-94e0-8c949cf6dc47"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:SQO"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4af5adb0-35be-4ba9-b9f4-ec3a18666636"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="0e8eab64-4c79-4eed-9746-0ac6fc397620"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:OFFER"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1b7a9fcb-7430-4bdf-8b83-c0f7e16b3515"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="405e2b7b-20c2-4824-a8b5-c7a533784ef3"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="93d60e4b-e984-423e-b97f-d2abf61de41d"/>
+ <column name="CHAR_VALUE" value="NEON:NEGOTIATION"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/create_Ticket_table.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/create_Ticket_table.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01ea25c802183296367e33eeb61ee57e227d15dc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/create_Ticket_table.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="j.hoermann" id="15176b40-4b5e-48a9-8dfc-4540b01595c8">
+ <createTable tableName="TICKET">
+ <column name="TICKETID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_TICKET_TICKETID"/>
+ </column>
+ <column name="TASK_ID" type="CHAR(36)">
+ <constraints nullable="false" unique="true"/>
+ </column>
+ <column name="CODE" type="INTEGER"/>
+ <column name="TICKETTYPE" type="CHAR(36)"/>
+ </createTable>
+
+ <dropColumn tableName="TASK" columnName="CODE"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTaskStatus.xml
similarity index 89%
rename from .liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml
rename to .liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTaskStatus.xml
index a81bbfd8c7e9956a4ec55eb51f54f203d8959b9c..627af2f6862d3d29b9860bba76c59379e01dfdbe 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTaskStatus.xml
@@ -1,6 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
+<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="j.hoermann" id="6e154b73-f025-4072-9fe0-12ab39abebec">
<insert tableName="AB_KEYWORD_ATTRIBUTE">
<column name="AB_KEYWORD_ATTRIBUTEID" value="472f9bc2-3331-49f9-aba2-72d5eeb89654"/>
<column name="NAME" value="icon"/>
@@ -11,6 +11,7 @@
<!-- new -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="10"/>
+ <column name="KEYID" value="NEW"/>
<where>AB_KEYWORD_ENTRYID = '6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
@@ -23,7 +24,7 @@
<!-- unassigned -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0b06db5c-1d00-4d01-b8a9-f280a4f69cbc"/>
- <column name="KEYID" value="38cfe962-5842-4c7d-9e7f-a26ab0578321"/>
+ <column name="KEYID" value="UNASSIGNED"/>
<column name="TITLE" value="unassigned"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="20"/>
@@ -40,7 +41,7 @@
<!-- assigned -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1061168a-4b17-4ba5-be70-948c0dd78f20"/>
- <column name="KEYID" value="e20fd681-b5ff-4d7e-a62b-16f949aa0486"/>
+ <column name="KEYID" value="ASSIGNED"/>
<column name="TITLE" value="assigned"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="30"/>
@@ -54,9 +55,11 @@
<column name="CHAR_VALUE" value="NEON:STATUS_NOT_STARTED"/>
</insert>
- <!-- in process -->
+ <!-- in progress -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="40"/>
+ <column name="KEYID" value="IN-PROGRESS"/>
+ <column name="TITLE" value="in progress"/>
<where>AB_KEYWORD_ENTRYID = '6a479d71-2c05-4496-9c6c-c9aeef929bcf'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
@@ -69,6 +72,7 @@
<!-- waiting -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="50"/>
+ <column name="KEYID" value="WAITING"/>
<where>AB_KEYWORD_ENTRYID = '34701d4d-7435-43bc-8b2f-ad2a70065a75'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
@@ -81,6 +85,7 @@
<!-- ended -->
<update tableName="AB_KEYWORD_ENTRY">
<column name="SORTING" valueNumeric="60"/>
+ <column name="KEYID" value="ENDED"/>
<where>AB_KEYWORD_ENTRYID = '7311d8c5-edf2-492e-be4d-6f0469334611'</where>
</update>
<insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
@@ -93,7 +98,7 @@
<!-- ended (done) -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="890a7832-f06f-4e51-8744-73aa8ddea4f8"/>
- <column name="KEYID" value="91869bd5-ec33-4dcc-a86c-ae55b75538a0"/>
+ <column name="KEYID" value="ENDED-DONE"/>
<column name="TITLE" value="ended (done)"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="70"/>
@@ -110,7 +115,7 @@
<!-- ended (abandoned) -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="a5b50ba3-0fb9-4fbe-9e98-4d6c53b329af"/>
- <column name="KEYID" value="bfd2af05-83b4-4000-99b1-ed680dca4965"/>
+ <column name="KEYID" value="ENDED-ABANDONED"/>
<column name="TITLE" value="ended (abandoned)"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="80"/>
@@ -127,7 +132,7 @@
<!-- still incorrect -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9d4cdd61-9f6a-46e1-bef0-eaf16613aea5"/>
- <column name="KEYID" value="cfbc9e01-2530-472a-9cd1-466c62dcbebf"/>
+ <column name="KEYID" value="STILL-INCORRECT"/>
<column name="TITLE" value="still incorrect"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="90"/>
@@ -144,7 +149,7 @@
<!-- customer checks -->
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2f742253-c287-40ab-838f-ec797a16fdce"/>
- <column name="KEYID" value="4a3ae1ca-35f0-404b-bde5-f13987be8421"/>
+ <column name="KEYID" value="CUSTOMER-CHECKS"/>
<column name="TITLE" value="customer checks"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="100"/>
@@ -158,4 +163,4 @@
<column name="CHAR_VALUE" value="NEON:STATUS_WAITING"/>
</insert>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
index 9a1e4f3e239c6211270045024ba6a7fa0918d341..ea033feecb00c7a4a4a4221bca40ae06ec17b0f3 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insertTicketAttributes_TaskType_Task.xml
@@ -14,7 +14,7 @@
<column name="AB_ATTRIBUTEID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
<column name="ATTRIBUTE_PARENT_ID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
<column name="ATTRIBUTE_TYPE" value="GROUP "/>
- <column name="ATTRIBUTE_NAME" value="Reklamation"/>
+ <column name="ATTRIBUTE_NAME" value="Support"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -24,7 +24,7 @@
<column name="AB_ATTRIBUTEID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
<column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
<column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="ATTRIBUTE_NAME" value="Regulierung"/>
+ <column name="ATTRIBUTE_NAME" value="Type"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -34,7 +34,7 @@
<column name="AB_ATTRIBUTEID" value="72bcad07-6f26-48c0-84b0-1e6ab46d88a9"/>
<column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
<column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="ATTRIBUTE_NAME" value="Vollberechnung"/>
+ <column name="ATTRIBUTE_NAME" value="Issue"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -44,7 +44,7 @@
<column name="AB_ATTRIBUTEID" value="02e77970-3ea4-4fff-9ffa-099746b5f3c8"/>
<column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
<column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="ATTRIBUTE_NAME" value="Teilberechnung"/>
+ <column name="ATTRIBUTE_NAME" value="Feature"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -54,7 +54,7 @@
<column name="AB_ATTRIBUTEID" value="abc52bbb-047c-405c-9d58-c2e8ac8eb585"/>
<column name="ATTRIBUTE_PARENT_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
<column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="ATTRIBUTE_NAME" value="Kulanz"/>
+ <column name="ATTRIBUTE_NAME" value="Consultation"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -65,7 +65,7 @@
<column name="AB_ATTRIBUTEID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
<column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
<column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="ATTRIBUTE_NAME" value="Schadensart"/>
+ <column name="ATTRIBUTE_NAME" value="Modul group"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -75,7 +75,7 @@
<column name="AB_ATTRIBUTEID" value="6d0cce07-4767-477b-af51-e9782ebdbe25"/>
<column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
<column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="ATTRIBUTE_NAME" value="Transportschaden"/>
+ <column name="ATTRIBUTE_NAME" value="Product"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -85,7 +85,7 @@
<column name="AB_ATTRIBUTEID" value="ed3c22a4-3fa1-4c7c-a564-938f3975af94"/>
<column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
<column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="ATTRIBUTE_NAME" value="Qualitätsbeanstandung"/>
+ <column name="ATTRIBUTE_NAME" value="Maintenance"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -95,7 +95,7 @@
<column name="AB_ATTRIBUTEID" value="ace7805c-961f-4412-b3a6-7c89f27e1f6b"/>
<column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
<column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="ATTRIBUTE_NAME" value="fehlerhafte Lieferung"/>
+ <column name="ATTRIBUTE_NAME" value="Interfaces"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -105,7 +105,7 @@
<column name="AB_ATTRIBUTEID" value="cf617db8-b4a4-4596-9f16-d1c58f0024d1"/>
<column name="ATTRIBUTE_PARENT_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
<column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="ATTRIBUTE_NAME" value="unvollständige Lieferung"/>
+ <column name="ATTRIBUTE_NAME" value="Questions"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
@@ -113,43 +113,66 @@
</insert>
<insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="01d761e0-802a-46d0-827f-b6ca5d9a2148"/>
- <column name="ATTRIBUTE_PARENT_ID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- <column name="ATTRIBUTE_NAME" value="Support Ticket"/>
+ <column name="AB_ATTRIBUTEID" value="af312508-8a9b-4b8f-88f3-6b98005c749e"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
+ <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION "/>
+ <column name="ATTRIBUTE_NAME" value="Product"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="DROPDOWNDEFINITION" value="Product"/>
+ <column name="ATTRIBUTE_INFO"/>
+ <column name="SORTING" valueNumeric="3"/>
+ </insert>
+
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBO "/>
+ <column name="ATTRIBUTE_NAME" value="Cause"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="DROPDOWNDEFINITION"/>
+ <column name="ATTRIBUTE_INFO"/>
+ <column name="SORTING" valueNumeric="4"/>
+ </insert>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="0385b6e3-00cc-4018-847f-152364c3c11e"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
+ <column name="ATTRIBUTE_NAME" value="User error"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="DROPDOWNDEFINITION"/>
+ <column name="ATTRIBUTE_INFO"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="9b4f4b19-83b0-48f6-91e9-43804d5fd1a4"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
+ <column name="ATTRIBUTE_NAME" value="Assembly"/>
<column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
<column name="DROPDOWNDEFINITION"/>
<column name="ATTRIBUTE_INFO"/>
<column name="SORTING" valueNumeric="2"/>
</insert>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="48da5029-b984-4809-8227-fb430bb78920"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="0b6d18e3-f6c8-488f-80e0-267364e444da"/>
+ <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
+ <column name="ATTRIBUTE_NAME" value="Delivery problems"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="DROPDOWNDEFINITION"/>
+ <column name="ATTRIBUTE_INFO"/>
+ <column name="SORTING" valueNumeric="3"/>
+ </insert>
- <insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="a1154583-ccc0-45f0-8a39-4fbfa29c6a41"/>
- <column name="AB_ATTRIBUTE_ID" value="753d9c44-58d2-40b5-b981-cd0ab15dddc2"/>
- <column name="OBJECT_TYPE" value="Task"/>
- <column name="MIN_COUNT"/>
- <column name="MAX_COUNT"/>
- </insert>
- <insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="382b1619-7939-4b7d-9571-3f340cb62c56"/>
- <column name="AB_ATTRIBUTE_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
- <column name="OBJECT_TYPE" value="Task"/>
- <column name="MIN_COUNT"/>
- <column name="MAX_COUNT"/>
- </insert>
- <insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="42216075-f7aa-45a4-914f-3d7b5995ecfe"/>
- <column name="AB_ATTRIBUTE_ID" value="92dde095-1b3a-4e90-9a90-1947d3e5d734"/>
- <column name="OBJECT_TYPE" value="Task"/>
- <column name="MIN_COUNT"/>
- <column name="MAX_COUNT"/>
- </insert>
- <insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="19669ecc-ffd7-4f25-be6a-5b33372d77b6"/>
- <column name="AB_ATTRIBUTE_ID" value="1881ffcd-bbf1-443c-b379-a08f7bb92b88"/>
- <column name="OBJECT_TYPE" value="Task"/>
- <column name="MIN_COUNT"/>
- <column name="MAX_COUNT"/>
+ <insert tableName="AB_ATTRIBUTE">
+ <column name="AB_ATTRIBUTEID" value="a4c2bcc5-5a3d-4a70-b936-9a330329c63a"/>
+ <column name="ATTRIBUTE_PARENT_ID" value="ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"/>
+ <column name="ATTRIBUTE_TYPE" value="BOOLEAN "/>
+ <column name="ATTRIBUTE_NAME" value="Billable"/>
+ <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
+ <column name="DROPDOWNDEFINITION"/>
+ <column name="ATTRIBUTE_INFO"/>
+ <column name="SORTING" valueNumeric="5"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Task.xml
deleted file mode 100644
index c9bafcf9881e8160ce82b09eb7bd238d3dcc380b..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Task.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
- <insert tableName="AB_KEYWORD_ATTRIBUTE">
- <column name="AB_KEYWORD_ATTRIBUTEID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
- <column name="NAME" value="group"/>
- <column name="CONTAINER" value="TaskType"/>
- <column name="TYPE" value="CHAR_VALUE"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTE">
- <column name="AB_KEYWORD_ATTRIBUTEID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
- <column name="NAME" value="attributes"/>
- <column name="CONTAINER" value="TaskType"/>
- <column name="TYPE" value="LONG_CHAR_VALUE"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTE">
- <column name="AB_KEYWORD_ATTRIBUTEID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
- <column name="NAME" value="availableStatus"/>
- <column name="CONTAINER" value="TaskType"/>
- <column name="TYPE" value="LONG_CHAR_VALUE"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTE">
- <column name="AB_KEYWORD_ATTRIBUTEID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
- <column name="NAME" value="defaultStatus"/>
- <column name="CONTAINER" value="TaskType"/>
- <column name="TYPE" value="CHAR_VALUE"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTE">
- <column name="AB_KEYWORD_ATTRIBUTEID" value="9ac96671-b519-488b-bbad-6dea3e5baafd"/>
- <column name="NAME" value="showCode"/>
- <column name="CONTAINER" value="TaskType"/>
- <column name="TYPE" value="BOOL_VALUE"/>
- </insert>
-
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1eef7882-90eb-4c5b-a01a-c6cf1ea7a82b"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
- <column name="CHAR_VALUE" value="Task"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cd293e92-224f-4bc3-9552-b3f7caa95c99"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="9ac96671-b519-488b-bbad-6dea3e5baafd"/>
- <column name="BOOL_VALUE" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="17afe435-c498-45f7-8a16-50d50b78926a"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
- <column name="LONG_CHAR_VALUE" value="["21bc4d20-1a87-4247-8f7c-8d3a09631850", "b1fd456f-f5d2-459e-b467-76e2914c8169", "00595a73-22e2-4c3b-a21c-06bdec262d20", "7c9d6681-6cf5-4395-b276-3941b6fd0d57"]"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="169edc60-5bad-45eb-b938-46a47b10a0a3"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
- <column name="CHAR_VALUE" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
- </insert>
-
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
- <column name="KEYID" value="f3da0edd-49d9-4061-98c1-8fda8631be7e"/>
- <column name="TITLE" value="Complaint"/>
- <column name="CONTAINER" value="TaskType"/>
- <column name="SORTING" valueNumeric="1"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="ca8e16d4-0bae-45e7-a288-0f8a846193f1"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
- <column name="CHAR_VALUE" value="Ticket"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="fa35bb8d-1aa6-47fd-a674-0fdb7c838ddd"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
- <column name="LONG_CHAR_VALUE" value="["ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"]"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="9b4f5103-be45-4f71-b841-c3e19cc19786"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
- <column name="LONG_CHAR_VALUE" value="["21bc4d20-1a87-4247-8f7c-8d3a09631850", "b1fd456f-f5d2-459e-b467-76e2914c8169", "00595a73-22e2-4c3b-a21c-06bdec262d20", "7c9d6681-6cf5-4395-b276-3941b6fd0d57"]"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="4cabba92-fa98-42c8-aabb-8bff718c1502"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
- <column name="CHAR_VALUE" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
- </insert>
-
- <insert tableName="AB_KEYWORD_ENTRY">
- <column name="AB_KEYWORD_ENTRYID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
- <column name="KEYID" value="7bf77721-470f-4cdf-a6af-452bf05a405b"/>
- <column name="TITLE" value="Support ticket"/>
- <column name="CONTAINER" value="TaskType"/>
- <column name="SORTING" valueNumeric="2"/>
- <column name="ISACTIVE" valueNumeric="1"/>
- <column name="ISESSENTIAL" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="6e54c8f3-f24b-411f-a3e3-eba878fdaa1b"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="e8e3e2e9-8cce-4582-a71b-7f66593c7ade"/>
- <column name="CHAR_VALUE" value="Ticket"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7f1bed92-7158-4c89-b811-85dea257fa6a"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
- <column name="LONG_CHAR_VALUE" value="[]"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="2878a3ac-83a3-4e19-be73-da5db8d78375"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
- <column name="LONG_CHAR_VALUE" value="["38cfe962-5842-4c7d-9e7f-a26ab0578321", "e20fd681-b5ff-4d7e-a62b-16f949aa0486", "b1fd456f-f5d2-459e-b467-76e2914c8169", "00595a73-22e2-4c3b-a21c-06bdec262d20", "91869bd5-ec33-4dcc-a86c-ae55b75538a0", "bfd2af05-83b4-4000-99b1-ed680dca4965", "cfbc9e01-2530-472a-9cd1-466c62dcbebf", "4a3ae1ca-35f0-404b-bde5-f13987be8421"]"/>
- </insert>
- <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
- <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b7d946e4-3644-4f97-96cb-f2331fc3aa1e"/>
- <column name="AB_KEYWORD_ENTRY_ID" value="9d326a2a-923c-41de-adb9-b0f86417e7c2"/>
- <column name="AB_KEYWORD_ATTRIBUTE_ID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
- <column name="CHAR_VALUE" value="38cfe962-5842-4c7d-9e7f-a26ab0578321"/>
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Ticket.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Ticket.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d1c0479c634cd864d3aa0a4f79648406dba5d72d
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TaskType_Ticket.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="d1440b93-e01c-406b-9f0d-c55cac877fcd">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2ef84e0e-988a-44b4-9d14-3461555d2f18"/>
+ <column name="KEYID" value="TICKET"/>
+ <column name="TITLE" value="Ticket"/>
+ <column name="CONTAINER" value="TaskType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <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/2019.1.4/Ticketmanagement/insert_TicketTypes.xml b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TicketTypes.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5f2ac9ffa2aca9de416161bb4afc769b611610f6
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/Ticketmanagement/insert_TicketTypes.xml
@@ -0,0 +1,51 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.hoermann" id="aaa7c634-9196-42e7-a65b-954c2a0bed5b">
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
+ <column name="NAME" value="attributes"/>
+ <column name="CONTAINER" value="TicketType"/>
+ <column name="TYPE" value="LONG_CHAR_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
+ <column name="NAME" value="availableStatus"/>
+ <column name="CONTAINER" value="TicketType"/>
+ <column name="TYPE" value="LONG_CHAR_VALUE"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
+ <column name="NAME" value="defaultStatus"/>
+ <column name="CONTAINER" value="TicketType"/>
+ <column name="TYPE" value="CHAR_VALUE"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="98075159-ecc2-4851-a971-6f3123a495d3"/>
+ <column name="KEYID" value="SUPPORTTICKET"/>
+ <column name="TITLE" value="Supportticket"/>
+ <column name="CONTAINER" value="TicketType"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="1eef7882-90eb-4c5b-a01a-c6cf1ea7a82b"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="98075159-ecc2-4851-a971-6f3123a495d3"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="af6a0af9-0102-426b-a1f7-c8abfea79793"/>
+ <column name="LONG_CHAR_VALUE" value="["ff8b1caf-cf30-4edb-b5ca-a9a219ba8399"]"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="cd293e92-224f-4bc3-9552-b3f7caa95c99"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="98075159-ecc2-4851-a971-6f3123a495d3"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="6f10015d-b7ee-43aa-99f9-87960ec2e4fd"/>
+ <column name="LONG_CHAR_VALUE" value="["UNASSIGNED","ASSIGNED","IN-PROGESS","ENDED-DONE","ENDED-ABANDONED","WAITING","STILL-INCORRECT","CUSTOMER-CHECKS"]"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="17afe435-c498-45f7-8a16-50d50b78926a"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="98075159-ecc2-4851-a971-6f3123a495d3"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="729a41d1-0463-480d-bf7b-0eb6c2e96f37"/>
+ <column name="CHAR_VALUE" value="UNASSIGNED"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/addDefaultAddresses.xml b/.liquibase/Data_alias/basic/2019.1.4/addDefaultAddresses.xml
deleted file mode 100644
index 53c2858677b011f511d70426a00f473448665451..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/addDefaultAddresses.xml
+++ /dev/null
@@ -1,274 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="58c94c79-1c82-43b3-bd19-324955d4cbfb">
- <!--Lisa Sommer-->
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="11d01332-985b-4efe-a634-da71ae482907"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
- </whereParams>
- </update>
-
- <!--MNF-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
- <column name="CITY" value="München"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
- <column name="BUILDINGNO" value="3"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="80807"/>
- <column name="ADDRESS" value="Muster-Straße"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="e6da1393-f46b-41a4-826b-2c7d22de2246" />
- </whereParams>
- </update>
-
- <!--Lichtenstein-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
- <column name="CITY" value="München"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
- <column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
- <column name="BUILDINGNO" value="35"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="80807"/>
- <column name="ADDRESS" value="Lützowplatz"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="e83c45e0-c30b-436e-b445-00a8b58383b0" />
- </whereParams>
- </update>
-
- <!--International Kältetechnik AG-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
- <column name="CITY" value="München"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- <column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
- <column name="BUILDINGNO" value="48"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="63847"/>
- <column name="ADDRESS" value="Hildburghausen"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="e83c45e0-c30b-436e-b445-00a8b58383b0" />
- </whereParams>
- </update>
-
- <!--Pichelmaier Financial AG-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
- <column name="CITY" value="München"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
- <column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
- <column name="BUILDINGNO" value="6"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="54595"/>
- <column name="ADDRESS" value="Rudower Strasse"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="fd082db5-be43-4219-a705-588f9c06e59b" />
- </whereParams>
- </update>
-
- <!--Peter Pfiffig-->
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="14d01332-985b-4efe-a634-da71ae482907"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
- </whereParams>
- </update>
-
- <!--Franz Müller-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
- <column name="CITY" value="Bergkirchen"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- <column name="ADDRIDENTIFIER"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
- <column name="BUILDINGNO" value="32"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="85230"/>
- <column name="ADDRESS" value="Büsingstrasse"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
- </whereParams>
- </update>
-
- <!--Birgit Leicht-->
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
- </whereParams>
- </update>
-
- <!--Ludwig Kanzler-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
- <column name="CITY" value="München"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ADDRIDENTIFIER"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
- <column name="BUILDINGNO" value="83"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="80456"/>
- <column name="ADDRESS" value="Landsberger Allee"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </update>
-
- <!--Jerome Grüner-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
- <column name="CITY" value="Niederkirchen"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ADDRIDENTIFIER"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
- <column name="BUILDINGNO" value="48"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="67700"/>
- <column name="ADDRESS" value="Grosse Praesidenten Str."/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </update>
-
- <!--Herbert Obermeier-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
- <column name="CITY" value="Bielefeld Babenhausen"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- <column name="ADDRIDENTIFIER"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
- <column name="BUILDINGNO" value="67"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="33739"/>
- <column name="ADDRESS" value="Spresstrasse"/>
- <column name="DISTRICT" value="Oberbayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
- </whereParams>
- </update>
-
- <!--Harold Smith-->
- <insert tableName="ADDRESS">
- <column name="STATE" value="Mecklenburg-Vorpommern"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
- <column name="CITY" value="Rostock"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- <column name="ADDRIDENTIFIER"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
- <column name="BUILDINGNO" value="95"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="18074"/>
- <column name="ADDRESS" value="Kurfürstendamm"/>
- <column name="DISTRICT" value="Mecklenburg-Vorpommern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
- </whereParams>
- </update>
-
- <!--Susanne Lustig-->
- <update tableName="CONTACT">
- <column name="ADDRESS_ID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
- <where>CONTACTID = ? and ADDRESS_ID is null</where>
- <whereParams>
- <param value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
- </whereParams>
- </update>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
index a6fcf7a25d934938cbf48a5591c6c1b61ae89b4c..b884fc559d937deb350c483feaeb3a576617110c 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/changelog.xml
@@ -1,45 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include relativeToChangelogFile="true" file="data/ORGANISATION_private.xml"/>
- <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_gfk.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_mnf.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_lichtenstein.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_kaeltetechnik.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_organisation/ORGANISATION_pichelmaier.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_pfiffig.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_sommer.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_muller.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_leicht.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_kanzler.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_gruener.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_obermeier.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_smith.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_lustig.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1000.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1001.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1002.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1003.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_contract/CONTRACT_1004.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_product/PRODUCT_42154311.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_gfk.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesproject/SALESPROJECT_jkl.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_activity/ACTIVITY_gfk.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1000.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1001.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1002.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1003.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_offer/OFFER_1004.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1000.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1001.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1002.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1003.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1004.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1005.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1006.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1007.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="ORGANISATION_private.xml"/>
<include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
@@ -86,9 +47,6 @@
<include relativeToChangelogFile="true" file="Product_remove_fk.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_YesNo.xml"/>
- <include relativeToChangelogFile="true" file="data/example_attribute/Attribute.xml" context="example"/>
- <include relativeToChangelogFile="true" file="data/example_attribute/AttributeUsage.xml" context="example"/>
-
<include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
<include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
@@ -102,7 +60,6 @@
<include relativeToChangelogFile="true" file="Offer_terms.xml"/>
<include relativeToChangelogFile="true" file="add_ObjectRelation_type.xml"/>
- <include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
<include relativeToChangelogFile="true" file="Salesproject_add_column.xml"/>
@@ -115,17 +72,16 @@
<include relativeToChangelogFile="true" file="AditoBasic/insert_offer_status_keyword.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/insert_salesproject_state_keyword.xml"/>
-
- <include relativeToChangelogFile="true" file="organisation_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="person_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="address_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="contact_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="activity_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="activitylink_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="product_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="offer_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="attributerelation_add_date_editnew_user_editnew.xml"/>
- <include relativeToChangelogFile="true" file="communication_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/organisation_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/person_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/address_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/contact_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/activity_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/activitylink_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/product_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/offer_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/attributerelation_add_date_editnew_user_editnew.xml"/>
+ <include relativeToChangelogFile="true" file="EditNewFields/communication_add_date_editnew_user_editnew.xml"/>
<include relativeToChangelogFile="true" file="update_Salesproject_Forecast.xml"/>
<include relativeToChangelogFile="true" file="update_Offer.xml"/>
@@ -133,12 +89,11 @@
<include relativeToChangelogFile="true" file="update_Salesproject_Member.xml"/>
<include relativeToChangelogFile="true" file="update_Memberrole_InternExtern.xml"/>
- <include relativeToChangelogFile="true" file="indicesRefactor/ContactManagement.xml"/>
- <include relativeToChangelogFile="true" file="indicesRefactor/Keyword.xml"/>
- <include relativeToChangelogFile="true" file="indicesRefactor/Activity.xml"/>
- <include relativeToChangelogFile="true" file="indicesRefactor/Task.xml"/>
+ <include relativeToChangelogFile="true" file="constraintsRefactor/indices_ContactManagement.xml"/>
+ <include relativeToChangelogFile="true" file="constraintsRefactor/indices_Keyword.xml"/>
+ <include relativeToChangelogFile="true" file="constraintsRefactor/indices_Activity.xml"/>
+ <include relativeToChangelogFile="true" file="constraintsRefactor/indices_Task.xml"/>
- <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml" />
<include relativeToChangelogFile="true" file="Contactmanagement_added_ImageBlobs.xml" />
<include relativeToChangelogFile="true" file="alter_activityLink.xml" />
@@ -147,21 +102,17 @@
<include relativeToChangelogFile="true" file="change_Milestone_datatype_to_new_Keyword_logic.xml" />
<include relativeToChangelogFile="true" file="update_Milestone_to_new_Keyword.xml" />
- <include relativeToChangelogFile="true" file="data/example_person/PERSON_admin.xml" context="example"/>
-
- <include relativeToChangelogFile="true" file="addDefaultAddresses.xml" context="example"/>
<include relativeToChangelogFile="true" file="AditoBasic/create_ab_loghistory.xml"/>
<include relativeToChangelogFile="true" file="activity_rename_Creator_to_Responsible.xml" />
<include relativeToChangelogFile="true" file="create_documenttemplate.xml" />
<include relativeToChangelogFile="true" file="create_documenttemplatelink.xml" />
- <include relativeToChangelogFile="true" file="data/init_DocumentTemplateType.xml" />
- <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
+ <include relativeToChangelogFile="true" file="AditoBasic/init_DocumentTemplateType.xml" />
+ <include relativeToChangelogFile="true" file="AditoBasic/init_DocumentTemplateTypeCategory.xml" />
<include relativeToChangelogFile="true" file="miscellaneous/Contact_additionalColumns.xml" />
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaign.xml"/>
- <include relativeToChangelogFile="true" file="data/init_DocumentTemplateTypeCategory.xml" />
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignStep.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipant.xml"/>
<include relativeToChangelogFile="true" file="CampaignManagement/create_campaignParticipantLog.xml"/>
@@ -186,14 +137,13 @@
<include relativeToChangelogFile="true" file="AditoBasic/salesprojectsource_add_icon_attr.xml"/>
- <include relativeToChangelogFile="true" file="removeFKs.xml"/>
+ <include relativeToChangelogFile="true" file="constraintsRefactor/removeFKs.xml"/>
- <!-- the next generation of data -->
- <include relativeToChangelogFile="true" file="newExampleData/changelog.xml" context="example"/>
-
+ <include relativeToChangelogFile="true" file="Ticketmanagement/create_Ticket_table.xml"/>
+ <include relativeToChangelogFile="true" file="Ticketmanagement/insertTaskStatus.xml"/>
+ <include relativeToChangelogFile="true" file="Ticketmanagement/insert_TaskType_Ticket.xml"/>
<include relativeToChangelogFile="true" file="Ticketmanagement/insertTicketAttributes_TaskType_Task.xml"/>
- <include relativeToChangelogFile="true" file="Ticketmanagement/insert_TaskType_Task.xml"/>
- <include relativeToChangelogFile="true" file="Ticketmanagement/update_TaskStatus_add_icon_and_new_status.xml"/>
+ <include relativeToChangelogFile="true" file="Ticketmanagement/insert_TicketTypes.xml"/>
<include relativeToChangelogFile="true" file="longerProductName_Code.xml"/>
@@ -202,4 +152,16 @@
<include relativeToChangelogFile="true" file="BulkMail/bulkMail_keywords.xml"/>
<include relativeToChangelogFile="true" file="add_objectRelationIcon.xml"/>
+
+ <include relativeToChangelogFile="true" file="AditoBasic/init_UnlinkedMail.xml"/>
+
+ <include relativeToChangelogFile="true" file="Attributes/AB_ATTRIBUTE.xml"/>
+ <include relativeToChangelogFile="true" file="Attributes/AB_ATTRIBUTEUSAGE.xml"/>
+
+ <include relativeToChangelogFile="true" file="create_description_translation.xml"/>
+ <include relativeToChangelogFile="true" file="remove_productInfo_language.xml"/>
+
+ <include relativeToChangelogFile="true" file="update_Keyword_Essentials.xml"/>
+
+ <include relativeToChangelogFile="true" file="Salesproject_Phase_icons.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/indicesRefactor/Activity.xml b/.liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_Activity.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/indicesRefactor/Activity.xml
rename to .liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_Activity.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/indicesRefactor/ContactManagement.xml b/.liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_ContactManagement.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/indicesRefactor/ContactManagement.xml
rename to .liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_ContactManagement.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/indicesRefactor/Keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_Keyword.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/indicesRefactor/Keyword.xml
rename to .liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_Keyword.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/indicesRefactor/Task.xml b/.liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_Task.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/indicesRefactor/Task.xml
rename to .liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/indices_Task.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/removeFKs.xml b/.liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/removeFKs.xml
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/removeFKs.xml
rename to .liquibase/Data_alias/basic/2019.1.4/constraintsRefactor/removeFKs.xml
diff --git a/.liquibase/Data_alias/basic/2019.1.4/create_description_translation.xml b/.liquibase/Data_alias/basic/2019.1.4/create_description_translation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..07230bba7ef2d81b2165a00c360d2295255b1483
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/create_description_translation.xml
@@ -0,0 +1,18 @@
+<?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="m.mansour" id="ba354d1e-f161-4b20-aaf2-f7ddf6419f57">
+ <createTable tableName="DESCRIPTIONTRANSLATION">
+ <column name="DESCRIPTIONTRANSLATIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_DESCRIPTIONTRANSLATION_DESCRIPTIONTRANSLATIONID"/>
+ </column>
+ <column name="OBJECT_TYPE" type="VARCHAR(50)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="OBJECT_ROWID" type="CHAR(36)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="LANG" type="CHAR(36)"/>
+ <column name="DESCRIPTION" type="NCLOB"/>
+ </createTable>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/AditoBasic/ObjectRelation_exampleData.xml b/.liquibase/Data_alias/basic/2019.1.4/data/AditoBasic/ObjectRelation_exampleData.xml
deleted file mode 100644
index e9a0ce04943fdc463a68127bbe377aa382e64091..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/AditoBasic/ObjectRelation_exampleData.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="44c06ef1-d9b7-4c5a-a3ee-276ed84caca3">
- <delete tableName="AB_OBJECTRELATION"/>
-
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
- </insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="85ad4578-dce2-49df-a844-d162f1bd9f2f"/>
- <column name="OBJECT1_ROWID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="OBJECT2_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
- </insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="5c545235-231f-4082-9e74-4ec4512eb98d"/>
- <column name="OBJECT1_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="e397b595-38ae-4365-908e-75ee388838eb"/>
- </insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="4c9bc7f3-c13b-4e55-9c23-012ba40196c9"/>
- <column name="OBJECT1_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="OBJECT2_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="AB_OBJECTRELATIONTYPE1" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
- <column name="AB_OBJECTRELATIONTYPE2" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- </insert>
- </changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/ACTIVITY_gfk.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/ACTIVITY_gfk.xml
deleted file mode 100644
index 190ffff07bded81d5b2d5233ee4c8d879d598ecc..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/ACTIVITY_gfk.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.goderbauer" id="4a7bca18-2923-4a5f-a7dc-acf1b10db9fd">
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
- <column name="SUBJECT" value="Webinar: Transparentes Kampagnen- und Veranstaltungsmanagement"/>
- <column name="INFO" valueClobFile="LOBs/subjectText_661a7b87.txt"/>
- <column name="CATEGORY" valueNumeric="1"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-03T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="5a4d249a-e3e4-48e5-80a5-2fd1567a82b8"/>
- <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="83337967-5d58-4b17-88c2-2aeefa130c21"/>
- <column name="ACTIVITY_ID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="OBJECT_ROWID" value="6be18a7e-e7fa-11e8-9f32-f2801f1b9fd1"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
- <column name="SUBJECT" value="Webinar-Aufzeichnung"/>
- <column name="INFO" value="Aufzeichnungen zum Thema "Transparentes Kampagnen- und Veranstaltungsmanagement" verschickt."/>
- <column name="CATEGORY" valueNumeric="2"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-07-31T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="b0fae79b-0b1e-4650-8d94-853d17cca7bd"/>
- <column name="ACTIVITY_ID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
- <column name="SUBJECT" value="Daten-update"/>
- <column name="INFO" value="Hat uns Zusatzinfos geschickt - diese wurden an allen entsprechenden Stellen hinterlegt und final eingepflegt"/>
- <column name="CATEGORY" valueNumeric="3"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-03T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="01ff4193-d5b4-41eb-b2db-ea31e5ed7df4"/>
- <column name="ACTIVITY_ID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
- <column name="SUBJECT" value="Prüfung durchgeführt"/>
- <column name="INFO" value="Abgleich der Bestandsdaten wurde gemacht."/>
- <column name="CATEGORY" valueNumeric="3"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-06T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="80d3de8f-fd86-401b-aeae-63b389b9310c"/>
- <column name="ACTIVITY_ID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
- <column name="SUBJECT" value="weiterer Vertrag"/>
- <column name="INFO" value="Vertragsgrundlagen besprochen. Wird in den nächsten Tagen definiert"/>
- <column name="CATEGORY" valueNumeric="2"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-04T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="5ad45b3e-72a0-419e-a183-17aaead38158"/>
- <column name="ACTIVITY_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
- <column name="SUBJECT" value="Standortwechsel"/>
- <column name="INFO" value="Ein Standortwechsel steht an und die neuen Daten wurden erfasst."/>
- <column name="CATEGORY" valueNumeric="2"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-09T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="6c212e64-a9db-4395-a118-5279dbc6761d"/>
- <column name="ACTIVITY_ID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
- <column name="SUBJECT" value="Einladung Messe"/>
- <column name="INFO" value="Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut"/>
- <column name="CATEGORY" valueNumeric="1"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-04T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="8d384436-9989-4571-a193-cc3061249f97"/>
- <column name="ACTIVITY_ID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
- <column name="SUBJECT" value="Präsentation: Terminvorschlag"/>
- <column name="INFO" value="Terminvorschlag gesendet. Aufgabe gestellt"/>
- <column name="CATEGORY" valueNumeric="1"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-12T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="20a50d5d-fe87-4ed2-8f94-b2571b6b34e7"/>
- <column name="ACTIVITY_ID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
- <column name="SUBJECT" value="Einladung zum GfK-Abend"/>
- <column name="INFO" value="Einladung von Kunden, Interessenten und Zulieferern zu einer internen Veranstaltung in unserem Haus"/>
- <column name="CATEGORY" valueNumeric="0"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-08-11T12:02:52"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="46d9d317-1b7d-4046-8278-9a4957cc1dfe"/>
- <column name="ACTIVITY_ID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/LOBs/subjectText_661a7b87.txt b/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/LOBs/subjectText_661a7b87.txt
deleted file mode 100644
index ed03740997fc4fc1e20bc306f533fa1150446237..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/LOBs/subjectText_661a7b87.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-<html>
- <body>
- <h1>Headertest</h1>
- <p>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
- </body>
-</html>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/LOBs/subjectText_661a7b87_1.txt b/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/LOBs/subjectText_661a7b87_1.txt
deleted file mode 100644
index 96486e079fe0f2d2e0be1219c9015dd8ff93c76a..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_activity/LOBs/subjectText_661a7b87_1.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
-
-Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
-
-Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. </p>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_attribute/Attribute.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_attribute/Attribute.xml
deleted file mode 100644
index ccbf6e85d419fe80105542b309ed4156a3daa85f..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_attribute/Attribute.xml
+++ /dev/null
@@ -1,1506 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="autogenerated" id="3e8ccb05-1f0b-4de4-894a-bbb1d07975f0">
- <delete tableName="AB_ATTRIBUTE"/>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="own company"/>
- <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Interested"/>
- <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Consultant"/>
- <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Partner"/>
- <column name="ATTRIBUTE_PARENT_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Acquisition"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Project planned?"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="No project planned"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Project planning open"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Next contact?"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="First contact"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Product interest"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Commodity group A"/>
- <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Product A1"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Product A2"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Commodity group B"/>
- <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Product B1"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Product B2"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="General"/>
- <column name="ATTRIBUTE_PARENT_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="ToDo"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Send information"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Distribution"/>
- <column name="ATTRIBUTE_PARENT_ID" value=" "/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Presentation"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Technical requirement"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Pros"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="flexible"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Reference"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Technology"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Cons"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Technology"/>
- <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Reference"/>
- <column name="ATTRIBUTE_PARENT_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Next steps"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="ToDos"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Follow up (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Other (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Personal estimation"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="6"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Assessment"/>
- <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="30"/>
- <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="60"/>
- <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="90"/>
- <column name="ATTRIBUTE_PARENT_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Reason"/>
- <column name="ATTRIBUTE_PARENT_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Participant"/>
- <column name="ATTRIBUTE_PARENT_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="7"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Commodity group A (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Commodity group B (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Follow up (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Origin"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="personal"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Reference customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Website"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Trade fair"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Call"/>
- <column name="ATTRIBUTE_PARENT_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Contract"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Service contract"/>
- <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Maintenance contract"/>
- <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Frame contract (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Custody agreement"/>
- <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Data protection agreement"/>
- <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Declaration of acceptance"/>
- <column name="ATTRIBUTE_PARENT_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="6"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Known because"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="6"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Existing contact"/>
- <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Recommendation"/>
- <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Print media"/>
- <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Trade fair"/>
- <column name="ATTRIBUTE_PARENT_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="ToDo"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="7"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Call back (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Send documents (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Make offer (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Send brochure (WV)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Departments"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="29e6ddbf-77fd-4fb2-ae20-fdad9495dbd5"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Management"/>
- <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Distribution"/>
- <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="dc1427a9-056a-463a-a07f-f08f820fae0e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Field staff"/>
- <column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="5999ee67-44a4-4ec6-a4c4-6c6d58b8e50a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Office staff"/>
- <column name="ATTRIBUTE_PARENT_ID" value="c9d81109-4406-4205-8b90-e27acf587cf1"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="93de7e9f-3ecd-45e7-aafe-020ab5f3ee79"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Marketing"/>
- <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e47c7fb1-1072-4f03-a275-e4b6331deec1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="IT/Service"/>
- <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c133a157-0109-4d88-8343-71db25b12fc5"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Production"/>
- <column name="ATTRIBUTE_PARENT_ID" value="87d4ff5b-0ab6-4534-be26-76c6ef486072"/>
- <column name="ATTRIBUTE_TYPE" value="VOID "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Competitor"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Pricing policy"/>
- <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
- <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
- <column name="DROPDOWNDEFINITION" value="SalesprojectPricePolitics"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="558419b2-6113-4060-b88d-cc6324754765"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Strength"/>
- <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
- <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
- <column name="DROPDOWNDEFINITION" value="SalesprojectStrength"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Weakness"/>
- <column name="ATTRIBUTE_PARENT_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
- <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
- <column name="DROPDOWNDEFINITION" value="SalesprojectWeakness"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Interests"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="53266a7c-58ed-47dc-bbe8-9e00b33cb344"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Goodwill"/>
- <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Type of damage"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Regulation"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Technical specifications"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e7e05c6e-6108-44bd-824a-c076dfa5ae93"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="B"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ed4c3079-51b0-4bb5-b228-55de4309d5ab"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="0 low"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6266b41c-fa20-47b9-bd71-5633015d0796"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="good"/>
- <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Atmosphere"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="6"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Risk"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="54018b5e-0e02-48d1-873c-1c934d2e97ed"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Racing bike"/>
- <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="292825e8-fa96-4b7b-8dab-71955ae14571"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="A"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="4fcd8bb8-72fd-48d0-9e64-4c80e5177c36"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="NPO"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_INFO" value="Als Attribut ist der Name aus lib_frame z.B. 'ORG' 'PERS' 'OFFER' etc. zu verwenden."/>
- <column name="ATTRIBUTE_NAME" value="Dokument template usage"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="2b6e3225-9447-4706-9313-62c9463d6671"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Handcraft"/>
- <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="be60e4b3-19b1-48a9-ad5c-c7d38698b4a1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Dumping price competition"/>
- <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6d15f683-389e-4915-9043-c4cfdf188095"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Full calculation"/>
- <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_INFO" value="Konditionen die bei Angebotserstellung übernommen werden"/>
- <column name="ATTRIBUTE_NAME" value="Conditions"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Others"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Product type"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="6"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="b1c552a0-eab9-417d-9f12-039d41603f6d"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="medium"/>
- <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9e20d257-e2a7-4ef7-9253-1d8ed971b7b9"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="D"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="0a6cbbc0-bd0e-4794-96ef-3d458d5fdb70"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="1 medium"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="32612c75-b32c-4043-88c4-e8237acf8d5c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="loves sociability"/>
- <column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6db07a20-86bc-48da-8b27-b39bdd73b86b"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Project shift customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="85c9cdd8-f7a6-4210-840e-fab8628f4dbe"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Quality problem customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="7c39913b-a07c-4332-96ff-7b34b566ff49"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Wine"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="07fc6730-6c83-4996-bfd9-41c18765a10a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Decision-maker changed"/>
- <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="26385e16-6b2f-428c-9c28-1bfa9c2ccf6f"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Financial service"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Sport"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="7f01bfa6-ce9d-4964-b1e2-3cd5464d076a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Device/Machine"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Annual holidays"/>
- <column name="ATTRIBUTE_PARENT_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
- <column name="ATTRIBUTE_TYPE" value="NUMBER "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="005b2ec8-68f3-4cbe-b9e5-783526e4c288"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Away travel"/>
- <column name="ATTRIBUTE_PARENT_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="4dce5406-9a91-4a92-b55e-d1313c18f9c6"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Partial calculation"/>
- <column name="ATTRIBUTE_PARENT_ID" value="965823ef-fe63-41f8-9b0b-432f17ac31a7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9cfa5ce3-f1ae-4d18-9a65-0571f5ffb786"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="PERS"/>
- <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Assessment"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Industry"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Target group"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="bb0c6356-33be-4e7c-a409-9ef5145f7aae"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Service"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="17746b46-2702-447a-b749-a92bfdf4bb38"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="d0a9eb78-6dcf-48e0-ba91-04a3ba104d26"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Interested person"/>
- <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e4a60941-513f-4e75-a787-f00070ecb00a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Manufacturer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="1d30d0ab-6103-4972-84c0-fd23eef15ca1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Competitor"/>
- <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Assistance"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Contacting"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Signature"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="79ee6a0f-5192-4db3-9b05-156fd18b01b4"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Beer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Treat"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="a3972e57-d081-463a-a33c-5d4d3af6d8f2"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Motor cycle"/>
- <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Revolution speed (rpm)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
- <column name="ATTRIBUTE_TYPE" value="NUMBER "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="4c28a67b-dbc5-4399-bf33-b52e4cf82ffd"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="ORG"/>
- <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="2318607b-556a-4537-92f0-9870ee9a9201"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Cigars"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="43321e69-c8aa-4b0e-9c4e-8cde74f5c0fc"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Wear part"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9882c4bc-a3d9-43a9-8238-81ef39387869"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Mechanical engineering"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Loyalty"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="b93fc811-e0dc-4e50-9ca6-107f43ac4c0c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Data table"/>
- <column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Delivery block"/>
- <column name="ATTRIBUTE_TYPE" value="BOOLEAN "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="d14f6eea-8760-43bf-ad3a-e7c3e4416392"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Partner"/>
- <column name="ATTRIBUTE_PARENT_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Birthday list"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
- <column name="DROPDOWNDEFINITION" value="YesNo"/>
- <column name="SORTING" valueNumeric="10"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Project type"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3265f271-2e85-42b2-84af-c9e23e8a1e8c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Internal"/>
- <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="615d3850-ef32-4988-9a8d-7b702b489194"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Partner"/>
- <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="be3b5fe2-2146-4eab-80a4-3c1cf4d6156a"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Consisted customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="87204e4b-2db2-4eb4-b216-5e16b227561e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Prospective customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="4a9625ed-0cd9-445f-ae13-5bdbfdf3f38c"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Soccer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Conveyor"/>
- <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
- <column name="ATTRIBUTE_TYPE" value="BOOLEAN "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="fa0171cf-2e0d-4ff0-bbe7-8ff083a96593"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Additional data"/>
- <column name="ATTRIBUTE_PARENT_ID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="974bbd28-08b3-41a4-bd74-7d9c3c778249"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="No risk"/>
- <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="9350afa2-7181-4eb4-b731-3699fe71b0f6"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="bad"/>
- <column name="ATTRIBUTE_PARENT_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="d8949d8f-051b-4f5b-ba61-5af49e9499cc"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Spare part"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="23a4d394-9fae-4205-a811-730d5109c115"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Sailing"/>
- <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Tool changer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
- <column name="ATTRIBUTE_TYPE" value="BOOLEAN "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="617da3f5-d8bc-45ff-85a1-258621ea2a0b"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Logistics"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="7"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="1a3c1c77-e57c-4481-a67f-adf7e084ea90"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="IT"/>
- <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="953e3b5e-0ca7-4215-8dee-b0ba28ef1bf9"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Payment problem customer"/>
- <column name="ATTRIBUTE_PARENT_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="2bdb04cb-4cd3-4454-802c-8e2b4a5e2e36"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Agency"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="6"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="30be2556-e09b-4169-be32-d4bafeb89a2f"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Tourism"/>
- <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="acafca42-8ef4-4c21-abe8-1c2ca358a5aa"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Trade"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="4"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="79378933-9f74-4391-b876-4528b582661f"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Building industry"/>
- <column name="ATTRIBUTE_PARENT_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="5"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c85a5ebe-80fe-4176-a92a-35d2200baa07"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="2 big"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Weight (kg)"/>
- <column name="ATTRIBUTE_PARENT_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
- <column name="ATTRIBUTE_TYPE" value="NUMBER "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Creditworthiness"/>
- <column name="ATTRIBUTE_PARENT_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Occupation"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
- <column name="ATTRIBUTE_TYPE" value="COMBO "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Employees"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="957d61a4-0038-46e0-b5a3-fc2a5d413004"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="C"/>
- <column name="ATTRIBUTE_PARENT_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="be31d7a5-9a02-4ae0-8265-916d32c1fccb"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Additional data"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="4d4ef830-68e6-4228-9e4f-13614d841328"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Economy"/>
- <column name="ATTRIBUTE_PARENT_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="bb62ae03-be34-4d34-885c-27591c5bf1b4"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Golf"/>
- <column name="ATTRIBUTE_PARENT_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="0afb463f-6ce4-4dfb-b093-09a8fcd925a3"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Component"/>
- <column name="ATTRIBUTE_PARENT_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Employee account"/>
- <column name="ATTRIBUTE_TYPE" value="GROUP "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="97c6f6ec-2ed2-4c26-8612-b524e3ef15db"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="DOCUMENT"/>
- <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="fffbb6b5-05ea-4f76-83c6-cf2cb29ef576"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Incomplete delivery"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="5c188c8c-14b2-4c66-ad48-65b750e05353"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Quality complaint"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3600aba4-01d4-4ca3-a3e7-79e0b946a2b1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Faulty delivery"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="66b64741-a896-4404-874a-b83b3525fcff"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Transport damage"/>
- <column name="ATTRIBUTE_PARENT_ID" value="0ecd14d9-837c-47fc-9676-afe71f7e5518"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="0"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="c0fb9a3a-89a5-46a4-9b95-f48c9481375e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="EVENT"/>
- <column name="ATTRIBUTE_PARENT_ID" value="9e9568c5-ad8a-4c1e-a6e6-72c9b4a3acf7"/>
- <column name="ATTRIBUTE_TYPE" value="COMBOVALUE "/>
- <column name="SORTING" valueNumeric="3"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Payment term"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
- <column name="DROPDOWNDEFINITION" value="PaymentTerm"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Delivery term"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
- <column name="DROPDOWNDEFINITION" value="DeliveryTerm"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Pricelist"/>
- <column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
- <column name="DROPDOWNDEFINITION" value="ProductPricelist"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e7886e41-252e-414c-a169-5d1481d010c8"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Supplier"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Campaign response"/>
- <column name="ATTRIBUTE_PARENT_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Writes for"/>
- <column name="ATTRIBUTE_PARENT_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="33cb83f1-aee2-469e-b57d-666ac6725f61"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Subordinate campaign of"/>
- <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION "/>
- <column name="DROPDOWNDEFINITION" value="Campaign"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="093c7337-c134-4be5-a215-dc94804c3511"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Superordinate campaign of"/>
- <column name="ATTRIBUTE_TYPE" value="OBJECTSELECTION "/>
- <column name="DROPDOWNDEFINITION" value="Campaign"/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Holiday"/>
- <column name="ATTRIBUTE_PARENT_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Office staff"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Field staff"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Service"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="0"/>
- <column name="ATTRIBUTE_NAME" value="Visit frequency"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Boss of"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Reports to"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Region"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Urlaubsgenehmigung durch"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- <insert tableName="AB_ATTRIBUTE">
- <column name="AB_ATTRIBUTEID" value="3f119858-9d69-4903-a572-d286be151f73"/>
- <column name="ATTRIBUTE_ACTIVE" valueNumeric="1"/>
- <column name="ATTRIBUTE_NAME" value="Urlaubsprüfung durch"/>
- <column name="ATTRIBUTE_PARENT_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="ATTRIBUTE_TYPE" value="TEXT "/>
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_attribute/AttributeUsage.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_attribute/AttributeUsage.xml
deleted file mode 100644
index ed487a5a71bc2f197a7f18edcbd66389faf0b7a9..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_attribute/AttributeUsage.xml
+++ /dev/null
@@ -1,1211 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="s.listl" id="33bfbf9d-e3b9-4dd0-94e5-f22c74bc3014">
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="48e9320b-b2b4-4523-bb34-e68749fe1465"/>
- <column name="AB_ATTRIBUTE_ID" value="b4e372c5-da95-4c16-9d10-3be1c6a9eddd"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="1d34b5e6-44ca-4577-925e-5b93e96be40a"/>
- <column name="AB_ATTRIBUTE_ID" value="a6eee141-5ed6-4b87-986f-29e3fdccaf13"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b70e6047-c8d9-4be0-99a9-e8a6b4a07c9b"/>
- <column name="AB_ATTRIBUTE_ID" value="bfc5c9d3-274e-49e9-b8ab-8a4c24987026"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="6fb3f5c0-177e-41ad-88c1-44d096ead1de"/>
- <column name="AB_ATTRIBUTE_ID" value="ae04f4ba-0ddb-4188-9ec1-b9ce2d9b11d8"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="022f3b98-f716-47ca-aaa1-7db53f86b821"/>
- <column name="AB_ATTRIBUTE_ID" value="43a913ce-d73c-48a6-aa4b-ad050e1f1b26"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="aeb00c8d-dbee-4657-b5da-4e7aaa494120"/>
- <column name="AB_ATTRIBUTE_ID" value="96fc2fe2-8424-4ff2-8eb5-0d054e26af9b"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="3ea3348e-bffa-47d9-ac58-cfb9fb7c21e7"/>
- <column name="AB_ATTRIBUTE_ID" value="746bbd1d-344b-487e-adb5-d232aba57c0e"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="570f695f-5fd1-4f5a-b21d-62ab721db1ef"/>
- <column name="AB_ATTRIBUTE_ID" value="40bbf16f-566d-442c-8423-64be0ae40c81"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="c6bb63b2-afdb-4dde-a22a-0022926425d8"/>
- <column name="AB_ATTRIBUTE_ID" value="b8179c49-8ef0-4d8e-bcb2-762f9d05563b"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="924782ab-fc54-432e-aa19-d04a986fb3da"/>
- <column name="AB_ATTRIBUTE_ID" value="4c71d1da-9fff-43fc-b6fd-6fc24696c4bf"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="247a2d0b-dd07-4799-89fc-e85d3ef10947"/>
- <column name="AB_ATTRIBUTE_ID" value="3587a98c-03e4-4acc-af89-13b26ce4d956"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d890f5d6-0330-457a-8650-9261f494fe9c"/>
- <column name="AB_ATTRIBUTE_ID" value="ddd06ec5-b0f8-4c12-8753-e7333fcf87cf"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="440250fb-033a-4db2-84ec-1f05e90b5d1d"/>
- <column name="AB_ATTRIBUTE_ID" value="4bb88e18-f160-4bf3-b9b2-d1a413dcecf5"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b405df7f-07e3-43c6-b067-c29a083489db"/>
- <column name="AB_ATTRIBUTE_ID" value="e144b3f5-3074-4d92-a645-2b7aa601564c"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="85d90ab9-8b2c-4759-b730-14bdc21bdf0c"/>
- <column name="AB_ATTRIBUTE_ID" value="90578c72-fd3a-4b09-8116-31a017b6c623"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d1c81512-9e0c-45ae-bf58-7fc025ecbe12"/>
- <column name="AB_ATTRIBUTE_ID" value="de6702e0-9253-4d7a-ab20-b8efb963ee63"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b327f51d-1d52-4db0-96e1-3b1a02af603d"/>
- <column name="AB_ATTRIBUTE_ID" value="2d66c8b6-cf6e-44b2-b663-488f3f4d6647"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="745b9d55-4402-4b0d-95c1-60cc86d753c0"/>
- <column name="AB_ATTRIBUTE_ID" value="620a0903-6fde-4751-aefa-c398d64c13cc"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="fb175158-9a11-49df-9d2d-c5149826db0f"/>
- <column name="AB_ATTRIBUTE_ID" value="6e162c86-3b07-4817-8570-ef5598b4f455"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="a4c52b1c-2a9d-480f-9ed2-266ef94102f2"/>
- <column name="AB_ATTRIBUTE_ID" value="ee8c2bff-92c9-456a-a665-c7ccc3960f8d"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b358d1b5-e3be-4b81-8f68-8b8bfe6084c2"/>
- <column name="AB_ATTRIBUTE_ID" value="33937757-d170-4c4f-bca7-2a687b0c3a8a"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="7aece23a-c0d2-432c-86da-f6b766752062"/>
- <column name="AB_ATTRIBUTE_ID" value="bae6db6b-259a-4f36-9112-4516b7f8cfeb"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="0a32ee8c-3fc7-4412-ab4a-e17668396954"/>
- <column name="AB_ATTRIBUTE_ID" value="ffeeca2a-2349-40dc-9b0c-4a8b3447d3df"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="79133e7e-fd63-4d71-90a2-96a487e5ab42"/>
- <column name="AB_ATTRIBUTE_ID" value="10d2cbd3-9c58-4e9d-9259-d556aba6cf6c"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="fdd04439-6302-41ec-bbf1-5b63e2142cbc"/>
- <column name="AB_ATTRIBUTE_ID" value="6537b5ae-9bfd-455e-8b48-183895b9b461"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="5f8563c1-5467-4655-a42f-72dcf43d184b"/>
- <column name="AB_ATTRIBUTE_ID" value="f5e7449a-f61e-4022-aa93-6b3916ddbed7"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="24f74162-380a-4f9e-bf71-1e8a51275118"/>
- <column name="AB_ATTRIBUTE_ID" value="f7aad2b0-021e-48dd-8286-a364d0ac9fca"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="ddee95f8-21f9-4b6b-850f-79e9f12d3c4c"/>
- <column name="AB_ATTRIBUTE_ID" value="61436f5e-b85a-477e-af8b-5369d12ad742"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="4704a3a1-7762-4863-8dca-6e3ce8b4ba9f"/>
- <column name="AB_ATTRIBUTE_ID" value="913457fc-361c-4af6-ab5a-85a0ad8640e5"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="c37d0b13-468b-4018-802e-a290ccd239b7"/>
- <column name="AB_ATTRIBUTE_ID" value="eaa9aea2-73f3-48f4-909d-81de5e09a75f"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b1df815f-535f-46c6-9df5-0c43bbcc8c47"/>
- <column name="AB_ATTRIBUTE_ID" value="7a4282b8-8461-4486-9362-bc72ceb7b5df"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="f049d2f7-bacf-4b57-b40a-779111a0b944"/>
- <column name="AB_ATTRIBUTE_ID" value="0c86b9ad-1635-46b4-8ac7-3d9b00bc2b01"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="33b8e55d-227c-4a5c-8e92-89e429dc1157"/>
- <column name="AB_ATTRIBUTE_ID" value="14b71577-42d6-40c0-a377-a11df03aa324"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="2057fae3-bea6-4a90-8dcc-b795f677c7ac"/>
- <column name="AB_ATTRIBUTE_ID" value="d3f2348b-fad2-4e4c-9ff6-cb22b0a0cd93"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="c43230d6-984b-4b47-8c39-3fceb126641b"/>
- <column name="AB_ATTRIBUTE_ID" value="fb01b321-ec75-486b-a0ef-3adfe99a33b2"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b3f6e18e-8bdc-4679-aaa5-895c08430532"/>
- <column name="AB_ATTRIBUTE_ID" value="149c1c4c-3742-46b5-9a31-7afe22965df7"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b78f182a-bade-428a-9b12-fd40f52414a9"/>
- <column name="AB_ATTRIBUTE_ID" value="b49852b7-901d-4d6b-b5d8-b20d75678d4b"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="27a518a0-0456-4494-8d9e-a62afb70fd68"/>
- <column name="AB_ATTRIBUTE_ID" value="542ca620-3ad0-49cc-acf9-e31f4542f302"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="3c0a29b2-e98f-4aae-902d-e5ae691537f5"/>
- <column name="AB_ATTRIBUTE_ID" value="3eb8a90f-c17b-441e-9aa8-acde31e4544c"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="7593fe50-00be-42fc-9e75-8eae49fb2b25"/>
- <column name="AB_ATTRIBUTE_ID" value="9d0949b5-7c87-4663-9229-897057e03192"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="202789a8-4d69-43b2-ab38-708938081d68"/>
- <column name="AB_ATTRIBUTE_ID" value="a689a561-d30f-4215-8faa-97b8df3e5b68"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="642ee10a-b516-4fa3-95fc-f402992a0158"/>
- <column name="AB_ATTRIBUTE_ID" value="d0d78243-cc6e-4602-b77c-b3e669da2f01"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="6c6651b6-a8a5-4f89-82a1-3f1c22a8d9b6"/>
- <column name="AB_ATTRIBUTE_ID" value="ec874d78-6231-45d6-a4c2-193756587981"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b55dd353-cb6b-48a1-8cad-c3e90f63a8b0"/>
- <column name="AB_ATTRIBUTE_ID" value="6d4dd325-7f30-4098-a391-ebae4f27988e"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d546bc42-e452-4446-a85e-557f6c0bc88b"/>
- <column name="AB_ATTRIBUTE_ID" value="f8d8d58e-9381-4e44-aeae-284116ca3613"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="504487e9-86f8-4ff1-91a2-b364829fa86b"/>
- <column name="AB_ATTRIBUTE_ID" value="d0ae40d2-1a7f-45f6-bb0c-20ce6ae7efe2"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="33d64ce6-e8b4-4acf-ac75-0d99d0092c6c"/>
- <column name="AB_ATTRIBUTE_ID" value="956622a7-03b3-42a4-a7ef-f8936d92cff9"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="07704049-9ae8-4d07-86e3-1042ed104035"/>
- <column name="AB_ATTRIBUTE_ID" value="f0f0b150-ea60-46e5-ba4f-727c78c993d0"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="4757e926-3059-4969-b07a-f04479f6d723"/>
- <column name="AB_ATTRIBUTE_ID" value="c5f8b5f7-ddc0-4c88-bebd-be96fd37bb9c"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="22a31ed9-be4d-45db-ad2a-5777e9a785bf"/>
- <column name="AB_ATTRIBUTE_ID" value="262a8fbe-d6ef-4949-87ce-6202967136d7"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d8352147-7866-40c2-8f1a-063ccc4b0c04"/>
- <column name="AB_ATTRIBUTE_ID" value="67edd12f-93cc-45d4-b86a-b59d19936442"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="55879930-2f90-44ec-a9b6-fdfe2226a7b0"/>
- <column name="AB_ATTRIBUTE_ID" value="78343572-20fa-454d-ab26-0e1ac0dccc9e"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="cc03ab69-248a-4ee0-9219-120fcc8c69da"/>
- <column name="AB_ATTRIBUTE_ID" value="9b2dd256-fe8e-4edd-9f1e-0a841103a41a"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="925a2fe7-2d7d-425b-b55d-71c3d6cfe554"/>
- <column name="AB_ATTRIBUTE_ID" value="f001e3a8-b888-49a8-89e1-96ecc503e936"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="55eed1d2-086c-4e25-a59e-ec3d1e8c3283"/>
- <column name="AB_ATTRIBUTE_ID" value="9c64aefe-23c0-4e64-ada5-02db5f4bcb85"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="c0f1778b-595f-4e76-831e-0df4b323f711"/>
- <column name="AB_ATTRIBUTE_ID" value="c31d3ee4-3e08-4a3e-acdb-5f5d236e01de"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="a22a9765-637e-4ca4-818a-e3acb8306776"/>
- <column name="AB_ATTRIBUTE_ID" value="15810377-58c8-4e22-8dd1-ed341f7baf0a"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="7e5726f4-16f4-4b18-ae95-a6ad24e49d40"/>
- <column name="AB_ATTRIBUTE_ID" value="3a0843a4-0d43-4b97-9fe5-4d4049ec79d3"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="1310d547-f5d2-4e30-8e30-0deeba7de746"/>
- <column name="AB_ATTRIBUTE_ID" value="685a771b-86d9-4493-80f1-de65fc613ea3"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="6462a324-535a-4978-86f2-e439f581571a"/>
- <column name="AB_ATTRIBUTE_ID" value="c2eb5976-39d0-4098-8e1f-1fff0c910faf"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="8c380566-bab2-4397-a7f7-a88f2c728388"/>
- <column name="AB_ATTRIBUTE_ID" value="fd8cd4b8-a284-4e1d-accd-310b85577c98"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="f6d3a5f3-04bd-4cf1-8057-11a1af4352a4"/>
- <column name="AB_ATTRIBUTE_ID" value="941a02f8-577f-40a9-8e43-0ea4d695f254"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="607b45dc-2a97-4005-9d38-488640665aa1"/>
- <column name="AB_ATTRIBUTE_ID" value="593bd38f-704a-480a-add3-22e0af9e2460"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="63801bc2-a0a2-4a3c-a531-1949ff3041a6"/>
- <column name="AB_ATTRIBUTE_ID" value="8a9ee08c-da32-40b0-93a3-3a388158dd3c"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="5bdf8396-30bb-4fbc-bdbe-304fa7d73fb2"/>
- <column name="AB_ATTRIBUTE_ID" value="a559f36c-768b-4fc4-b4f2-7dfd25fadb4a"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="f71f995d-0022-4144-95a9-88e33468b835"/>
- <column name="AB_ATTRIBUTE_ID" value="5929874c-ab20-4d18-9d75-083e39f8d576"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d6982ee5-616a-4eb9-adf9-e571658851ea"/>
- <column name="AB_ATTRIBUTE_ID" value="0adcd251-d3d1-4bed-a299-39373c098cad"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="717abaf4-3ed3-4754-ba01-3192677ac399"/>
- <column name="AB_ATTRIBUTE_ID" value="786d0154-acec-4281-8ddc-52772d5ea1ea"/>
- <column name="MAX_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
- <column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
- <column name="AB_ATTRIBUTE_ID" value="752d7706-ac6e-4b51-a918-4265531794a4"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
- <column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
- <column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
- <column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
- <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="OBJECT_TYPE" value="Salesproject"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
- <column name="AB_ATTRIBUTE_ID" value="f11f65d0-4352-4f81-85d0-bfd034275e34"/>
- <column name="MIN_COUNT" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
- <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
- <column name="AB_ATTRIBUTE_ID" value="691452ec-3b9f-43dc-91a2-645a97b775b2"/>
- <column name="MIN_COUNT" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
- <column name="AB_ATTRIBUTE_ID" value="0644222a-2b3b-4f5e-a85a-d24c32fa0e72"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="f06dd320-4757-4261-aace-cb827a313d28"/>
- <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
- <column name="AB_ATTRIBUTE_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
- <column name="OBJECT_TYPE" value="Contract"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
- <column name="AB_ATTRIBUTE_ID" value="b78ef891-16a3-4354-bc95-7b70ef5b4e2e"/>
- <column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
- <column name="AB_ATTRIBUTE_ID" value="6819c616-a580-4bd6-ba41-9ba1db569dc4"/>
- <column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
- <column name="AB_ATTRIBUTE_ID" value="25e97db1-f796-497d-9842-3efcbb5bebf1"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
- <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
- <column name="AB_ATTRIBUTE_ID" value="a844a395-e857-447d-b8f8-fa850bbceb82"/>
- <column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="0766ff88-304d-41a7-8224-642a0aee5587"/>
- <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="OBJECT_TYPE" value="Salesproject"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
- <column name="AB_ATTRIBUTE_ID" value="fd3963bc-8e60-411a-9911-b97eb73e5cf7"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Salesproject"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
- <column name="AB_ATTRIBUTE_ID" value="10dc7354-cb50-4354-8412-2c35b569e3ad"/>
- <column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
- <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
- <column name="AB_ATTRIBUTE_ID" value="7b687991-601c-4d75-b201-00a6cc9c6b93"/>
- <column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
- <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
- <column name="AB_ATTRIBUTE_ID" value="c7d28377-8cb1-4f92-a9ac-ed08041a782b"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="05576033-1bee-4547-ab82-fdfcdd039642"/>
- <column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
- <column name="AB_ATTRIBUTE_ID" value="786148de-56b3-497e-88db-2ff5e4dc0bd7"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
- <column name="AB_ATTRIBUTE_ID" value="915d566f-acbe-448c-a7b6-11898adc3880"/>
- <column name="MIN_COUNT" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
- <column name="AB_ATTRIBUTE_ID" value="da8e8568-63e0-41d3-a83f-2d8ae4982ba5"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
- <column name="AB_ATTRIBUTE_ID" value="65f0027d-7939-4342-b531-f31f10c3c045"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="755239d0-7fe3-46bc-8ec4-923977148455"/>
- <column name="AB_ATTRIBUTE_ID" value="7621696c-40ce-4cf2-92ec-74bc940e49ec"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
- <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
- <column name="AB_ATTRIBUTE_ID" value="e73ed929-8631-46de-b28f-eb1423abb808"/>
- <column name="MIN_COUNT" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
- <column name="AB_ATTRIBUTE_ID" value="66271d11-a275-4141-8f84-86ab2ed3fedf"/>
- <column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
- <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="OBJECT_TYPE" value="Product"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
- <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
- <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
- <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
- <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
- <column name="OBJECT_TYPE" value="Activity"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
- <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
- <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
- <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="5fcdb4a4-5b63-4379-a839-319701612438"/>
- <column name="AB_ATTRIBUTE_ID" value="2f963668-9e8c-41d7-aee4-6beaf37492e4"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
- <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
- <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
- <column name="AB_ATTRIBUTE_ID" value="44d53f3a-a8cd-4e79-bc09-a6e17d678e7e"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
- <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
- <column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
- <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
- <column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
- <column name="OBJECT_TYPE" value="Person"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="1f269307-9900-44e7-b575-0412f0ac2908"/>
- <column name="AB_ATTRIBUTE_ID" value="e857f9ee-fb27-4507-8381-46ba0a181cef"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
- <column name="AB_ATTRIBUTE_ID" value="e32cd923-3774-41c1-95d5-57b79e52e568"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
- <column name="AB_ATTRIBUTE_ID" value="1d4c071b-237e-4a11-abff-0acaeaf6f8b1"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
- <column name="AB_ATTRIBUTE_ID" value="acaf54c3-9613-4740-aa22-4f6ebd0d6cb0"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
- <column name="AB_ATTRIBUTE_ID" value="bad29370-3c47-4ac7-8d5d-4e86439000ef"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
- <column name="AB_ATTRIBUTE_ID" value="e8999504-5851-4934-a3f1-fb4b513d41e9"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="931958f6-efaf-4da2-89b1-92f844787094"/>
- <column name="AB_ATTRIBUTE_ID" value="28fd7a4b-72d8-40ff-a893-a9479abcf19e"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
- <column name="AB_ATTRIBUTE_ID" value="ff84c147-27c7-4698-83ff-0e25b1d33851"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
- <column name="AB_ATTRIBUTE_ID" value="d637fc6c-9452-4498-8379-ec71d946cbab"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
- <column name="AB_ATTRIBUTE_ID" value="6bdb658c-94bc-4e68-aefb-a38483ee68b1"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
- <column name="AB_ATTRIBUTE_ID" value="3e5736c4-93ff-4471-96f5-48bb34ab53d2"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="404278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
- <column name="AB_ATTRIBUTE_ID" value="3f119858-9d69-4903-a572-d286be151f73"/>
- <column name="OBJECT_TYPE" value="Employee"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="7889748c-8a13-49d9-b996-b828146bdac8"/>
- <column name="AB_ATTRIBUTE_ID" value="83e627b7-39da-4519-8023-ed384d3a0a42"/>
- <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="cae53196-4987-4f53-a45c-babca1997a48"/>
- <column name="AB_ATTRIBUTE_ID" value="dc52ede6-2b79-488c-b7bb-48877bd5d198"/>
- <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="59d93c4b-e338-497c-9da2-47b4c45444c9"/>
- <column name="AB_ATTRIBUTE_ID" value="f310ae37-5ec3-47c6-839b-a92fc8fcd252"/>
- <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="0498ae18-bae6-44e4-8944-1e756e9d4a8e"/>
- <column name="AB_ATTRIBUTE_ID" value="14847ea6-b6fd-43f6-a819-af2b1e53177e"/>
- <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="90618350-89e6-4e13-8f28-d22de81fea45"/>
- <column name="AB_ATTRIBUTE_ID" value="cd90b9e3-e663-4248-b9ed-4e25ed330c58"/>
- <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<insert tableName="AB_ATTRIBUTEUSAGE">
- <column name="AB_ATTRIBUTEUSAGEID" value="b6b323a2-9c8c-49c0-89c1-08ca1bb06c29"/>
- <column name="AB_ATTRIBUTE_ID" value="7abdc3a7-f46b-4021-b695-7fde6b21c6a4"/>
- <column name="OBJECT_TYPE" value="DocumentTemplate"/>
-</insert>
-<rollback>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="3234f4e2-0ee7-4782-9b10-c953b7b1be29"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="c4f2943f-a63c-4ede-815b-0d588f33d5fb"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="cf947eee-dc58-40ad-92b0-f30314a8b2a7"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="81426072-72e5-4a69-945e-754b7fd0bcf7"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="18d77833-d551-405c-8a96-9e99cb4d722d"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="900d4e93-0927-407b-a7bc-bb535fa0caa9"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="1f2749b3-1402-46fb-892a-e68b9a39065d"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="20f400fc-4709-4ecc-a8ca-d8fe405b5e2a"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="140b87a4-4f8e-4ae5-84d5-4bc26fa51901"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="9216c562-b361-4a9d-be60-a6fdf9bdc07c"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="f06dd320-4757-4261-aace-cb827a313d28"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="6ad188dc-5e76-467a-9bc3-8c63f50862ae"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="c32d3322-5ff6-400a-82b6-4f8524ec7f6b"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="e744c324-27ca-4d91-bf57-c487a904d8d6"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="e5ccaa2e-1cae-4ac8-b76c-5c06eac0e53d"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="9e9829fe-880d-4b65-b729-34a99b37c5bf"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="86d385a6-f97f-4868-a65a-9b60940886f0"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="0766ff88-304d-41a7-8224-642a0aee5587"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="06afbdb4-a9e1-493d-b45e-c14e114a9cc7"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="d31efbea-3583-4772-9b5b-b900ab88c9a3"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="e79d1096-a2e0-4c4f-acca-2f5976699dcd"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="37855ddd-c5cb-4692-86a5-3a94aae7c455"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="97dce2df-5757-4a2e-89a1-60a9a88d181c"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="66cac4bb-6dd9-4ddd-b329-14d4542bfd2e"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="05576033-1bee-4547-ab82-fdfcdd039642"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="7c0f32be-d3f5-48be-8b7e-a80eb6ade28d"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="4ff67f07-1aa7-47d4-8e5f-c4860793085a"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="8593dbe5-617a-4f09-a789-02b54157b1d3"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="96d0c724-a00a-4d04-ad44-6a4014318e5a"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="755239d0-7fe3-46bc-8ec4-923977148455"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="4d649c71-ba74-4ee1-ba73-6155327190d4"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="2d2c7f0f-29aa-42e8-88f5-b6234d52e349"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="be7d0f5c-8941-4b3d-b128-bab67e1d609b"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="44398121-8b60-41ff-a657-84b2b5c1e034"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="8998c3b4-4eb8-4885-a290-3915f7e115a4"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="219ea36e-d350-4ea9-9af0-9f396464e138"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="118a4133-c604-4c91-b1d5-13769d2c2bfb"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="d72e9c6d-ad1d-419c-9794-b044c69f9c22"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="e04d728d-f920-4e38-a8eb-258789d5c387"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="eedcc2e4-6af2-42f9-ab48-379d0188d5d8"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="f10f8bd6-1bbd-4970-a41d-af027c063cfc"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="3ab3fec6-229e-430e-b92c-d4f06be3829d"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="5c357e7d-68f7-4408-8b60-36f8a029db28"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="9635f83e-6714-4ede-ab07-0f8180548d56"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="3eb17fc4-94ea-468b-b2bb-0f59101407c4"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="5fcdb4a4-5b63-4379-a839-319701612438"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="d3d2d6ba-5b4f-4f8a-95c2-6c9abc74a9d6"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="b0f42fce-45e4-47e7-9534-534d3c762c81"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="b41518a1-a7e9-452e-be4b-9d1658a9f931"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="4e5e648a-c468-49bb-9ec3-0199ae308045"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="2dcc2277-4e49-4232-a435-2c1b233bf9f2"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="4de9d31f-82a4-4598-85ae-de0b8ce5590d"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="2c1af7b9-f015-4e9e-911a-b975f077f471"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="7d936ff2-41d9-47c6-9145-d165c8b70fe7"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="5f0274a2-6425-4258-9f1f-a510ca6b5861"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="1f269307-9900-44e7-b575-0412f0ac2908"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="3721b0c0-93e0-4c3e-911b-5a30a46f62d9"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="9b23c42d-aff1-40e4-9253-a8eb42ffbdc7"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="692a0346-58ca-4c26-ade9-89d496fb3eb2"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="926c93ac-7b5e-49dd-bde8-5afe05256584"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="6ee459e7-d251-4434-bd26-aff75f3153ea"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="93566ad5-a887-4ead-80bf-d00caffcdceb"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="1b504a1c-7f0b-4acd-8247-35e696468365"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="931958f6-efaf-4da2-89b1-92f844787094"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="c125401f-ed45-4b07-8e87-3f2e20ddb86d"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="278356bb-a558-4049-bf84-b529b6e7d0ff"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="fff6be17-2fb6-4159-b2ca-0409f7f0640e"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="78b09c7a-c313-49db-bb4d-8f71709caf0b"/>
- </whereParams>
-</delete>
-<delete tableName="AB_ATTRIBUTEUSAGE">
- <where>AB_ATTRIBUTEUSAGEID = ?</where>
- <whereParams>
- <param value="04278ec-6e1b-42d7-bbcc-00fd4a1b1db7"/>
- </whereParams>
-</delete>
-</rollback>
- </changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1000.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1000.xml
deleted file mode 100644
index 9927a52e97c92ee9841262bf97bc1925ef9c6622..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1000.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
- <insert tableName="CONTRACT">
- <column name="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="CONTRACTCODE" value="1000"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTEND" valueDate="2019-09-30T00:00:00"/>
- <column name="CONTRACTSTART" valueDate="2018-10-01T00:00:00"/>
- <column name="CONTRACTDUE" valueDate="2019-01-01T00:00:00"/>
- </insert>
-
- <rollback>
- <delete tableName="CONTRACT">
- <where>CONTRACTID = ?</where>
- <whereParams>
- <param value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1001.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1001.xml
deleted file mode 100644
index b37673fcca6e2de324e470008ce8334a5619e2d0..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1001.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
- <insert tableName="CONTRACT">
- <column name="CONTRACTID" value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="CONTRACTCODE" value="1001"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTEND" valueDate="2018-09-15T00:00:00"/>
- <column name="CONTRACTSTART" valueDate="2017-05-01T00:00:00"/>
- <column name="CONTRACTDUE" valueDate="2018-01-01T00:00:00"/>
- </insert>
-
- <rollback>
- <delete tableName="CONTRACT">
- <where>CONTRACTID = ?</where>
- <whereParams>
- <param value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1002.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1002.xml
deleted file mode 100644
index 440e9ce6423f53a4c7be2b39e6967de9539623c9..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1002.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
- <insert tableName="CONTRACT">
- <column name="CONTRACTID" value="eb182167-1e33-4290-a160-a86d09685cba"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="CONTRACTCODE" value="1002"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTEND" valueDate="2020-09-15T00:00:00"/>
- <column name="CONTRACTSTART" valueDate="2015-03-20T00:00:00"/>
- <column name="CONTRACTDUE" valueDate="2020-01-01T00:00:00"/>
- </insert>
-
- <rollback>
- <delete tableName="CONTRACT">
- <where>CONTRACTID = ?</where>
- <whereParams>
- <param value="eb182167-1e33-4290-a160-a86d09685cba"/>
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1003.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1003.xml
deleted file mode 100644
index f474cb79b4e5720fbe6b6af141b45e439657f3fb..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1003.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
- <insert tableName="CONTRACT">
- <column name="CONTRACTID" value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="CONTRACTCODE" value="1003"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTEND" valueDate="2021-09-15T00:00:00"/>
- <column name="CONTRACTSTART" valueDate="2015-03-20T00:00:00"/>
- <column name="CONTRACTDUE" valueDate="2021-01-01T00:00:00"/>
- </insert>
-
- <rollback>
- <delete tableName="CONTRACT">
- <where>CONTRACTID = ?</where>
- <whereParams>
- <param value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1004.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1004.xml
deleted file mode 100644
index 8ba106ae449019ea6caaeac2e405a7d6fe2259a4..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_contract/CONTRACT_1004.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="c7ea5e6e-aff2-4cf5-95f1-f5ca1b350dd0">
- <insert tableName="CONTRACT">
- <column name="CONTRACTID" value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="CONTRACTCODE" value="1004"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTEND" valueDate="2022-09-15T00:00:00"/>
- <column name="CONTRACTSTART" valueDate="2015-03-20T00:00:00"/>
- <column name="CONTRACTDUE" valueDate="2022-01-01T00:00:00"/>
- </insert>
-
- <rollback>
- <delete tableName="CONTRACT">
- <where>CONTRACTID = ?</where>
- <whereParams>
- <param value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1000.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1000.xml
deleted file mode 100644
index 1310ef2cb4c02e3e775e08dea9c3d27b51477774..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1000.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="2b4fb594-d1ad-4057-a695-bff99e49ab40">
- <insert tableName="OFFER">
- <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OFFERDATE" valueDate="2018-11-21T00:00:00"/>
- <column name="OFFERCODE" valueNumeric="1000"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
- <column name="PROBABILITY" valueNumeric="5"/>
- <column name="NET" valueNumeric="210.00"/>
- <column name="VAT" valueNumeric="39.90"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="ADDRESS" value="Gfk AG
-Wilhelm-Straße 4
-80807 München"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="1"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="1"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="ITEMSORT" valueNumeric="2"/>
- <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
- <column name="ITEMNAME" value="AX47"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
- <column name="ITEMSORT" valueNumeric="3"/>
- <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
- <column name="ITEMNAME" value="Produktname4.1"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.1"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="564b5ba4-05ef-4702-b6d8-35417b94abae"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
- <column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
- <column name="ITEMSORT" valueNumeric="4"/>
- <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
- <column name="ITEMNAME" value="Sonderrabatt"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.1.1"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="58ce593c-a1af-41ad-91ee-df7c8a27e142"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
- <column name="ITEMSORT" valueNumeric="5"/>
- <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="ITEMNAME" value="Produktname4.2a"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.2"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="50cd83bc-f7ad-46aa-82a2-fca1a506c0ee"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="ITEMSORT" valueNumeric="6"/>
- <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
- <column name="ITEMNAME" value="Produktname1.1"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.2"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="1b70642f-dc5a-4073-b10a-2eeb52f4dbba"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="ITEMSORT" valueNumeric="7"/>
- <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
- <column name="ITEMNAME" value="Produktname1.2"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.3"/>
- </insert>
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1001.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1001.xml
deleted file mode 100644
index 223dcabb82d4353d2ced6cd5a13de06ec257069a..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1001.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="2b4fb666-d1ad-4057-a695-bff99e49ab40">
- <insert tableName="OFFER">
- <column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OFFERDATE" valueDate="2018-08-12T00:00:00"/>
- <column name="OFFERCODE" valueNumeric="1001"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
- <column name="PROBABILITY" valueNumeric="3"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="ADDRESS" value="Gfk AG
-Wilhelm-Straße 4
-80807 München"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="bb444090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="OFFER_ID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1002.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1002.xml
deleted file mode 100644
index 2ddfc1f59db0f0d42c0429d911a788fc7565542a..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1002.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="2a4fb666-d1ad-4057-a695-bff99e49ab40">
- <insert tableName="OFFER">
- <column name="OFFERID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OFFERDATE" valueDate="2018-06-14T00:00:00"/>
- <column name="OFFERCODE" valueNumeric="1002"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
- <column name="PROBABILITY" valueNumeric="4"/>
- <column name="NET" valueNumeric="630.00"/>
- <column name="VAT" valueNumeric="119.70"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="ADDRESS" value="Gfk AG
-Wilhelm-Straße 4
-80807 München"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="bb444090-b57a-4620-ae65-12c9ade05caa"/>
- <column name="OFFER_ID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1003.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1003.xml
deleted file mode 100644
index 8da2be150f7011f2336a53411184f285c4e6f707..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1003.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="2b321666-d1ad-4057-a695-bff99e49ab40">
- <insert tableName="OFFER">
- <column name="OFFERID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OFFERDATE" valueDate="2018-02-23T00:00:00"/>
- <column name="OFFERCODE" valueNumeric="1003"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
- <column name="PROBABILITY" valueNumeric="1"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="ADDRESS" value="Gfk AG
-Wilhelm-Straße 4
-80807 München"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="42444090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="OFFER_ID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1004.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1004.xml
deleted file mode 100644
index 9a14770741c1783622163387f1411440828723ad..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_offer/OFFER_1004.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="454fb666-d1ad-4057-a695-bff99e49ab40">
- <insert tableName="OFFER">
- <column name="OFFERID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OFFERDATE" valueDate="2017-11-09T00:00:00"/>
- <column name="OFFERCODE" valueNumeric="1004"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
- <column name="PROBABILITY" valueNumeric="3"/>
- <column name="NET" valueNumeric="840.00"/>
- <column name="VAT" valueNumeric="159.60"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="ADDRESS" value="Gfk AG
-Wilhelm-Straße 4
-80807 München"/>
- </insert>
-
- <insert tableName="OFFERITEM">
- <column name="OFFERITEMID" value="bb444011-b57a-4620-ae65-12c9ade05c79"/>
- <column name="OFFER_ID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_gfk.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_gfk.xml
deleted file mode 100644
index ec60ebd3fee575cebf9421e4ba7b961e19ec8747..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_gfk.xml
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb">
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="NAME" value="Gfk AG"/>
- <column name="CUSTOMERCODE" value="00000001"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="102b5d75-304b-41f4-9426-ba13d4dce1c3"/>
- <column name="OBJECT1_TYPE" value="Organisation"/>
- <column name="OBJECT1_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="OBJECT2_TYPE" value="Person"/>
- <column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- <column name="ADDRESS_ID" value="14d03432-985b-4efe-a634-da71ae482907"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="14a01219-985b-4efe-a634-da71ae482907"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="MEDIUM_ID" valueNumeric="1"/>
- <column name="ADDR" value="gfk@domain.local"/>
- <column name="STANDARD" valueNumeric="1"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="22d07819-985b-4efe-a634-da71ae482907"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="MEDIUM_ID" valueNumeric="2"/>
- <column name="ADDR" value="098713332"/>
- <column name="STANDARD" valueNumeric="0"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="00d07819-985b-4efe-a634-da71ae482907"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="MEDIUM_ID" valueNumeric="3"/>
- <column name="ADDR" value="www.gfk.de"/>
- <column name="STANDARD" valueNumeric="0"/>
- </insert>
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" valueNumeric="1"/>
- <column name="CITY" value="München"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="14d03432-985b-4efe-a634-da71ae482907"/>
- <column name="BUILDINGNO" value="2"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="80807"/>
- <column name="ADDRESS" value="Wilhelm-Straße"/>
- <column name="DISTRICT" value="Oberbayern"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
- <column name="SUBJECT" value="Nachfassen"/>
- <column name="INFO" value="Informationen sind zu seiner Zufriedenheit gewesen, sendet eine Email mit einer konkreten Anfrage."/>
- <column name="CATEGORY" valueNumeric="3"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2017-04-13T12:41:22"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="baa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
- <column name="ACTIVITY_ID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
- <column name="SUBJECT" value="Kauf der Maschine von KUKA, Augsburg"/>
- <column name="INFO" value="erworben von Roboterabteilung"/>
- <column name="CATEGORY" valueNumeric="1"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-02-22T14:41:22"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="caa5a1da-39f2-48ae-93a5-bad704e5ae48"/>
- <column name="ACTIVITY_ID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- </insert>
-
- <rollback>
- <delete tableName="ACTIVITYLINK">
- <where>ACTIVITY_ID = ?</where>
- <whereParams>
- <param value="de110a35-aaab-407e-9d60-7a65f028159b" />
- </whereParams>
- </delete>
- <delete tableName="ACTIVITY">
- <where>ACTIVITYID = ?</where>
- <whereParams>
- <param value="de110a35-aaab-407e-9d60-7a65f028159b" />
- </whereParams>
- </delete>
- <delete tableName="ACTIVITY">
- <where>ACTIVITYID = ?</where>
- <whereParams>
- <param value="de110a33-bcab-407e-9d60-7a65f028159b" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>ADDRESSID = ?</where>
- <whereParams>
- <param value="14d03432-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>COMMUNICATIONID = ?</where>
- <whereParams>
- <param value="00d07819-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>COMMUNICATIONID = ?</where>
- <whereParams>
- <param value="22d07819-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>COMMUNICATIONID = ?</where>
- <whereParams>
- <param value="14a01219-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="b219b58a-f120-42d8-9a64-0b176501eac7" />
- </whereParams>
- </delete>
- <delete tableName="ORGANISATION">
- <where>ORGANISATIONID = ?</where>
- <whereParams>
- <param value="b219b58a-f120-42d8-9a64-0b176501eac7" />
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_kaeltetechnik.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_kaeltetechnik.xml
deleted file mode 100644
index 30488c7b7808bdfea407544162c8af3e4ddd8c9b..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_kaeltetechnik.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb">
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- <column name="NAME" value="International Kältetechnik AG "/>
- <column name="CUSTOMERCODE" value="00000004"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- <column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_lichtenstein.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_lichtenstein.xml
deleted file mode 100644
index 96240140152977c78e243c41c358d2fb35013396..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_lichtenstein.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb">
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
- <column name="NAME" value="Lichtenstein Document Solutions GmbH "/>
- <column name="CUSTOMERCODE" value="00000003"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
- <column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_mnf.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_mnf.xml
deleted file mode 100644
index ef8b0ba27475dd68f6b0dfc59e65cc1216df49f2..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_mnf.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb">
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="NAME" value="MNF Versicherung"/>
- <column name="CUSTOMERCODE" value="00000002"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_pichelmaier.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_pichelmaier.xml
deleted file mode 100644
index 89601f64d7acdd5663ec0e9255c16e3ff1544d9a..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_organisation/ORGANISATION_pichelmaier.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="t.feldmann" id="efc66d2-a20d-49e0-a24c-afab6095d1cb">
- <insert tableName="ORGANISATION">
- <column name="ORGANISATIONID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
- <column name="NAME" value="Pichelmaier Financial AG "/>
- <column name="CUSTOMERCODE" value="00000005"/>
- <column name="PRICE_POLITICS" valueNumeric="1"/>
- <column name="STRENGTH" valueNumeric="1"/>
- <column name="WEAKNESS" valueNumeric="1"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="CONTACTID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
- <column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_admin.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_admin.xml
deleted file mode 100644
index 0c15468561e1105847a568f7e64803487f37cbeb..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_admin.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermann" id="d750c022-e34c-4903-8146-bd89121c0214">
- <insert tableName="PERSON">
- <column name="PERSONID" value="b16282bd-254e-4569-a56e-675449821467"/>
- <column name="FIRSTNAME" value="Tim"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Admin"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1993-05-07"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
- <column name="CONTACTID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- <column name="ADDRESS_ID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <insert tableName="ADDRESS">
- <column name="STATE" value="Freistaat Bayern"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
- <column name="CITY" value="Heinrichsthal"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- <column name="ADDRIDENTIFIER"/>
- <column name="REGION" value=""/>
- <column name="ADDRESSID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
- <column name="BUILDINGNO" value="77"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="18074"/>
- <column name="ADDRESS" value="Rudolstaedter Strasse"/>
- <column name="DISTRICT" value="Bayern"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
- <column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
- <column name="ADDR" value="Admin@domain.local"/>
- <column name="STANDARD" valueNumeric="1"/>
- <column name="USER_NEW" value="Admin"/>
- <column name="DATE_NEW" valueComputed="current_datetime"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="b16282bd-254e-4569-a56e-675449821467" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>CONTACT_ID = ?</where>
- <whereParams>
- <param value="c7ddf982-0e58-4152-b82b-8f5673b0b729" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_gruener.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_gruener.xml
deleted file mode 100644
index 3d748a734c6d1c673e12d7edc2ef9afe85c11aa8..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_gruener.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
- <column name="FIRSTNAME" value="Jerome"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Grüner"/>
- <column name="SALUTATION" value="Monsieur"/>
- <column name="DATEOFBIRTH" valueDate="1993-01-20"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
- <column name="CONTACTID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="0"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_kanzler.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_kanzler.xml
deleted file mode 100644
index 6eade59392e5f2120e1405d4e5d74cffa4bf68b6..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_kanzler.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
- <column name="FIRSTNAME" value="Ludwig"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Kanzler"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1994-08-03"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
- <column name="CONTACTID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="ORGANISATION_ID" value="0"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_leicht.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_leicht.xml
deleted file mode 100644
index d14a4606b8a5cad89c9dff0ab250f2b61569d7f4..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_leicht.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- <column name="FIRSTNAME" value="Birgit"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Leicht"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="DATEOFBIRTH" valueDate="2001-05-07"/>
- <column name="MIDDLENAME" value=""/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- <column name="CONTACTID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" valueNumeric="2"/>
- <column name="CITY" value="Landshut"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- <column name="ADDRIDENTIFIER" value=""/>
- <column name="REGION" value="Niederbayern"/>
- <column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
- <column name="BUILDINGNO" value="12"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="84034"/>
- <column name="ADDRESS" value="Neustadt"/>
- <column name="DISTRICT" value="Niederbayern"/>
- </insert>
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" valueNumeric="3"/>
- <column name="CITY" value="Landshut"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
- <column name="ADDRIDENTIFIER" value=""/>
- <column name="REGION" value="Niederbayern"/>
- <column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
- <column name="BUILDINGNO" value="13"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="84034"/>
- <column name="ADDRESS" value="Neustadt"/>
- <column name="DISTRICT" value="Niederbayern"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>CONTACT_ID = ?</where>
- <whereParams>
- <param value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_lustig.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_lustig.xml
deleted file mode 100644
index 6558287c18b6eccbfb0371c39be60b021900c7e0..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_lustig.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermann" id="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8">
- <insert tableName="PERSON">
- <column name="PERSONID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="FIRSTNAME" value="Susanne"/>
- <column name="LASTNAME" value="Lustig"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="DATEOFBIRTH" valueDate="1990-04-05"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="CONTACTID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" valueNumeric="2"/>
- <column name="CITY" value="Windach"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- <column name="ADDRIDENTIFIER" value=""/>
- <column name="REGION" value="Landsberg am Lech"/>
- <column name="ADDRESSID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
- <column name="BUILDINGNO" value="110"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="86949"/>
- <column name="ADDRESS" value="Hauptstraße"/>
- <column name="DISTRICT" value="Oberbayern"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>CONTACT_ID = ?</where>
- <whereParams>
- <param value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_muller.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_muller.xml
deleted file mode 100644
index a647b15464c1a77feaf6e539c5b0c6b9a6eec364..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_muller.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="m.escher" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- <column name="FIRSTNAME" value="Franz"/>
- <column name="MIDDLENAME"/>
- <column name="LASTNAME" value="Müller"/>
- <column name="DATEOFBIRTH" valueDate="1989-12-03"/>
- <column name="GENDER" value="m"/>
- <column name="SALUTATION" value="Herr"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="CONTACTID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- <column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="f0fb7676-8183-4bc7-beca-ca32c1e11c10" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_obermeier.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_obermeier.xml
deleted file mode 100644
index 33441b73442c10fd356e60597202185526f21520..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_obermeier.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermann" id="067f344d-56b3-491e-9a0e-968511e991fe">
- <insert tableName="PERSON">
- <column name="PERSONID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- <column name="FIRSTNAME" value="Herbert"/>
- <column name="LASTNAME" value="Obermeier"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1996-10-05"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- <column name="CONTACTID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>CONTACT_ID = ?</where>
- <whereParams>
- <param value="57d524f6-ad66-4550-be83-fee6e31b7a52" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_pfiffig.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_pfiffig.xml
deleted file mode 100644
index 99eaa74e0d547c8d8ce54ab7bb41bbc3ad33dc9b..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_pfiffig.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="t.feldmann" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- <column name="DATEOFBIRTH" valueDate="1991-02-01"/>
- <column name="FIRSTNAME" value="Peter"/>
- <column name="MIDDLENAME" value=""/>
- <column name="LASTNAME" value="Pfiffig"/>
- <column name="GENDER" value="m"/>
- <column name="SALUTATION" value="Herr"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="CONTACTID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- <column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="14d01219-985b-4efe-a634-da71ae482907"/>
- <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- <column name="MEDIUM_ID" valueNumeric="1"/>
- <column name="ADDR" value="pfiffig@web.de"/>
- <column name="STANDARD" valueNumeric="1"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="22d01219-985b-4efe-a634-da71ae482907"/>
- <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- <column name="MEDIUM_ID" valueNumeric="2"/>
- <column name="ADDR" value="08871333"/>
- <column name="STANDARD" valueNumeric="0"/>
- </insert>
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" valueNumeric="2"/>
- <column name="CITY" value="Nürnberg"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- <column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="REGION" value="Mittelfranken"/>
- <column name="ADDRESSID" value="14d01332-985b-4efe-a634-da71ae482907"/>
- <column name="BUILDINGNO" value="25"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="90419"/>
- <column name="ADDRESS" value="Laufertorgraben"/>
- <column name="DISTRICT" value="Nürnberg"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="SUBJECT" value="Muster"/>
- <column name="INFO" value="Spezifikation ausgefüllt und abgeschickt"/>
- <column name="CATEGORY" valueNumeric="1"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-06-03T12:41:22"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="b111a1da-39f2-48ae-93a5-bad704e5ae48"/>
- <column name="ACTIVITY_ID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="OBJECT_ROWID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
- </insert>
- <rollback>
- <delete tableName="ACTIVITYLINK">
- <where>ACTIVITY_ID = ?</where>
- <whereParams>
- <param value="de110a35-bcab-407e-9d60-7a65f028159b" />
- </whereParams>
- </delete>
- <delete tableName="ACTIVITY">
- <where>ACTIVITYID = ?</where>
- <whereParams>
- <param value="de110a35-bcab-407e-9d60-7a65f028159b" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>ADDRESSID = ?</where>
- <whereParams>
- <param value="14d01332-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>COMMUNICATIONID = ?</where>
- <whereParams>
- <param value="22d01219-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>COMMUNICATIONID = ?</where>
- <whereParams>
- <param value="14d01219-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d" />
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_smith.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_smith.xml
deleted file mode 100644
index 6aa05618c3b9dad0438d658cbd5304854b11f3f8..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_smith.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermann" id="4e3bee66-c19d-4055-b2fe-88aa39f6eb30">
- <insert tableName="PERSON">
- <column name="PERSONID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- <column name="FIRSTNAME" value="Harold"/>
- <column name="LASTNAME" value="Smith"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="DATEOFBIRTH" valueDate="1985-05-10"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- <column name="CONTACTID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <rollback>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>CONTACT_ID = ?</where>
- <whereParams>
- <param value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-
-
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_sommer.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_sommer.xml
deleted file mode 100644
index 87ccb91699d93530e1fe3c9827a507d30bc5a80f..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_person/PERSON_sommer.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="t.feldmann" id="efc45d2-a40d-49e0-a24c-afab6095d1cb">
- <insert tableName="PERSON">
- <column name="PERSONID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="DATEOFBIRTH" valueDate="1988-13-01"/>
- <column name="FIRSTNAME" value="Lisa"/>
- <column name="MIDDLENAME" value=""/>
- <column name="LASTNAME" value="Sommer"/>
- <column name="GENDER" value="f"/>
- <column name="SALUTATION" value="Frau"/>
- </insert>
- <insert tableName="CONTACT">
- <column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="CONTACTID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="14d05619-985b-4efe-a634-da71ae482907"/>
- <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="MEDIUM_ID" valueNumeric="1"/>
- <column name="ADDR" value="sommer@gfk.de"/>
- <column name="STANDARD" valueNumeric="1"/>
- </insert>
- <insert tableName="COMMUNICATION">
- <column name="COMMUNICATIONID" value="58d01219-985b-4efe-a634-da71ae482907"/>
- <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="MEDIUM_ID" valueNumeric="2"/>
- <column name="ADDR" value="087631333"/>
- <column name="STANDARD" valueNumeric="0"/>
- </insert>
- <insert tableName="ADDRESS">
- <column name="STATE" value="Bayern"/>
- <column name="ADDR_TYPE" valueNumeric="2"/>
- <column name="CITY" value="Landshut"/>
- <column name="COUNTRY" value="DE"/>
- <column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="ADDRIDENTIFIER" value=""/>
- <column name="REGION" value="Niederbayern"/>
- <column name="ADDRESSID" value="11d01332-985b-4efe-a634-da71ae482907"/>
- <column name="BUILDINGNO" value="12"/>
- <column name="ADDRESSADDITION"/>
- <column name="ZIP" value="84034"/>
- <column name="ADDRESS" value="Neustadt"/>
- <column name="DISTRICT" value="Niederbayern"/>
- </insert>
- <insert tableName="ACTIVITY">
- <column name="ACTIVITYID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="SUBJECT" value="Angebot nachfassen"/>
- <column name="INFO" value="Angebot nachfassen, wir liegen vor Wettbewerb"/>
- <column name="CATEGORY" valueNumeric="1"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
- <column name="CREATOR" value="Admin"/>
- <column name="ENTRYDATE" valueDate="2018-06-03T12:41:22"/>
- </insert>
- <insert tableName="ACTIVITYLINK">
- <column name="ACTIVITYLINKID" value="a331a1da-39f2-48ae-93a5-bad704e5ae48"/>
- <column name="ACTIVITY_ID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="OBJECT_ROWID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- </insert>
- <rollback>
- <delete tableName="ACTIVITYLINK">
- <where>ACTIVITY_ID = ?</where>
- <whereParams>
- <param value="de110a35-bcab-407e-9d60-7a65f028159b" />
- </whereParams>
- </delete>
- <delete tableName="ACTIVITY">
- <where>ACTIVITYID = ?</where>
- <whereParams>
- <param value="aa110a35-bcab-407e-9d60-7a65f028159b" />
- </whereParams>
- </delete>
- <delete tableName="ADDRESS">
- <where>ADDRESSID = ?</where>
- <whereParams>
- <param value="11d01332-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>COMMUNICATIONID = ?</where>
- <whereParams>
- <param value="58d01219-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="COMMUNICATION">
- <where>COMMUNICATIONID = ?</where>
- <whereParams>
- <param value="14d05619-985b-4efe-a634-da71ae482907" />
- </whereParams>
- </delete>
- <delete tableName="CONTACT">
- <where>CONTACTID = ?</where>
- <whereParams>
- <param value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
- </whereParams>
- </delete>
- <delete tableName="PERSON">
- <where>PERSONID = ?</where>
- <whereParams>
- <param value="ef345d11-a40d-59e0-a24c-afcb6095d2cb" />
- </whereParams>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_product/PRODUCT_42154311.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_product/PRODUCT_42154311.xml
deleted file mode 100644
index b4ed1504d21a4f4808393e3e8bbb0a88aa762081..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_product/PRODUCT_42154311.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="7896e3d7-8ecc-4a41-9117-239480c05cb4">
- <insert tableName="PRODUCT">
- <column name="PRODUCTID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="ADVERTISING" value="N"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="MINSTOCK" valueNumeric="5.00"/>
- <column name="PRODUCTCODE" value="ProduktNr1"/>
- <column name="PRODUCTNAME" value="AX45"/>
- <column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- </insert>
- <insert tableName="PRODUCT">
- <column name="PRODUCTID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
- <column name="ADVERTISING" value="N"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="MINSTOCK" valueNumeric="12.00"/>
- <column name="PRODUCTCODE" value="ProduktNr1.1"/>
- <column name="PRODUCTNAME" value="Produktname1.1"/>
- <column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- </insert>
- <insert tableName="PRODUCT">
- <column name="PRODUCTID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
- <column name="ADVERTISING" value="N"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="MINSTOCK" valueNumeric="10.00"/>
- <column name="PRODUCTCODE" value="ProduktNr1.2"/>
- <column name="PRODUCTNAME" value="Produktname1.2"/>
- <column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- </insert>
- <insert tableName="PRODUCT">
- <column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
- <column name="ADVERTISING" value="N"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="MINSTOCK" valueNumeric="15.00"/>
- <column name="PRODUCTCODE" value="ProduktNr4.1"/>
- <column name="PRODUCTNAME" value="Produktname4.1"/>
- <column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- </insert>
- <insert tableName="PRODUCTPRICE">
- <column name="PRODUCTPRICEID" value="c5b5bfce-2bec-4601-ba43-2567209bea04"/>
- <column name="VALID_TO" valueDate="2058-10-31T00:00:00"/>
- <column name="VALID_FROM" valueDate="2018-11-01T00:00:00"/>
- <column name="PRICE" valueNumeric="106.00"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
- <column name="FROMQUANTITY" valueNumeric="1.00"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
- <column name="BUYSELL" value="SP"/>
- </insert>
-
- <insert tableName="PRODUCT">
- <column name="PRODUCTID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="ADVERTISING" value="N"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="MINSTOCK" valueNumeric="50.00"/>
- <column name="PRODUCTCODE" value="ProduktNr4.2"/>
- <column name="PRODUCTNAME" value="Produktname4.2a"/>
- <column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- </insert>
- <insert tableName="PRODUCT">
- <column name="PRODUCTID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
- <column name="ADVERTISING" value="N"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
- <column name="MINSTOCK" valueNumeric="0.00"/>
- <column name="PRODUCTCODE" value="R01"/>
- <column name="PRODUCTNAME" value="Sonderrabatt"/>
- <column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- </insert>
- <insert tableName="PRODUCT">
- <column name="PRODUCTID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
- <column name="ADVERTISING" value="N"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="MINSTOCK" valueNumeric="2.00"/>
- <column name="PRODUCTCODE" value="AX47-2233"/>
- <column name="PRODUCTNAME" value="AX47"/>
- <column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- </insert>
-
- <insert tableName="PROD2PROD">
- <column name="PROD2PRODID" value="c5288f96-41f0-4b9b-b79f-23da12ad485b"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="TAKEPRICE" valueNumeric="0"/>
- <column name="QUANTITY" valueNumeric="1.00"/>
- <column name="SOURCE_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
- <column name="DEST_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- </insert>
- <insert tableName="PROD2PROD">
- <column name="PROD2PRODID" value="f78cf164-3a9d-43a6-a58c-9f462e5ed012"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="TAKEPRICE" valueNumeric="1"/>
- <column name="QUANTITY" valueNumeric="2.00"/>
- <column name="SOURCE_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
- <column name="DEST_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- </insert>
- <insert tableName="PROD2PROD">
- <column name="PROD2PRODID" value="cbd0699d-947c-4f6c-8c43-e9dcea72447a"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="TAKEPRICE" valueNumeric="1"/>
- <column name="QUANTITY" valueNumeric="3.00"/>
- <column name="SOURCE_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
- <column name="DEST_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- </insert>
- <insert tableName="PROD2PROD">
- <column name="PROD2PRODID" value="aefd0be1-325d-42f7-9b79-1bab24e7ae23"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="TAKEPRICE" valueNumeric="1"/>
- <column name="QUANTITY" valueNumeric="3.00"/>
- <column name="SOURCE_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
- <column name="DEST_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
- </insert>
- <insert tableName="PROD2PROD">
- <column name="PROD2PRODID" value="e413c0f8-c953-4380-ad2e-b9c04411baad"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="TAKEPRICE" valueNumeric="0"/>
- <column name="QUANTITY" valueNumeric="3.00"/>
- <column name="SOURCE_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="DEST_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
- </insert>
- <insert tableName="PROD2PROD">
- <column name="PROD2PRODID" value="cb43c351-38dc-4b1e-b408-2d9afcfdbb13"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="TAKEPRICE" valueNumeric="0"/>
- <column name="QUANTITY" valueNumeric="3.00"/>
- <column name="SOURCE_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
- <column name="DEST_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
- </insert>
- <insert tableName="PROD2PROD">
- <column name="PROD2PRODID" value="752b7549-703f-45de-a7d8-b0a0602715c0"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="TAKEPRICE" valueNumeric="0"/>
- <column name="QUANTITY" valueNumeric="1.00"/>
- <column name="SOURCE_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
- <column name="DEST_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
- </insert>
-
- <insert tableName="PRODUCTPRICE">
- <column name="PRODUCTPRICEID" value="12f288ac-f01b-4d20-b1b8-0f4f02e11079"/>
- <column name="VALID_TO" valueDate="2018-10-31T00:00:00"/>
- <column name="VALID_FROM" valueDate="2018-02-01T00:00:00"/>
- <column name="PRICE" valueNumeric="150.00"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="FROMQUANTITY" valueNumeric="1.00"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
- <column name="BUYSELL" value="SP"/>
- </insert>
- <insert tableName="PRODUCTPRICE">
- <column name="PRODUCTPRICEID" value="409f7c1c-f6bf-44fe-8e63-e650f3807b93"/>
- <column name="VALID_TO" valueDate="2058-10-31T00:00:00"/>
- <column name="VALID_FROM" valueDate="2018-11-01T00:00:00"/>
- <column name="PRICE" valueNumeric="195.00"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="FROMQUANTITY" valueNumeric="50.00"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
- <column name="BUYSELL" value="SP"/>
- </insert>
- <insert tableName="PRODUCTPRICE">
- <column name="PRODUCTPRICEID" value="4e6b8398-6618-4ceb-ac7c-9ecde9a2d698"/>
- <column name="VALID_TO" valueDate="2058-10-31T00:00:00"/>
- <column name="VALID_FROM" valueDate="2018-11-10T00:00:00"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="FROMQUANTITY" valueNumeric="1.00"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
- <column name="BUYSELL" value="SP"/>
- </insert>
- <insert tableName="PRODUCTPRICE">
- <column name="PRODUCTPRICEID" value="599980f8-a8cf-4a03-8562-2a1b08856eac"/>
- <column name="VALID_TO" valueDate="2058-10-31T00:00:00"/>
- <column name="VALID_FROM" valueDate="2018-11-01T00:00:00"/>
- <column name="PRICE" valueNumeric="205.00"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="FROMQUANTITY" valueNumeric="1.00"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" value="40564efc-ce12-456c-a461-3bb3c9c269be"/>
- <column name="BUYSELL" value="SP"/>
- </insert>
- <insert tableName="PRODUCTPRICE">
- <column name="PRODUCTPRICEID" value="814dc207-f265-4bcc-9913-1b2c2879c8c7"/>
- <column name="VALID_TO" valueDate="2058-10-31T00:00:00"/>
- <column name="VALID_FROM" valueDate="2018-11-01T00:00:00"/>
- <column name="PRICE" valueNumeric="180.00"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="FROMQUANTITY" valueNumeric="50.00"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="PRICELIST" value="40564efc-ce12-456c-a461-3bb3c9c269be"/>
- <column name="BUYSELL" value="SP"/>
- </insert>
- <insert tableName="PRODUCTPRICE">
- <column name="PRODUCTPRICEID" value="ac85ca59-bf12-46a9-9c76-1cb4ac78eda5"/>
- <column name="VALID_TO" valueDate="2058-10-31T00:00:00"/>
- <column name="VALID_FROM" valueDate="2018-11-01T00:00:00"/>
- <column name="PRICE" valueNumeric="208.00"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="FROMQUANTITY" valueNumeric="50.00"/>
- <column name="CURRENCY" value="USD"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
- <column name="BUYSELL" value="SP"/>
- </insert>
-
- <insert tableName="STOCK">
- <column name="STOCKID" value="f09201f8-85f3-4715-8d44-5cec7b8f437b"/>
- <column name="IN_OUT" valueNumeric="1"/>
- <column name="QUANTITY" valueNumeric="30"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="ENTRYDATE" valueDate="2018-11-22T00:00:00"/>
- <column name="WAREHOUSE" value="7885caba-8d58-4fe5-9774-1872fbad1dbe"/>
- </insert>
- <insert tableName="STOCK">
- <column name="STOCKID" value="a90a8aba-76bb-40b1-a4ab-ef39508296cb"/>
- <column name="IN_OUT" valueNumeric="1"/>
- <column name="QUANTITY" valueNumeric="25"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="ENTRYDATE" valueDate="2018-11-15T00:00:00"/>
- <column name="WAREHOUSE" value="7885caba-8d58-4fe5-9774-1872fbad1dbe"/>
- </insert>
- <insert tableName="STOCK">
- <column name="STOCKID" value="bd4c1a16-1b80-4b3e-aa67-306f387a62df"/>
- <column name="IN_OUT" valueNumeric="0"/>
- <column name="QUANTITY" valueNumeric="23"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="ENTRYDATE" valueDate="2018-11-22T00:00:00"/>
- <column name="WAREHOUSE" value="7885caba-8d58-4fe5-9774-1872fbad1dbe"/>
- </insert>
- <insert tableName="STOCK">
- <column name="STOCKID" value="3caba278-9d38-485c-9d78-11ea969b832c"/>
- <column name="IN_OUT" valueNumeric="0"/>
- <column name="QUANTITY" valueNumeric="17"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="ENTRYDATE" valueDate="2018-11-15T00:00:00"/>
- <column name="WAREHOUSE" value="7885caba-8d58-4fe5-9774-1872fbad1dbe"/>
- </insert>
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1000.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1000.xml
deleted file mode 100644
index 5867110c106f387ce3ff56d8b7afaca96e8c6dc3..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1000.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="m.schroeger" id="6f705338-d9da-4373-a84a-1681d2bd5f7d">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2017-11-21T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1000"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
- <column name="NET" valueNumeric="210.00"/>
- <column name="VAT" valueNumeric="39.90"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="1"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="1"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="ITEMSORT" valueNumeric="2"/>
- <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
- <column name="ITEMNAME" value="AX47"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
- <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="ITEMSORT" valueNumeric="3"/>
- <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
- <column name="ITEMNAME" value="Produktname4.1"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="8772eb20-dbe8-4e12-8ea8-21fb28474c3e"/>
- <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
- <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
- <column name="ITEMSORT" valueNumeric="4"/>
- <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
- <column name="ITEMNAME" value="Sonderrabatt"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.1.1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="8c60146f-e950-47ad-8fed-d7bb88947789"/>
- <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="ITEMSORT" valueNumeric="5"/>
- <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="ITEMNAME" value="Produktname4.2a"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.2"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="21ee4b39-876e-44a8-8153-dc7f38957fc7"/>
- <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="ITEMSORT" valueNumeric="6"/>
- <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
- <column name="ITEMNAME" value="Produktname1.1"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.2"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="f268cf96-7ba6-44aa-8357-42e0469afe79"/>
- <column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="ITEMSORT" valueNumeric="7"/>
- <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
- <column name="ITEMNAME" value="Produktname1.2"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.3"/>
- </insert>
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1001.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1001.xml
deleted file mode 100644
index 45c3d2b182e3535521461664a323c368fa9504eb..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1001.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="c48d2c77-9fbe-4fa0-8e17-656393047a82">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2018-08-12T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1001"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="ed7dcd27-0369-4196-894c-bfcce94b9e73"/>
- <column name="SALESORDER_ID" value="41197800-027b-47f5-923a-f1004d09a969"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1002.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1002.xml
deleted file mode 100644
index b305043be69629483194bc2e17b3b784a9f4d153..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1002.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="95dcd356-75d4-45a2-8bda-d564c9c17d97">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2016-06-14T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1002"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
- <column name="NET" valueNumeric="630.00"/>
- <column name="VAT" valueNumeric="119.70"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="17856c63-10f8-46c6-9295-5ad5bedff8ba"/>
- <column name="SALESORDER_ID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1003.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1003.xml
deleted file mode 100644
index c65b3595a88008d7d218fee45f35d61f1edd6ab6..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1003.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="955b7c8d-3a85-408f-8374-b491a653b5c8">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2018-08-23T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1003"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="3b25eeb9-ea52-4c62-a22c-041a1a2a41c2"/>
- <column name="SALESORDER_ID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1004.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1004.xml
deleted file mode 100644
index 9629672f13eaf9aeddfcd3df20f57cde4419cbd9..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1004.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="f.feldmann" id="653af1f7-c0b9-4544-a93c-f3bf1e3ad054">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2017-05-09T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1004"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
- <column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1005.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1005.xml
deleted file mode 100644
index 8473f6476873890bd07b7acf404ed49cc4243cbb..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1005.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="f834fa51-7c20-4ea8-be57-0780008c49d3">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2017-11-21T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1005"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
- <column name="NET" valueNumeric="210.00"/>
- <column name="VAT" valueNumeric="39.90"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="92ebcce0-8970-42dc-b32f-b892fe7dbb52"/>
- <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="1"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="2bf1eb1f-501c-4006-83cb-fb9783272e35"/>
- <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="1"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="ITEMSORT" valueNumeric="2"/>
- <column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
- <column name="ITEMNAME" value="AX47"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="dcb02f78-8305-462f-bbeb-f7b5cb102461"/>
- <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="ITEMSORT" valueNumeric="3"/>
- <column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
- <column name="ITEMNAME" value="Produktname4.1"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="a63b3fed-f7a4-4173-ba3e-a893f7186ed6"/>
- <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
- <column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
- <column name="ITEMSORT" valueNumeric="4"/>
- <column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
- <column name="ITEMNAME" value="Sonderrabatt"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.1.1"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="6d59b91d-bfac-46ac-be79-35fdeb793d0d"/>
- <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="ITEMSORT" valueNumeric="5"/>
- <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="ITEMNAME" value="Produktname4.2a"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.1.2"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="b68656aa-84e1-4682-9c2e-2d9ec0810ecb"/>
- <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="ITEMSORT" valueNumeric="6"/>
- <column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
- <column name="ITEMNAME" value="Produktname1.1"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.2"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="fafb2b07-012e-4d20-b263-2b794e5370a7"/>
- <column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="ITEMSORT" valueNumeric="7"/>
- <column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
- <column name="ITEMNAME" value="Produktname1.2"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1.3"/>
- </insert>
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1006.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1006.xml
deleted file mode 100644
index 62e06a3e45ed1e6a039442dfcc3a9bed0d0da321..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1006.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="2a4e1c95-1827-4716-8875-8086b323caed">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2018-08-12T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1006"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
- <column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1007.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1007.xml
deleted file mode 100644
index f93270dbd8127527a9af09eb52da8e8507509812..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1007.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="7f2fe3fb-52a6-4056-9968-f576be04ab2b">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2016-06-14T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1007"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
- <column name="NET" valueNumeric="630.00"/>
- <column name="VAT" valueNumeric="119.70"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="c64dc823-98cd-4159-a27d-7167f510fc57"/>
- <column name="SALESORDER_ID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="3"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1008.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1008.xml
deleted file mode 100644
index 20e6443c67aa7b2444d7a0d2c45b2839b9a81895..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1008.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="bbc9e3d3-8a1d-4411-ba4c-900404d8a010">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2018-08-23T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1008"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
- <column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1009.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1009.xml
deleted file mode 100644
index 52f6e8ced36739ecee4d47f55811e9416c0ce551..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesorder/SALESORDER_1009.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.hoermann" id="0a93418f-9c50-4b76-9fb5-f7156f209271">
- <insert tableName="SALESORDER">
- <column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
- <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SALESORDERDATE" valueDate="2017-05-09T00:00:00"/>
- <column name="SALESORDERCODE" valueNumeric="1009"/>
- <column name="VERSNR" valueNumeric="1"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
- <column name="NET" valueNumeric="420.00"/>
- <column name="VAT" valueNumeric="79.80"/>
- <column name="CURRENCY" value="EUR"/>
- <column name="LANGUAGE" value="deu"/>
- </insert>
-
- <insert tableName="SALESORDERITEM">
- <column name="SALESORDERITEMID" value="709e37c9-0397-4b82-965c-e11416e6f090"/>
- <column name="SALESORDER_ID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
- <column name="QUANTITY" valueNumeric="2"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="PRICE" valueNumeric="210.00"/>
- <column name="ITEMSORT" valueNumeric="1"/>
- <column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
- <column name="VAT" valueNumeric="19.00"/>
- <column name="ITEMNAME" value="AX45"/>
- <column name="OPTIONAL" valueNumeric="0"/>
- <column name="ITEMPOSITION" value="1"/>
- </insert>
-
-
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesproject/SALESPROJECT_gfk.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesproject/SALESPROJECT_gfk.xml
deleted file mode 100644
index 9d334a3310d9ec6048a4731315060cce5d064534..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesproject/SALESPROJECT_gfk.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermanns" id="76912d9-ced7-4626-a031-d7138dfc948e">
- <insert tableName="SALESPROJECT">
- <column name="SALESPROJECTID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="PROJECTCODE" valueNumeric="1000"/>
- <column name="PROJECTTITLE" value="GfK"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="INFO" value="evtl. noch mit Berater Müller sprechen, ob ihm bekannt"/>
- <column name="STATE" valueNumeric="1"/>
- <column name="PHASE" valueNumeric="4"/>
- <column name="VOLUME" valueNumeric="15"/>
- <column name="PHASE" valueNumeric="4"/>
- <column name="STARTDATE" valueDate="2017-07-21T09:03:43"/>
- <column name="ENDDATE" valueDate="2017-10-14T09:03:43"/>
- <column name="ESTIMATION" value="; 2; 4; 11; "/>
- <column name="ESTIMATIONVALUE" valueNumeric="2"/>
- <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
- </insert>
- <insert tableName="AB_OBJECTRELATION">
- <column name="AB_OBJECTRELATIONID" value="6dd516b2-7887-4a17-930a-d39607c8b626"/>
- <column name="OBJECT1_TYPE" value="Salesproject"/>
- <column name="OBJECT1_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="OBJECT2_TYPE" value="Person"/>
- <column name="OBJECT2_ROWID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
- </insert>
- <insert tableName="SALESPROJECT_SOURCE">
- <column name="SALESPROJECT_SOURCEID" value="1c1f83ad-9e4b-4d0f-b820-98e724e34aec"/>
- <column name="ENTRYDATE" valueDate="2017-08-21T09:03:43"/>
- <column name="INFO" value="Initialeintrag"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
- </insert>
-
- <insert tableName="SALESPROJECT_CYCLE">
- <column name="SALESPROJECT_CYCLEID" value="c1eb7a04-666f-4bb0-8021-3feadff5d5df"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="TYPE" valueNumeric="1"/>
- <column name="VALUE" valueNumeric="1"/>
- <column name="DATE_START" valueDate="2016-06-13T09:03:43"/>
- <column name="DATE_END" valueDate="2016-06-13T09:03:43"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="affd17db-d925-4e20-81d5-ea9e4ca37c94"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2018-06-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="1000"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="35f5f997-cc23-4850-8e71-b497bb7d12d6"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2016-06-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="2100"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="625dd1eb-3d60-4818-8e9a-c55650d7fd87"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2017-06-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="1500"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="c2b3303e-4a11-455c-b214-16400f9d8c16"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2017-05-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="1300"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="92c4db4d-ed8d-4651-8a2c-797f4ac6237b"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2018-06-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="500"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="7c2d866b-abc9-4fa7-8499-ccc82d4097bb"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2016-06-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="1200"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="11c4125c-5c56-499e-acc9-d879fa09ddf7"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2017-06-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="1400"/>
- </insert>
-
- <insert tableName="SALESPROJECT_FORECAST">
- <column name="SALESPROJECT_FORECASTID" value="e60e5cd9-bbf7-41eb-ae9f-443083052eef"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
-
- <column name="TYPE" value="PLAN"/>
- <column name="GROUPCODE" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
- <column name="INFO" value="grob abgeschätzt, da große Unsicherheit"/>
-
- <column name="DATE_START" valueDate="2017-05-13T09:03:43"/>
- <column name="VOLUME" valueNumeric="1200"/>
- </insert>
-
- <insert tableName="SALESPROJECT_COMPETITION">
- <column name="SALESPROJECT_COMPETITIONID" value="a3ae9702-a3da-4d5f-a3ab-e386c8a0ac40"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="DATE_CANCELLED" valueDate="2016-06-13T09:03:43"/>
- <column name="INFO" value="starkes Prozess Know-How, wird gefährlich für uns. Dazu private Verbindungen"/>
- <column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- <column name="STATUS" valueNumeric="1"/>
- </insert>
-
- <insert tableName="SALESPROJECT_MEMBER">
- <column name="SALESPROJECT_MEMBERID" value="f9dc15c0-91b8-43d3-ba98-80ca581db3a3"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
- <column name="SALESPROJECT_ROLE" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
- </insert>
-
- <insert tableName="SALESPROJECT_CLASSIFICATION">
- <column name="SALESPROJECT_CLASSIFICATIONID" value="77da9dcb-b49a-4608-9c7d-68545b0ec29b"/>
- <column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
-
- <column name="CLASS" valueNumeric="1"/>
- <column name="TYPE" value="CLASS.BRANCHE"/>
- <column name="VALUE" valueNumeric="2"/>
- </insert>
-
- <rollback>
- <delete tableName="SALESPROJECT">
- <where>SALESPROJECTID = ?</where>
- <whereParams>
- <param value="0833465c-8851-4fbb-b7e3-8c1d73c903da" />
- </whereParams>
- </delete>
- <delete tableName="SALESPROJECT_SOURCE">
- <where>SALESPROJECT_ID = ?</where>
- <whereParams>
- <param value="0833465c-8851-4fbb-b7e3-8c1d73c903da" />
- </whereParams>
- </delete>
- <delete tableName="SALESPROJECT_CYCLE">
- <where>SALESPROJECT_ID = ?</where>
- <whereParams>
- <param value="0833465c-8851-4fbb-b7e3-8c1d73c903da" />
- </whereParams>
- </delete>
- <delete tableName="SALESPROJECT_FORECAST">
- <where>SALESPROJECT_ID = ?</where>
- <whereParams>
- <param value="0833465c-8851-4fbb-b7e3-8c1d73c903da" />
- </whereParams>
- </delete>
- <delete tableName="SALESPROJECT_COMPETITION">
- <where>SALESPROJECT_ID = ?</where>
- <whereParams>
- <param value="0833465c-8851-4fbb-b7e3-8c1d73c903da" />
- </whereParams>
- </delete>
- <delete tableName="SALESPROJECT_MEMBER">
- <where>SALESPROJECT_ID = ?</where>
- <whereParams>
- <param value="0833465c-8851-4fbb-b7e3-8c1d73c903da" />
- </whereParams>
- </delete>
- <delete tableName="SALESPROJECT_CLASSIFICATION">
- <where>SALESPROJECT_ID = ?</where>
- <whereParams>
- <param value="0833465c-8851-4fbb-b7e3-8c1d73c903da" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesproject/SALESPROJECT_jkl.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_salesproject/SALESPROJECT_jkl.xml
deleted file mode 100644
index de505b1336fc9bd283cb8425038c939ca3eb661b..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_salesproject/SALESPROJECT_jkl.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
-<changeSet author="j.hoermanns" id="76912d9-ced7-4626-a031-d7138dfc948e">
- <insert tableName="SALESPROJECT">
- <column name="SALESPROJECTID" value="eaf8096b-2a1a-4336-932e-716e6c054b80"/>
- <column name="PROJECTCODE" valueNumeric="1001"/>
- <column name="PROJECTTITLE" value="Jkl"/>
- <column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="INFO" value="evtl. noch mit Berater Huber sprechen, ob ihm bekannt"/>
- <column name="STATE" valueNumeric="1"/>
- <column name="PHASE" valueNumeric="4"/>
- <column name="VOLUME" valueNumeric="15"/>
- <column name="PHASE" valueNumeric="4"/>
- <column name="STARTDATE" valueDate="2017-07-21T09:03:43"/>
- <column name="ENDDATE" valueDate="2017-10-14T09:03:43"/>
- <column name="ESTIMATION" value="; 2; 4; 11; "/>
- <column name="ESTIMATIONVALUE" valueNumeric="2"/>
- <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
- </insert>
-
- <rollback>
- <delete tableName="SALESPROJECT">
- <where>SALESPROJECTID = ?</where>
- <whereParams>
- <param value="eaf8096b-2a1a-4336-932e-716e6c054b80" />
- </whereParams>
- </delete>
- </rollback>
-</changeSet>
-</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/data/example_task/base.xml b/.liquibase/Data_alias/basic/2019.1.4/data/example_task/base.xml
deleted file mode 100644
index dae1ae32cef285ed93f4692315d9cbcdd971f92a..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/data/example_task/base.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="j.goderbauer" id="aac6bb04-cca6-4c88-a4ad-8d9d972f915c">
- <insert tableName="TASK">
- <column name="TASKID" value="e9cb198d-c420-4192-9c29-b23682457d8e">
- <constraints primaryKey="true" primaryKeyName="PK_TASK_TASKID"/>
- </column>
- <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
- <column name="CODE" valueNumeric="10000"/>
- <column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
- <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
- <column name="PRIORITY" valueNumeric="2"/>
- <column name="PROTECTIONLEVEL" valueNumeric="0"/>
- <column name="START_DATE" valueDate="2019-01-20T14:00:00"/>
- <column name="MATURITY_DATE" valueDate="2019-01-20T16:00:00"/>
- <column name="DESCRIPTION" value="Es sollen die effizienten Wertschöpfungsketten der Prozessdefinitionseinheiten im primären Schritt gebündelt und sekundär analysiert und verifiziert werden."/>
- </insert>
- <rollback>
- <delete tableName="TASK">
- <where>TASKID = 'e9cb198d-c420-4192-9c29-b23682457d8e'</where>
- </delete>
- </rollback>
- <insert tableName="TASK">
- <column name="TASKID" value="b18558aa-6853-446a-940e-d2f100e21c6d">
- <constraints primaryKey="true" primaryKeyName="PK_TASK_TASKID"/>
- </column>
- <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
- <column name="CODE" valueNumeric="10001"/>
- <column name="SUBJECT" value="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua."/>
- <column name="STATUS" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
- <column name="PRIORITY" valueNumeric="1"/>
- <column name="PROTECTIONLEVEL" valueNumeric="1"/>
- <column name="START_DATE" valueDate="2019-01-20T11:30:00"/>
- <column name="MATURITY_DATE" valueDate="2019-01-20T19:00:00"/>
- <column name="DESCRIPTION" value="Spriti introduced new capabilities of the FirstSpriti Digital Experience Platform powers enterprise-class. Spriti today introduced new capabilities of the FirstSpriti Digital Experience Platform (DXP). These innovations help CMOs challenged with the delivery of omnichannel digital experiences for some of the FirstSpriti Digital Experience Platform powers enterprise-class. These innovations help CMOs challenged with the delivery of omnichannel digital experiences for some of the FirstSpriti Digital Experience Platform. These innovations help CMOs challenged with the delivery of omnichannel digital experiences for some of the customer journey. These innovations help CMOs challenged with the delivery of omnichannel digital experiences for some of the FirstSpriti Digital Experience Platform powers enterprise-class. Helping marketers serve unmatched cross-phase personalized experiences at every step of the FirstSpriti Digital Experience Platform. These innovations help CMOs challenged with the delivery of omnichannel digital experiences for some of the FirstSpriti Digital Experience Platform. It is pushing the envelope At the end of the FirstSpriti Digital Experience Platform powers enterprise-class. Spriti introduced new capabilities to the awards page of the FirstSpriti Digital Experience Platform powers enterprise-class. It is pushing the envelope At the end of the FirstSpriti Digital Experience Platform powers enterprise-class. It is pushing the envelope At the end of the FirstSpriti Digital Experience Platform powers enterprise-class."/>
- </insert>
- <rollback>
- <delete tableName="TASK">
- <where>TASKID = 'b18558aa-6853-446a-940e-d2f100e21c6d'</where>
- </delete>
- </rollback>
- <insert tableName="TASK">
- <column name="TASKID" value="ee6e7a9c-233b-4ddd-a5f2-00163657a2a6">
- <constraints primaryKey="true" primaryKeyName="PK_TASK_TASKID"/>
- </column>
- <column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
- <column name="CODE" valueNumeric="10002"/>
- <column name="SUBJECT" value="Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris"/>
- <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
- <column name="PRIORITY" valueNumeric="3"/>
- <column name="PROTECTIONLEVEL" valueNumeric="0"/>
- <column name="START_DATE" valueDate="2019-01-09T08:00:00"/>
- <column name="MATURITY_DATE" valueDate="2019-01-22T19:30:00"/>
- <column name="DESCRIPTION" value="Ich bin von je der Ordnung Freund gewesen. Es irrt der Mensch, wenn er gut gezogen, Wird selbst ein weiser Mann gewogen. Ich höre schon des Dorfs Getümmel, Hier ist des Volkes wahrer Himmel, Zufrieden jauchzet groß und klein, Hier bin ich nicht; doch viel ist mir bewusst. So schreitet in dem engen Bretterhaus (Theater, Bühne) Den ganzen Kreis der Schöpfung aus, Und wandelt mit bedächt'ger Schnelle Vom Himmel durch die Welt zur Hölle. Ich bin von je der Ordnung Freund gewesen. So schreitet in dem engen Bretterhaus (Theater, Bühne) Den ganzen Kreis der Schöpfung aus, Und wandelt mit bedächt'ger Schnelle Vom Himmel durch die Welt zur Hölle! Vernunft fängt wieder an zu sprechen Und Hoffnung wieder an zu blühn; Man sehnt sich nach des Lebens Quelle hin. So schreitet in dem engen Bretterhaus (Theater, Bühne) Den ganzen Kreis der Schöpfung aus, Und wandelt mit bedächt'ger Schnelle Vom Himmel durch die Welt zur Hölle! Es irrt der Mensch, wenn er sie beim Kragen hätte. Vernunft fängt wieder an zu sprechen Und Hoffnung wieder an zu sprechen Und Hoffnung wieder an zu sprechen Und Hoffnung wieder an zu blühn; Man sehnt sich nach des Lebens Quelle hin. Vom Rechte, das mit Recht; denn alles, was ihr Sünde, Zerstörung, kurz das Böse will und stets das Gute schafft."/>
- </insert>
- <rollback>
- <delete tableName="TASK">
- <where>TASKID = 'ee6e7a9c-233b-4ddd-a5f2-00163657a2a6'</where>
- </delete>
- </rollback>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml b/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml
index 0e36cda05c7f4a9b8437307a4baa25356b31aa66..9b1749bd2918fe4ecd31525b2169516c8680a2a7 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/fix_sp_phases.xml
@@ -17,7 +17,7 @@
</delete>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="028af5dd-1071-4108-8685-ed7124376706"/>
- <column name="KEYID" value="4814b51b-40f5-49bc-897b-f0933b9fc12c"/>
+ <column name="KEYID" value="SALPROJPHASEMQC"/>
<column name="TITLE" value="MQC"/>
<column name="CONTAINER" value="SalesprojectPhase"/>
<column name="SORTING" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_OBJECTRELATIONTYPE.xml b/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_OBJECTRELATIONTYPE.xml
deleted file mode 100644
index 214acdd7f1d981bb57b439ceb493251b481c251b..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_OBJECTRELATIONTYPE.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="autogenerated" id="af776278-fd10-40ce-954c-1a42d530d119">
- <delete tableName="AB_OBJECTRELATIONTYPE"/>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="c9b7ce6b-1100-46f6-8498-2da6ac24189e"/>
- <column name="HIERARCHY" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="parent company"/>
- <column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="259babbd-7827-44d4-b9ec-8245d27b5f70"/>
- <column name="HIERARCHY" valueNumeric="1"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="subsidiary"/>
- <column name="RELATION_TYPE" value="a054875d-b9a2-499d-877b-ccec31358324"/>
- <column name="SIDE" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="parent of"/>
- <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="child of"/>
- <column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
- <column name="SIDE" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="3d2808bf-397b-4220-a563-36b066b5c9a9"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="supports"/>
- <column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="a51e23c0-d44a-4e39-a79b-7a357fb79cc2"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="supported by"/>
- <column name="RELATION_TYPE" value="5ab4d256-4220-4c28-88d6-1db01e2f4667"/>
- <column name="SIDE" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="b96a36ff-bc43-4159-a6e7-3d53cba67189"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="supervisor of"/>
- <column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="0a47c346-9b6f-4cdd-8c38-77800d7012f5"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="reports to"/>
- <column name="RELATION_TYPE" value="4df4160d-6efc-43b3-9b02-710ab3d0228c"/>
- <column name="SIDE" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="9d4739ba-33b0-4e87-b281-561e2cbdd277"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="solicits"/>
- <column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="e397b595-38ae-4365-908e-75ee388838eb"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="promotion target of"/>
- <column name="RELATION_TYPE" value="ddad6aa3-267b-4784-afbb-98242218fcf5"/>
- <column name="SIDE" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="0795a3cd-295b-421b-aed1-decc09b05362"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="competitor"/>
- <column name="RELATION_TYPE" value="032ebe0a-7204-4eec-82a2-cb13b65850d7"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="3cee0474-504f-43cc-844a-715f1a0db271"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="society"/>
- <column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="fa879afd-b2c5-4eee-9799-d63c6764b348"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="member"/>
- <column name="RELATION_TYPE" value="9f65f915-2767-40c4-9e7b-e818e915648f"/>
- <column name="SIDE" valueNumeric="2"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="090f6adc-c2b8-44b7-8c61-39dbb5660aa0"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="acquainted with"/>
- <column name="RELATION_TYPE" value="84120fad-e7a2-4961-8c29-d00da41efe48"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Organisation"/>
- <column name="RELATION_TITLE" value="collaboration with"/>
- <column name="RELATION_TYPE" value="091d866f-67e8-4fd6-afdc-e40d0f2be224"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="39e73949-c8d9-46a2-a0b5-18be95e7ba11"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="grandparents of"/>
- <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
- <column name="SIDE" valueNumeric="1"/>
- </insert>
- <insert tableName="AB_OBJECTRELATIONTYPE">
- <column name="AB_OBJECTRELATIONTYPEID" value="a2296f93-2371-4ab8-9f29-ef0795d1e9b2"/>
- <column name="HIERARCHY" valueNumeric="0"/>
- <column name="OBJECT_TYPE" value="Person"/>
- <column name="RELATION_TITLE" value="ankle of"/>
- <column name="RELATION_TYPE" value="f36c69c2-6d03-45ef-81a0-f9118ce3f4c6"/>
- <column name="SIDE" valueNumeric="2"/>
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALUTATION.xml b/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALUTATION.xml
deleted file mode 100644
index 7fef3dced60ff663e1df7abe4ef178ede67eddbd..0000000000000000000000000000000000000000
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALUTATION.xml
+++ /dev/null
@@ -1,298 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="autogenerated" id="89286386-04d2-4854-8cc7-09910b328e47">
- <delete tableName="SALUTATION"/>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr {ln}"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="c98c8644-9e00-4715-a775-827a364f5cef"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="1"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Bürgermeister {fn} - {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Bürgermeister"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="8feaf27b-1fae-4d8c-a742-9cd023f46409"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="2"/>
- <column name="TITLE" value="Bürgermeister"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Frau {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrte Frau {ln}"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="SALUTATIONID" value="cbcc2c2b-9b64-442b-a6be-aaf8e462128c"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="3"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrte Dameng und Herreng"/>
- <column name="SALUTATIONID" value="6b835563-5d3e-4c4c-807b-63c5bdb82e68"/>
- <column name="SORT" valueNumeric="4"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="{ti} {fn} {ln}"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Dr. {ln}"/>
- <column name="SALUTATION" value="Mr."/>
- <column name="SALUTATIONID" value="f9135efb-ebd4-4c9f-bfa1-3beedb647009"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="5"/>
- <column name="TITLE" value="Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Dr. {fn} {ln}"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Dr. {ln}"/>
- <column name="SALUTATION" value="Mrs."/>
- <column name="SALUTATIONID" value="0b9a3d9b-a56c-47e9-a984-e88cface58db"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="6"/>
- <column name="TITLE" value="Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Madame, Monsieur"/>
- <column name="SALUTATIONID" value="ff97826d-a8ea-45e5-b426-2a27f4fa9201"/>
- <column name="SORT" valueNumeric="7"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Monsieur {fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Monsieur"/>
- <column name="SALUTATION" value="Monsieur"/>
- <column name="SALUTATIONID" value="c1095e86-38d6-4329-a388-4cfabab10eae"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="8"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Frau Dr. {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. {ln}"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="SALUTATIONID" value="6b35b8c5-920c-408b-b172-453a506aa775"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="9"/>
- <column name="TITLE" value="Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Monsieur Prof.{fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Monsieur Prof."/>
- <column name="SALUTATION" value="Monsieur"/>
- <column name="SALUTATIONID" value="67fa73ae-a739-44fd-9244-28a49bc0d01d"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="10"/>
- <column name="TITLE" value="Prof."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Monsieur Dr.{fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Monsieur Dr."/>
- <column name="SALUTATION" value="Monsieur"/>
- <column name="SALUTATIONID" value="516b740d-b932-4a64-b611-af0ea69f6bd0"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="11"/>
- <column name="TITLE" value="Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Professor {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="5d9ad542-27b8-4dec-bcbd-a2c7d223f012"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="12"/>
- <column name="TITLE" value="Professor"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Dr. {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. {ln}"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="76fe57c0-cf68-4240-ba6d-eb7d52f46317"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="13"/>
- <column name="TITLE" value="Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Präsident {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Präsident"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="4b9af3f4-f34a-4170-a28c-ffdbca80c4d3"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="14"/>
- <column name="TITLE" value="Präsident"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Prof. Dr. {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="1f19ba34-8346-4620-a10e-fb39fdd0be9b"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="15"/>
- <column name="TITLE" value="Prof. Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Mr. {fn} {ln}"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Mr. {ln}"/>
- <column name="SALUTATION" value="Mr."/>
- <column name="SALUTATIONID" value="801efd2a-41ce-4a5d-8ed5-c2db7fedb4e8"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="16"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Professor {fn} {ln}"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Professor {ln}"/>
- <column name="SALUTATION" value="Mr."/>
- <column name="SALUTATIONID" value="ce348b08-c1bf-4e76-8272-6d6b32ecdd6a"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="17"/>
- <column name="TITLE" value="Professor"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Mrs. {fn} {ln}"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Mrs. {ln}"/>
- <column name="SALUTATION" value="Mrs."/>
- <column name="SALUTATIONID" value="11816f93-f6e9-427f-af68-fbf29c3e3544"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="18"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Madame {fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Madame"/>
- <column name="SALUTATION" value="Madame"/>
- <column name="SALUTATIONID" value="2360e24d-1784-47b8-b0e9-3b57bd704e8a"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="19"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Sir or Madame"/>
- <column name="SALUTATIONID" value="f7b3c876-366d-438a-a1e6-f17ceb641f36"/>
- <column name="SORT" valueNumeric="20"/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Prof. {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="75f4f04f-1877-425d-8d5d-56604d0040b2"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="21"/>
- <column name="TITLE" value="Prof."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Monsieur Prof.Dr.{fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Monsieur Prof.Dr."/>
- <column name="SALUTATION" value="Monsieur"/>
- <column name="SALUTATIONID" value="2d8ec97f-38d7-45a8-9c45-ed672f4b035d"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="22"/>
- <column name="TITLE" value="Prof.Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Madame Dr.{fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Madame Dr."/>
- <column name="SALUTATION" value="Madame"/>
- <column name="SALUTATIONID" value="4e76c69b-ee75-49e5-8581-2a808b29a117"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="23"/>
- <column name="TITLE" value="Dr."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Monsieur Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Monsieur Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Monsieur"/>
- <column name="SALUTATIONID" value="f3ea547a-d744-4ce8-815a-126d9697e037"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="24"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Madame Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="fra"/>
- <column name="LETTERSALUTATION" value="Madame Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Madame"/>
- <column name="SALUTATIONID" value="e8e001ab-b200-480f-917b-33d57e2a8734"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="25"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Frau Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Frau"/>
- <column name="SALUTATIONID" value="0e719a2a-1018-49e0-b056-c90779955bf9"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="26"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Herr Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Herr"/>
- <column name="SALUTATIONID" value="0500939e-5820-457d-a95f-6835b9501df9"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="27"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Mr. Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Mr."/>
- <column name="SALUTATIONID" value="5260f79c-1001-41dc-b3ff-28b4ce7091b9"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="28"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Señor Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="spa"/>
- <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Señor"/>
- <column name="SALUTATIONID" value="7617a199-82b7-40ef-b2f7-0e85d32fad64"/>
- <column name="SEX" value="m "/>
- <column name="SORT" valueNumeric="29"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Señora Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="spa"/>
- <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Señora"/>
- <column name="SALUTATIONID" value="25b28c87-edb5-4686-a3c4-92a5136aadc0"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="30"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- <insert tableName="SALUTATION">
- <column name="HEADLINE" value="Mrs. Dr. Ing. {fn} {ln}"/>
- <column name="LANGUAGE" value="eng"/>
- <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
- <column name="SALUTATION" value="Mrs."/>
- <column name="SALUTATIONID" value="4505783d-8a9f-4a18-ba2e-091794db3812"/>
- <column name="SEX" value="f "/>
- <column name="SORT" valueNumeric="31"/>
- <column name="TITLE" value="Dr. Ing."/>
- </insert>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/remove_productInfo_language.xml b/.liquibase/Data_alias/basic/2019.1.4/remove_productInfo_language.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1cd980ac242eb266a59827214d707d6c55b318fd
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2019.1.4/remove_productInfo_language.xml
@@ -0,0 +1,7 @@
+<?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="m.mansour" id="99b87771-f603-49b7-85df-09931eac69df">
+ <dropColumn tableName="PRODUCT" columnName="LANGUAGE"/>
+ <dropColumn tableName="PRODUCT" columnName="INFO"/>
+</changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml
index c390891c147e17a7184e9c5f656db6f0167a3b2e..2a81caa90f8217a62d3cde44d9169899531ea189 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_Keyword_Essentials.xml
@@ -3,15 +3,59 @@
<changeSet author="a.loreth" id="b1629529-92ab-437d-b864-0fd68fe5ceab">
<update tableName="AB_KEYWORD_ENTRY">
<column name="ISESSENTIAL" valueNumeric="1" />
- <where>KEYID in ('548ffe3b-466b-4c8f-97d6-e3ad23e33344', 'BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
- </update>
-
-
- <rollback>
- <update tableName="AB_KEYWORD_ENTRY">
- <column name="ISESSENTIAL" valueNumeric="0" />
- <where>KEYID in ('548ffe3b-466b-4c8f-97d6-e3ad23e33344', 'BSICacti-0dir-0inc-b8a3-f43e2c73df65', 'BSICacti-0dir-outg-8337-909b0f93143a', 'BSIC0rel-stat-actv-ae03-b6b04430e90b', '21bc4d20-1a87-4247-8f7c-8d3a09631850', '4dee8727-8299-422e-ae41-6cdf9de2dfd7', '02553fc7-4611-4914-8ff5-0b7c4e7531c9', '09072b59-d12f-469b-acbd-18a28232ff70', 'ec92271b-eac2-4ec2-be24-ab4abde7e939')</where>
- </update>
- </rollback>
+ <where>CONTAINER = 'QuantityUnit' and KEYID in ('QUANTITYPIECES ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'ActivityDirection' and KEYID in ('i ', 'o ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'ContactStatus' and KEYID in ('CONTACTSTATACTIVE ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'TaskStatus' and KEYID in ('NEW ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'TaskType' and KEYID in ('TASK ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'ProductPricelist' and KEYID in ('PRICELISTDEFAULT ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'TaskPriority' and KEYID in ('TASKPRIOMEDIUM ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'TaskProgress' and KEYID in ('TASKPROG0 ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'ContractStatus' and KEYID in ('CONTRACTSTATVALIDUNLI ', 'CONTRACTSTATVALIDLI ', 'CONTRACTSTATSIGN ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'SalesprojectState' and KEYID in ('SALPROJSTATOPEN ', 'SALPROJSTATPOSTPONED ')</where>
+ </update>
+
+ <update tableName="AB_KEYWORD_ENTRY">
+ <column name="ISESSENTIAL" valueNumeric="1" />
+ <where>CONTAINER = 'TaskStatus' and KEYID in ('NEW ', 'ASSIGNED ', 'IN-PROGRESS ', 'WAITING ', 'ENDED ', 'CUSTOMER-CHECKS ', 'UNASSIGNED ')</where>
+ </update>
+
+
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml b/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml
index 78058cb375498026ca1ab75ec33e674970b569f2..9d79ee64c1a69c2855f927681cf5c9a590b2d7ed 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_Milestone_to_new_Keyword.xml
@@ -9,7 +9,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+ <column name="VALUE" value="SALPROJPHASENQC"/>
<where>TYPE = ? and VALUE in (?,?,?,?,?,?,?,?,?,?,?)</where>
<whereParams>
<param value="SalesprojectPhase" />
@@ -27,7 +27,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="292628f1-d9a5-432d-8130-f6690c14a5d4"/>
+ <column name="VALUE" value="SALPROJPHASEMAL"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
@@ -35,7 +35,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <column name="VALUE" value="SALPROJPHASEMQL"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
@@ -43,7 +43,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="VALUE" value="SALPROJPHASESAL"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
@@ -51,7 +51,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+ <column name="VALUE" value="SALPROJPHASESQO"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
@@ -59,7 +59,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+ <column name="VALUE" value="SALPROJPHASEOFFER"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
@@ -67,7 +67,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+ <column name="VALUE" value="SALPROJPHASENEGO"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectPhase" />
@@ -84,7 +84,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="VALUE" value="SALPROJSTATOPEN"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
@@ -92,7 +92,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="23d38486-4cce-41ce-a8df-164ad44df706"/>
+ <column name="VALUE" value="SALPROJSTATPOST"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
@@ -100,7 +100,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="8916e241-9452-4541-a323-d479ad5f2e4d"/>
+ <column name="VALUE" value="SALPROJSTATABORT"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
@@ -108,7 +108,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="1606cf46-a87b-4797-830e-55ebdd70a001"/>
+ <column name="VALUE" value="SALPROJSTATPARTIAL"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
@@ -116,7 +116,7 @@
</whereParams>
</update>
<update tableName="SALESPROJECT_MILESTONE">
- <column name="VALUE" value="130bb53a-a97e-455e-8f34-8d445e985474"/>
+ <column name="VALUE" value="SALPROJSTATLOST"/>
<where>TYPE = ? and VALUE = ?</where>
<whereParams>
<param value="SalesprojectState" />
diff --git a/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml b/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml
index ed33a9a787fbd2360d9d172df1640a1f6fdb69a6..e4f772404bc2966c1dfd7c25efe14aa8061c32b9 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/update_TaskType_Task.xml
@@ -13,7 +13,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9e30365b-a9a6-4b57-ae6b-140c9e5a4eb4"/>
- <column name="KEYID" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="KEYID" value="TASK"/>
<column name="TITLE" value="Task"/>
<column name="CONTAINER" value="TaskType"/>
<column name="SORTING" valueNumeric="0"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
similarity index 87%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/changelog.xml
rename to .liquibase/Data_alias/basic/_demoData/changelog.xml
index 5825a83e765ef8e2225fce4443dff7ddd454927d..fadb02846c3c9b2c3402abe2501f5451e8006cba 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -1,10 +1,7 @@
<?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">
- <include relativeToChangelogFile="true" file="generatedData/AB_ATTRIBUTE.xml"/>
<include relativeToChangelogFile="true" file="generatedData/AB_ATTRIBUTERELATION.xml"/>
- <include relativeToChangelogFile="true" file="generatedData/AB_ATTRIBUTEUSAGE.xml"/>
<include relativeToChangelogFile="true" file="generatedData/AB_OBJECTRELATION.xml"/>
- <include relativeToChangelogFile="true" file="generatedData/AB_OBJECTRELATIONTYPE.xml"/>
<include relativeToChangelogFile="true" file="generatedData/ACTIVITY.xml"/>
<include relativeToChangelogFile="true" file="generatedData/ACTIVITYLINK.xml"/>
<include relativeToChangelogFile="true" file="generatedData/ADDRESS.xml"/>
@@ -25,7 +22,6 @@
<include relativeToChangelogFile="true" file="generatedData/MEMBER.xml"/>
<include relativeToChangelogFile="true" file="generatedData/SALESPROJECT_MILESTONE.xml"/>
<include relativeToChangelogFile="true" file="generatedData/SALESPROJECT_SOURCE.xml"/>
- <include relativeToChangelogFile="true" file="generatedData/SALUTATION.xml"/>
<include relativeToChangelogFile="true" file="generatedData/TASK.xml"/>
<include relativeToChangelogFile="true" file="generatedData/TASKLINK.xml"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTERELATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
similarity index 93%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTERELATION.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
index f74f3dfe59befa66077dd62c92d98e3c4aa633ec..9d80e8dd303474b1b81414c68618eb7be8740da3 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_ATTRIBUTERELATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_ATTRIBUTERELATION.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="a2f47e80-5bcb-4e8d-8899-9b5f6189ba36">
- <delete tableName="AB_ATTRIBUTERELATION"/>
<insert tableName="AB_ATTRIBUTERELATION">
<column name="AB_ATTRIBUTERELATIONID" value="d4a3c8a0-2050-4147-abad-43a1f35ccbf0"/>
<column name="AB_ATTRIBUTE_ID" value="7e9927a4-41e4-426f-bddd-c3e9ee3b093e"/>
@@ -42,7 +41,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="7a7736db-8b68-4865-a212-bd603af51370"/>
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
- <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+ <column name="ID_VALUE" value="SALPROJPOLLOW"/>
<column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -60,7 +59,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="76967a63-8322-484b-b603-d3cb5ce27d6d"/>
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
- <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+ <column name="ID_VALUE" value="SALPROJPOLLOW"/>
<column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -69,7 +68,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="7a291363-9a75-4dd5-aa64-34a1801aeb92"/>
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
- <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="ID_VALUE" value="PAYTERM30"/>
<column name="OBJECT_ROWID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -167,7 +166,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="f7824359-7f2c-4942-b959-465bf776ef7e"/>
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:40:12"/>
- <column name="ID_VALUE" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+ <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
<column name="OBJECT_ROWID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -185,7 +184,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="44bd5ab6-0b4f-4655-a276-ed172240643b"/>
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:43:59"/>
- <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="ID_VALUE" value="PAYTERM30"/>
<column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -194,7 +193,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="2261ef33-50af-445a-bc19-27367cc6ff7a"/>
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:08"/>
- <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+ <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
<column name="OBJECT_ROWID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -203,7 +202,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="7abc6537-b254-4a36-8315-2e44a5b10fad"/>
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:47"/>
- <column name="ID_VALUE" value="34cbd70d-f163-416b-9ec7-68797ba0dd55"/>
+ <column name="ID_VALUE" value="SALPROJPOLABO"/>
<column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -212,7 +211,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="edddb76a-348d-497b-9665-21acbe0bed0b"/>
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:44:55"/>
- <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+ <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
<column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -221,7 +220,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="086ff454-e407-433a-9124-496de7fef1cb"/>
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:09"/>
- <column name="ID_VALUE" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+ <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
<column name="OBJECT_ROWID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -239,7 +238,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="0563ec4f-6f85-469d-89a1-5fc807f4dc9f"/>
<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:34"/>
- <column name="ID_VALUE" value="aa8713c9-ae12-4ce3-a588-0303cea11b44"/>
+ <column name="ID_VALUE" value="DELIVERCIF"/>
<column name="OBJECT_ROWID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -248,7 +247,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="fedc492c-cc5d-48cb-a7ee-0cef061facec"/>
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:45:57"/>
- <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="ID_VALUE" value="PAYTERM30"/>
<column name="OBJECT_ROWID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -266,7 +265,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="ce75da6e-b946-4a8c-a9dc-fb76cc20f0a1"/>
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:30"/>
- <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="ID_VALUE" value="PAYTERM30"/>
<column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -275,7 +274,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="924e8914-6275-45d4-a36a-94f3b70a35b4"/>
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:46:41"/>
- <column name="ID_VALUE" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+ <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
<column name="OBJECT_ROWID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -293,7 +292,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="67f36d84-1997-4801-a4f6-94c9b8318e95"/>
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:08"/>
- <column name="ID_VALUE" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+ <column name="ID_VALUE" value="SALPROJSTPRICEPOL"/>
<column name="OBJECT_ROWID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -302,7 +301,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="2d80654e-3bd5-46bb-af0b-f18f812d11e0"/>
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:37"/>
- <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+ <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
<column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -311,7 +310,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="25dac52d-de7e-47e1-b60c-22d252dae4c2"/>
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:47:46"/>
- <column name="ID_VALUE" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
+ <column name="ID_VALUE" value="PAYTERM7"/>
<column name="OBJECT_ROWID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -329,7 +328,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="d5cb44f7-6500-47ca-9dac-784b07d0b5f5"/>
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:10"/>
- <column name="ID_VALUE" value="90a50e8e-afc0-4e96-9fcd-02f3032307d9"/>
+ <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
<column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -338,7 +337,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="7f0bccf2-bf10-4a64-8ae7-236bebc2505f"/>
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:18"/>
- <column name="ID_VALUE" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="ID_VALUE" value="PAYTERM30"/>
<column name="OBJECT_ROWID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -356,7 +355,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="97429450-9cb5-4f8a-bd0f-c6c63c9afee9"/>
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:40"/>
- <column name="ID_VALUE" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+ <column name="ID_VALUE" value="SALPROJWEAKMARKET"/>
<column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -365,7 +364,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="6907f00d-011d-4592-8f0e-26e52449658f"/>
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:48:46"/>
- <column name="ID_VALUE" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="ID_VALUE" value="PRICELISTDEFAULT"/>
<column name="OBJECT_ROWID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -374,7 +373,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="f7a60ce6-39c5-43b6-a14d-24b838f541b9"/>
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:02"/>
- <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+ <column name="ID_VALUE" value="SALPROJPOLLOW"/>
<column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -383,7 +382,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="6e8b96f9-de86-4dc1-b0c9-d5b99867d29c"/>
<column name="AB_ATTRIBUTE_ID" value="292fae38-6557-466d-8843-3b1b4a1f6599"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:10"/>
- <column name="ID_VALUE" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
+ <column name="ID_VALUE" value="PAYTERMDISCOUNT"/>
<column name="OBJECT_ROWID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -392,7 +391,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="f1f8c53a-46e9-40a9-8be2-8f0775cafa64"/>
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:31"/>
- <column name="ID_VALUE" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+ <column name="ID_VALUE" value="SALPROJPOLLOW"/>
<column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -401,7 +400,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="255571a4-2fda-49ec-baed-ea7b374895f1"/>
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:39"/>
- <column name="ID_VALUE" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+ <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
<column name="OBJECT_ROWID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -410,7 +409,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="b2bb8ab7-0e64-49fc-8e18-372ec0a03822"/>
<column name="AB_ATTRIBUTE_ID" value="558419b2-6113-4060-b88d-cc6324754765"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:49:54"/>
- <column name="ID_VALUE" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+ <column name="ID_VALUE" value="SALPROJSTPERSAPP"/>
<column name="OBJECT_ROWID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -437,7 +436,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="1505bacf-c29a-48a7-8da5-5e969252309f"/>
<column name="AB_ATTRIBUTE_ID" value="71226196-2812-4d70-b90f-c3e2c14fd4d1"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:07"/>
- <column name="ID_VALUE" value="90a50e8e-afc0-4e96-9fcd-02f3032307d9"/>
+ <column name="ID_VALUE" value="SALPROJWEAKLIQUIDITY"/>
<column name="OBJECT_ROWID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -446,7 +445,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="a433931c-412c-4a42-9a86-e5ca1e671a04"/>
<column name="AB_ATTRIBUTE_ID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:51:25"/>
- <column name="ID_VALUE" value="a4d40341-a015-4c59-9bde-f8e59582269b"/>
+ <column name="ID_VALUE" value="DELIVEREX"/>
<column name="OBJECT_ROWID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -482,7 +481,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="7b38959d-d0b7-434a-9316-58d4894982d2"/>
<column name="AB_ATTRIBUTE_ID" value="8af37871-d407-4414-98ad-e64dbaa5794a"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:18"/>
- <column name="ID_VALUE" value="34cbd70d-f163-416b-9ec7-68797ba0dd55"/>
+ <column name="ID_VALUE" value="SALPROJPOLABO"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
@@ -491,7 +490,7 @@
<column name="AB_ATTRIBUTERELATIONID" value="25a53e28-d8a1-43d3-9af0-b34ce9c0bc06"/>
<column name="AB_ATTRIBUTE_ID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:52:25"/>
- <column name="ID_VALUE" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+ <column name="ID_VALUE" value="PRICELISTSPECIAL"/>
<column name="OBJECT_ROWID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="OBJECT_TYPE" value="Organisation"/>
<column name="USER_NEW" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_OBJECTRELATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml
similarity index 99%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_OBJECTRELATION.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml
index 49d2bf8936f4050ade116404738cd72220af42e5..3e9351ef4262234335e9b8e5af9548b2c2bc958e 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/AB_OBJECTRELATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/AB_OBJECTRELATION.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="66131cd5-2545-4116-8e29-2a226aaea231">
- <delete tableName="AB_OBJECTRELATION"/>
<insert tableName="AB_OBJECTRELATION">
<column name="AB_OBJECTRELATIONID" value="63ecd05d-f2e5-4957-a496-96a87451a78f"/>
<column name="AB_OBJECTRELATIONTYPE1" value="47a9e611-79b6-46b6-b767-3a0dfed9d010"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITY.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
similarity index 84%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITY.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
index d7324f504e6a9950609a0c4b37ae56f95de0b93b..b1d262706df9bf12edf9bcce0040c7a6f4a550f1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITY.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY.xml
@@ -1,13 +1,12 @@
<?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="f0f5bb59-9d56-4b3c-ad63-9d848f30d08a">
- <delete tableName="ACTIVITY"/>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
- <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+ <column name="CATEGORY" value="ONLINE-MEETING"/>
<column name="DATE_EDIT" valueDate="2019-05-15T03:48:22"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:46:08"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-02-04T03:46:00"/>
<column name="INFO" value="<p>Erste Pr&auml;sentation mit dem Interessenten. Der Verkaufsleiter scheint von unseren Produkten sehr angetan zu sein.</p> <p>Wollte weitere Informationen zu unseren Produkten und ein erstes Angebot.</p> "/>
<column name="SUBJECT" value="Erstkontakt mit dem Interessenten"/>
@@ -16,10 +15,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="d608cae4-7b54-4a12-95f3-5b9eac3d04ef"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_EDIT" valueDate="2019-05-15T03:58:00"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:52:31"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-01-14T03:52:00"/>
<column name="INFO" value="<p>Hatte ersten Kontakt mit dem Projektzust&auml;ndigen.</p> "/>
<column name="SUBJECT" value="Erster Kontakt"/>
@@ -28,10 +27,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-05T04:04:05"/>
<column name="DATE_NEW" valueDate="2019-05-15T04:57:48"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-01-14T04:57:00"/>
<column name="INFO" value="<p>Sehr geehrter Herr Altinger,</p> <p>wie soeben telefonisch vereinbart, erhalten Sie im Anhang die gew&uuml;nschten Informationen.</p> <p>Beste Gr&uuml;&szlig;e</p> <p>Lisa Sommer&nbsp;</p> <p>meine Firma</p> <p>Wilhelm-Str. 2</p> <p>80807 M&uuml;nchen</p> <p>Fon: +49 8763 1333</p> <p>E-Mail: lsommer@meine-firma.de</p> "/>
<column name="SUBJECT" value="Information Produkt A"/>
@@ -40,10 +39,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="a867b04c-b2be-48ec-8108-1144a978f54a"/>
- <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="CATEGORY" value="VISIT"/>
<column name="DATE_EDIT" valueDate="2019-06-11T10:54:05"/>
<column name="DATE_NEW" valueDate="2019-05-15T04:59:21"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-02-25T04:59:00"/>
<column name="INFO" value="<p>Kunde hatte die erste Produktpr&auml;sentation zu unseren Produkten&nbsp;A und B.</p> "/>
<column name="SUBJECT" value="Produktpräsentation"/>
@@ -52,9 +51,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="86bd08ed-38ca-42bb-af5b-2bcfb9d3ee1b"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:01:56"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-03-11T05:01:00"/>
<column name="INFO" value="<p>Der potentielle K&auml;ufer hat Produkte unseres Segments gekauft.</p> "/>
<column name="SUBJECT" value="Produkt gekauft"/>
@@ -62,10 +61,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="810346d8-ab0e-4f1a-ae78-9f55efcadbe6"/>
- <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="CATEGORY" value="VISIT"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:04:33"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:05:47"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-04-08T05:05:00"/>
<column name="INFO" value="<p>Folgende Sonderkondtionen wurden vereinbart:</p> <p>- 10 % Rabatt auf die Produkte</p> <p>- Sonderzahlungs- recht von 30 Tagen netto</p> "/>
<column name="SUBJECT" value="Konditionen und Preise verhandelt"/>
@@ -74,10 +73,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="e2d3cde4-e214-4cef-ae5a-d52da5633094"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:06:09"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:13:38"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-05-15T05:13:38"/>
<column name="INFO" value="<p>Sehr geehrter Herr Tannenbaum,</p> <p>anbei erhalten Sie unser erneutes Angebot f&uuml;r das gew&uuml;nschte Produkt A.&nbsp;</p> <p>Wir freuen uns auf die Best&auml;tigung des Angebots und stehen Ihnen bei R&uuml;ckfragen jederzeit zur Verf&uuml;gung.&nbsp;</p> <p>Beste Gr&uuml;&szlig;e&nbsp;</p> <p>Lisa Sommer</p> <p>meine Firma</p> <p>Wilhelm-Str. 2</p> <p>80807 M&uuml;nchen</p> <p>Fon: +49 8763 1333</p> <p>E-Mail: lsommer@meine-firma.de</p> "/>
<column name="SUBJECT" value="Angebot an Interessenten versandt"/>
@@ -88,7 +87,7 @@
<column name="ACTIVITYID" value="21852330-9c66-42a3-9d25-d053833f146d"/>
<column name="DATE_EDIT" valueDate="2019-06-11T10:49:59"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:21:44"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-02-19T05:21:00"/>
<column name="INFO" value="<p>Die ersten Informationen zur derzeitigen Situation beim Interessenten gekl&auml;rt.&nbsp;</p> "/>
<column name="SUBJECT" value="Austausch zur aktuellen Situation "/>
@@ -97,10 +96,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="52462c82-d05f-4a73-9bac-4d9929d07436"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:09:30"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:49:57"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-03-26T07:49:00"/>
<column name="INFO" value="<p>Hallo Herr Altinger,</p> <p>anbei erhalten Sie wie gew&uuml;nscht und vereinbart unser Angebot zu dem Produkten A und B.&nbsp;</p> <p>Bei Fragen zum Angebot erreichen Sie uns jederzeit unter den bekannten Kontaktdaten.</p> <p>Wir freuen uns auf die Best&auml;tigung des Angebots und auf die bevorstehende Zusammenarbeit.&nbsp;</p> <p>Mit freundlichen Gr&uuml;&szlig;en</p> <p>Lisa Sommer</p> <p>meine Firma</p> <p>Wilhelm-Str. 2</p> <p>80807 M&uuml;nchen</p> <p>Fon: +49 8763 1333</p> <p>E-Mail: lsommer@meine-firma.de</p> "/>
<column name="SUBJECT" value="Unser Angebot"/>
@@ -109,10 +108,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="a42f7cff-53e5-4515-aca2-49c5b4c46f69"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:41:30"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:55:08"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-01-14T07:55:00"/>
<column name="INFO" value="<p>Kurzes Gespr&auml;ch gef&uuml;hrt mit Herr Altinger. Haben die ersten Fragen gekl&auml;rt.</p> "/>
<column name="SUBJECT" value="Telefonat"/>
@@ -121,10 +120,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="84136771-b2ea-4ad6-a6f7-a08ed228581e"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-11T10:46:31"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:56:02"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-01-28T07:56:00"/>
<column name="INFO" value="<p>Sehr geehrte Damen und Herren,</p> <p>es freut uns Ihnen mitteilen zu k&ouml;nnen, dass wir gerne mit Ihnen in die engere Auswahl gehen m&ouml;chten.&nbsp;</p> <p>Die n&auml;chsten Schritte sind weitere Gespr&auml;che sowie eine Pr&auml;sentation Ihrer Produkte.&nbsp;</p> <p>Viele Gr&uuml;&szlig;e</p> <p>Markus Altinger</p> "/>
<column name="SUBJECT" value="Auswahlprozess"/>
@@ -133,9 +132,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="2e2e733b-0d88-41aa-80c3-04dab338011a"/>
- <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="CATEGORY" value="VISIT"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:57:15"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-02-04T07:57:00"/>
<column name="INFO" value="<p>Der Interessent hat uns auf der Messe besucht. Hatten ein informatives Gespr&auml;ch, konnten Fragestellungen kl&auml;ren.</p> "/>
<column name="SUBJECT" value="Besuch auf der Messe"/>
@@ -144,7 +143,7 @@
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="dcf266be-505d-4344-b091-6d9b01007a72"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:59:28"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-03-13T07:59:00"/>
<column name="INFO" value="<p>Kunde m&ouml;chte mit uns in die n&auml;chste Runde gehen.&nbsp;</p> "/>
<column name="SUBJECT" value="Geheimhaltungsvereinbarung unterzeichnen"/>
@@ -152,10 +151,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="5fcb8c51-22da-49ec-83c4-d47c296c77a7"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-11T02:33:47"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:08:29"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-02-18T08:08:00"/>
<column name="INFO" value="<p>Sehr geehrter Herr von Matterhorn,</p> <p>gerne lassen ich Ihnen ein paar unserer Referenzen aus Ihrer Branche zukommen.&nbsp;</p> <p>Sollten Sie Interesse an einem Referenzgespr&auml;ch haben, k&ouml;nnen Sie mir gerne Bescheid geben. Ich werde dann die Abstimmung mit einem passenden Kunden f&uuml;r Sie in die Wege leiten.&nbsp;</p> <p>Herzliche Gr&uuml;&szlig;e</p> <p>Lisa Sommer&nbsp;</p> <p>meine Firma</p> <p>Wilhelm-Str. 2</p> <p>80807 M&uuml;nchen</p> <p>Fon: +49 8763 1333</p> <p>E-Mail: lsommer@meine-firma.de</p> "/>
<column name="SUBJECT" value="Referenzen - Zu unserem Produkt"/>
@@ -164,10 +163,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="8034de5b-48e7-4ca6-bfbf-db86395a4c59"/>
- <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="CATEGORY" value="VISIT"/>
<column name="DATE_EDIT" valueDate="2019-05-28T08:07:03"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:12:04"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-03-01T08:12:00"/>
<column name="INFO" value="<p>Konnten Vor-Ort Termin mit den Ansprechpartnern ausmachen.</p> "/>
<column name="SUBJECT" value="Vor Ort Termin"/>
@@ -177,7 +176,7 @@
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="7c89c987-2751-4d87-8d42-1ebbd7bdba7f"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:15:11"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-03-13T08:15:00"/>
<column name="INFO" value="<p>Die Pr&auml;sentation fand in einer sehr konstruktiven und entspannten Atmosph&auml;re statt.</p> "/>
<column name="SUBJECT" value="Präsentation"/>
@@ -185,10 +184,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="dd74c12b-44c5-4c58-a363-48333edd5538"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-11T02:37:38"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:16:32"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-03-29T08:16:00"/>
<column name="INFO" value="<p>Hallo Herr von Matterhorn,</p> <p>wie soeben telefonisch angek&uuml;ndigt freue ich mich, Ihnen im Anhang dieser Nachricht nun die ausgearbeitete Stellungnahme sowie unser Angebot zukommen zu lassen.</p> <p>Bei Fragen k&ouml;nnen Sie mich jederzeit erreichen.&nbsp;</p> <p>Viele Gr&uuml;&szlig;e,&nbsp;</p> <p>Lisa Sommer&nbsp;</p> <p>meine Firma</p> <p>Wilhelm-Str. 2</p> <p>80807 M&uuml;nchen</p> <p>Fon: +49 8763 1333</p> <p>E-Mail: lsommer@meine-firma.de</p> "/>
<column name="SUBJECT" value="Stellungnahme"/>
@@ -197,10 +196,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="107a18dd-94f1-4df4-8775-6016262951ef"/>
- <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="CATEGORY" value="VISIT"/>
<column name="DATE_EDIT" valueDate="2019-06-11T02:35:58"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:17:47"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-03-28T08:17:00"/>
<column name="INFO" value="<p>Prim&auml;r die Fragen gem&auml;&szlig; Agenda besprochen - Unterlagen befinden sich auf dem Filerverzeichnis.&nbsp;</p> "/>
<column name="SUBJECT" value="Technischer Workshop bzgl. Produktanforderungen"/>
@@ -210,7 +209,7 @@
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="6fe97d41-b44a-42b8-b19d-3ed9ce1cc393"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:47:30"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-03-14T08:47:00"/>
<column name="INFO" value="<p>Haben weitere Informationen zu unseren Produkten runtergeladen.</p> "/>
<column name="SUBJECT" value="Informationen von der Webseite runtergeladen"/>
@@ -220,7 +219,7 @@
<column name="ACTIVITYID" value="8c88dd83-20cb-4601-b1e0-098f1aef8963"/>
<column name="DATE_EDIT" valueDate="2019-05-17T08:59:45"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:56:11"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-03-21T08:56:00"/>
<column name="INFO" value="<p>Sind auf dem Stand gewesen. Haben&nbsp;unsere Fragen gestellt, Unternehmen kurz vorgestellt. War ein angenehmes Gespr&auml;ch.&nbsp;</p> "/>
<column name="SUBJECT" value="Messebesuch"/>
@@ -231,7 +230,7 @@
<column name="ACTIVITYID" value="325d38fe-e0e8-44b7-b67c-279fcba6a7bd"/>
<column name="DATE_EDIT" valueDate="2019-06-11T02:12:52"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:57:17"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-03-29T08:57:00"/>
<column name="INFO" value="<p>15.02.2019: Definition einer Long list auf Basis einer umfassenden Marktstudie &uuml;ber gew&uuml;nschte Produkte&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;</p> <p>22.02.2019:&nbsp;<br /> Information an potentielle Anbieter / Hersteller&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</p> "/>
<column name="SUBJECT" value="Produkt-Terminplanung"/>
@@ -242,7 +241,7 @@
<column name="ACTIVITYID" value="a416d1f7-553a-43b6-a084-021ad1f92dd9"/>
<column name="DATE_EDIT" valueDate="2019-05-17T10:48:04"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:46:27"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-05-01T10:46:00"/>
<column name="INFO" value="<p>Besuchte Seiten:</p> <p>http://www..&nbsp; &nbsp; &nbsp;/ Besuchsdauer</p> "/>
<column name="SUBJECT" value="Lead über Webseite identifiziert"/>
@@ -253,7 +252,7 @@
<column name="ACTIVITYID" value="36ec539c-a451-4166-b64d-fb98f1b73481"/>
<column name="DATE_EDIT" valueDate="2019-05-17T10:49:17"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:48:15"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-05-10T10:48:00"/>
<column name="INFO" value="<p>Anrede:</p> <p>Name:</p> <p>Vorname:</p> <p>Position:</p> <p>Kontaktaufnahme gew&uuml;nscht: ja</p> "/>
<column name="SUBJECT" value="Kontaktformular Webseite"/>
@@ -262,10 +261,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-05-23T10:41:06"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:51:27"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-05-17T10:51:27"/>
<column name="INFO" value="<p>Hallo Herr Peterson,</p> <p>anbei finden sie unser Informationsmaterial.</p> <p>Gr&uuml;&szlig;e</p> <p>Frau Sommer</p> "/>
<column name="SUBJECT" value="Informationsmaterial"/>
@@ -276,7 +275,7 @@
<column name="ACTIVITYID" value="7a058394-b360-41e0-aaea-6a3ca625f0d3"/>
<column name="DATE_EDIT" valueDate="2019-06-05T04:06:35"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:52:54"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-03-01T08:52:00"/>
<column name="INFO" value="<p>Infobrosch&uuml;re zu Produkt A runtergeladen.</p> "/>
<column name="SUBJECT" value="Infobrochüre runtergeladen"/>
@@ -287,7 +286,7 @@
<column name="ACTIVITYID" value="0e62c5cf-7562-4c03-ae11-e6163acada9f"/>
<column name="DATE_EDIT" valueDate="2019-05-19T08:57:49"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:55:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-12-26T08:55:00"/>
<column name="INFO" value="<p>Anrede: Herr</p> <p>Vorname:Markus</p> <p>Nachname:Altinger</p> <p>E-Mail:maltinger@industrial-steel.de</p> <p>&nbsp;</p> "/>
<column name="SUBJECT" value="Kontaktaufnahme über Kontaktformular"/>
@@ -297,7 +296,7 @@
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="5e95209e-0c7d-4c45-a5de-0d3ccdbc5f08"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:40:13"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-01-09T05:40:00"/>
<column name="INFO" value="<p>Frau Decker hat unsere Webseite nach Referenzen und Produkten durchsucht.</p> "/>
<column name="SUBJECT" value="War auf unserer Webseite - Website Tracking"/>
@@ -307,7 +306,7 @@
<column name="ACTIVITYID" value="0cf02b72-a46a-4cd2-975f-15556618ea90"/>
<column name="DATE_EDIT" valueDate="2019-05-22T05:43:23"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:42:24"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-01-15T05:42:00"/>
<column name="INFO" value="<p>Produktinformationen zu Produkt 1 runtergeladen.</p> "/>
<column name="SUBJECT" value="Produktinformationen runtergeladen."/>
@@ -318,7 +317,7 @@
<column name="ACTIVITYID" value="dc0d01bc-6a8e-48cc-8ce0-58fc9d83af01"/>
<column name="DATE_EDIT" valueDate="2019-06-05T04:12:42"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:44:17"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-01-18T05:44:00"/>
<column name="INFO" value="<p>Neuer Kontakt hat Informationen von der Seite runtergeleaden.</p> <p>Nachfassen und Potential abfragen.</p> "/>
<column name="SUBJECT" value="Nachgefasst - Laut Leadmanagement"/>
@@ -329,7 +328,7 @@
<column name="ACTIVITYID" value="d6038dc6-a28f-42ad-b17b-094adc98fd8a"/>
<column name="DATE_EDIT" valueDate="2019-05-22T05:47:10"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:45:42"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-01-22T05:45:00"/>
<column name="INFO" value="<p>Erstkontakt mit dem Au&szlig;endienst vereinbart. Besonderes Interesse an Produkt 1 und 3</p> "/>
<column name="SUBJECT" value="Telefonat mit Frau Decker für den Außendienst vereinbart."/>
@@ -340,7 +339,7 @@
<column name="ACTIVITYID" value="e303e7e9-6d16-40cd-a7a9-7196d219d1de"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:36:40"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:47:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-02-08T05:47:00"/>
<column name="INFO" value="<p>Hatte zusammen mit Frau Decker das erste Gespr&auml;ch zu Produkten 1 und 3.</p> <p>Konnten alle ersten Fragen kl&auml;ren.</p> <p>N&auml;chster Schritt ist ein Termin vor Ort.&nbsp;</p> "/>
<column name="SUBJECT" value="Gespräch mit Frau Decker"/>
@@ -351,7 +350,7 @@
<column name="ACTIVITYID" value="62486e9e-52c6-476f-b1e3-5d62e3f6384e"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:37:07"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:53:02"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-03-05T05:53:00"/>
<column name="INFO" value="<p>Termin vor Ort bei Transatlantik Logistics.</p> <p>War ein guter Termin, scheinen von den Produkten sehr angetan zu sein.</p> <p>Weiteres Vorgehen wird n&auml;chste Woche abgestimmt.&nbsp;</p> "/>
<column name="SUBJECT" value="Termin vor Ort"/>
@@ -360,10 +359,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="ccbb8eef-5caa-4f6b-ad1e-dbb8ba171650"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:38:39"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:56:06"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-03-11T05:56:00"/>
<column name="INFO" value="<p>Herr Morgenstern ist der verantwortliche Vertriebsleiter bei Transatlantik Logistics.&nbsp;</p> "/>
<column name="SUBJECT" value="2. Ansprechpartner kennengelernt"/>
@@ -373,7 +372,7 @@
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="f38f8b69-7c10-4991-af8c-40dda43376f9"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:57:18"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-03-14T05:57:00"/>
<column name="INFO" value="<p>Herr Morgenstern hat differenziert von Frau Decker nochmal Fragen zu Produkt 1 und 3.</p> "/>
<column name="SUBJECT" value="Telefonat bzgl. offener Fragen"/>
@@ -381,10 +380,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="d6ee3c57-1a49-45d2-8d09-d1480ad3e159"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_EDIT" valueDate="2019-06-11T09:04:33"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:55:01"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-03-12T08:55:00"/>
<column name="INFO" value="<p>Weiteres Telefonat mit Herrn Altinger gef&uuml;hrt.&nbsp;</p> <p>Hr. Altinger ist sehr begeistert von den M&ouml;glichkeiten des Produktes.</p> "/>
<column name="SUBJECT" value="Telefonat mit Interessent"/>
@@ -393,10 +392,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="ed70c795-2a72-40e4-bce7-13aca09da578"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:01:11"/>
<column name="DATE_NEW" valueDate="2019-05-23T08:56:50"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-03-22T08:56:00"/>
<column name="INFO" value="<p>Sehr geehrter Frau Sommer,</p> <p>wie bereits telefonisch angek&uuml;ndigt, bitten wir um ein Angebot f&uuml;r die Produkte A und B.&nbsp;</p> <p>Viele Gr&uuml;&szlig;e&nbsp;</p> <p>Markus Altinger&nbsp;</p> <p>Industrial Steel AG&nbsp;</p> "/>
<column name="SUBJECT" value="Interessent möchte Angebot zu dem Produkt"/>
@@ -405,10 +404,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="b660824c-4336-4119-b5d3-5d0459764d86"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:01:47"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:06:25"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-03-22T09:06:00"/>
<column name="INFO" value="<p>Hr. Altinger hat ein Angebot f&uuml;r die Produkte A und B angefordert. Schickt dazu auch noch eine E-Mail.&nbsp;</p> "/>
<column name="SUBJECT" value="Angebot erstellen"/>
@@ -419,7 +418,7 @@
<column name="ACTIVITYID" value="26c4ccf9-a59d-483d-83a8-264b5fac219a"/>
<column name="DATE_EDIT" valueDate="2019-05-23T09:30:46"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:27:23"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-03-22T09:27:00"/>
<column name="INFO" value="<p>Produktinformationen an Frau Linder weitergegeben.</p> "/>
<column name="SUBJECT" value="Informationen an Frau Lindner weitergegeben."/>
@@ -430,7 +429,7 @@
<column name="ACTIVITYID" value="a586aba1-0880-4705-9d2a-46b19cbdb954"/>
<column name="DATE_EDIT" valueDate="2019-06-11T10:55:24"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:29:25"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-03-20T09:29:00"/>
<column name="INFO" value="<p>&Uuml;ber die Landingpage von Produkt C&nbsp;auf uns gekommen.</p> <p>Es&nbsp;besteht weiterhin Interesse an den Produkten&nbsp;A und B.</p> "/>
<column name="SUBJECT" value="Ãœber Online-Werbung auf uns aufmerksam geworden."/>
@@ -439,10 +438,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="e2068edd-75cf-4b8a-8ff2-96a3c63956c2"/>
- <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+ <column name="CATEGORY" value="ONLINE-MEETING"/>
<column name="DATE_EDIT" valueDate="2019-06-11T02:19:12"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:48:08"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-04-08T10:48:00"/>
<column name="INFO" value="<p>Gemeinsamer Termin mit allen Beteiligten der Produkteinf&uuml;hrung:</p> <p>- Definition Herausforderungen&nbsp;</p> <p>- Definition weiterer Terminablauf zur Produkteinf&uuml;hrung&nbsp;</p> "/>
<column name="SUBJECT" value="Erste Phase der Produkt-Planung gestartet"/>
@@ -453,7 +452,7 @@
<column name="ACTIVITYID" value="7fa61c35-0b88-4e01-aadf-73101245a2e8"/>
<column name="DATE_EDIT" valueDate="2019-06-11T02:26:41"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:49:26"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-04-25T10:49:00"/>
<column name="INFO" value="<p>Erste Phase der Planung&nbsp;erfolgreich abgeschlossen.</p> <p>Produktkonfiguration fertig gestellt.</p> <p>Individuelles Produkt geht in die Produktion.</p> "/>
<column name="SUBJECT" value="Erste Phase der Produkt-Planung abgeschlossen"/>
@@ -462,10 +461,10 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="aaf320cd-b849-4062-a3b4-e6636230c114"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_EDIT" valueDate="2019-06-11T02:27:26"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:50:46"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2019-05-23T10:50:46"/>
<column name="INFO" value="<p>Sehr geehrte Damen und Herren,</p> <p>die Produktion des Produktes startet. &Uuml;ber den Verlauf und den aktuellen Stand der Produktion k&ouml;nnen Sie sich in unserem Kundenportal informieren.</p> <p>Viele Gr&uuml;&szlig;e</p> <p>Lisa Sommer</p> <p>meine Firma</p> <p>Wilhelm-Str. 2</p> <p>80807 M&uuml;nchen</p> <p>Fon: +49 8763 1333</p> <p>E-Mail: lsommer@meine-firma.de</p> "/>
<column name="SUBJECT" value="2. Phase der Produkt-Planung startet"/>
@@ -475,16 +474,16 @@
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
<column name="DATE_NEW" valueDate="2019-06-11T02:30:16"/>
- <column name="DIRECTION" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="DIRECTION" value="inx"/>
<column name="ENTRYDATE" valueDate="2019-06-11T02:30:16"/>
<column name="SUBJECT" value="Rahmenvertrag"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="502167d7-8946-41bb-9353-8bafde8c7b09"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_NEW" valueDate="2019-06-11T02:38:27"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2019-04-17T02:38:00"/>
<column name="INFO" value="<p>Hr. von Matterhorn hatte die erfreuliche Nachricht, dass sie sich f&uuml;r unser Produkt entschieden haben;&nbsp;</p> <p>Vertrag kann nun fertig gemacht und zugesandt werden&nbsp;</p> "/>
<column name="SUBJECT" value="Rückmeldung zum Angebot "/>
@@ -492,9 +491,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="de110a33-bcab-407e-9d60-7a65f028159b"/>
- <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+ <column name="CATEGORY" value="ONLINE-MEETING"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2017-04-13T02:41:22"/>
<column name="INFO" value="Informationen sind zu seiner Zufriedenheit gewesen, sendet eine Email mit einer konkreten Anfrage."/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -503,9 +502,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="de110a35-aaab-407e-9d60-7a65f028159b"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-02-22T03:41:22"/>
<column name="INFO" value="erworben von Roboterabteilung"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -514,9 +513,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="de110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
<column name="INFO" value="Spezifikation ausgefüllt und abgeschickt"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -525,9 +524,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="aa110a35-bcab-407e-9d60-7a65f028159b"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-06-03T02:41:22"/>
<column name="INFO" value="Angebot nachfassen, wir liegen vor Wettbewerb"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -536,9 +535,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="661a7b87-68ae-4d52-bc22-6bf96184e6fe"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
<column name="INFO" valueClobFile="ACTIVITY/INFO/clobFiles/908b219b-83e6-4148-84a8-84db75fe8683.txt"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -547,9 +546,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="9dda39bf-966c-4560-be03-5ddbbc1da84a"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-07-31T02:02:52"/>
<column name="INFO" value="Aufzeichnungen zum Thema "Transparentes Kampagnen- und Veranstaltungsmanagement" verschickt."/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -558,9 +557,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="94365b81-cddd-4f56-8379-7ba0a98840a4"/>
- <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+ <column name="CATEGORY" value="ONLINE-MEETING"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-08-03T02:02:52"/>
<column name="INFO" value="Hat uns Zusatzinfos geschickt - diese wurden an allen entsprechenden Stellen hinterlegt und final eingepflegt"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -569,9 +568,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="6397161c-afed-40cf-a1bd-12e657054ce4"/>
- <column name="CATEGORY" value="150bae94-1175-4131-9320-a88dadbffcda"/>
+ <column name="CATEGORY" value="ONLINE-MEETING"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-08-06T02:02:52"/>
<column name="INFO" value="Abgleich der Bestandsdaten wurde gemacht."/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -580,9 +579,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
<column name="INFO" value="Vertragsgrundlagen besprochen. Wird in den nächsten Tagen definiert"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -591,9 +590,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="beda92e0-bbd6-423a-8b49-78da30064e84"/>
- <column name="CATEGORY" value="f925a037-e869-43c2-8a26-b0a7ade1964e"/>
+ <column name="CATEGORY" value="PHONE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-08-09T02:02:52"/>
<column name="INFO" value="Ein Standortwechsel steht an und die neuen Daten wurden erfasst."/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -602,9 +601,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="56c78f3d-e126-4e36-8031-d5eef9877243"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-08-04T02:02:52"/>
<column name="INFO" value="Messeeinladung und besondere Eintrittkarten zukommen lassen. Hat sich sehr gefreut"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -613,9 +612,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="9f498736-c523-4c63-8c53-28e49324b52b"/>
- <column name="CATEGORY" value="7c5c8f92-d40e-4204-859c-fd07467e6f8b"/>
+ <column name="CATEGORY" value="MAIL"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="DIRECTION" value="i"/>
<column name="ENTRYDATE" valueDate="2018-08-12T02:02:52"/>
<column name="INFO" value="Terminvorschlag gesendet. Aufgabe gestellt"/>
<column name="RESPONSIBLE" value="Admin"/>
@@ -624,9 +623,9 @@
</insert>
<insert tableName="ACTIVITY">
<column name="ACTIVITYID" value="1c711078-8324-4fcf-93ec-2c8aa29c0cc6"/>
- <column name="CATEGORY" value="12ef155a-7be2-405a-af26-d357e5a61c25"/>
+ <column name="CATEGORY" value="VISIT"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="DIRECTION" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="DIRECTION" value="o"/>
<column name="ENTRYDATE" valueDate="2018-08-11T02:02:52"/>
<column name="INFO" value="Einladung von Kunden, Interessenten und Zulieferern zu einer internen Veranstaltung in unserem Haus"/>
<column name="RESPONSIBLE" value="Admin"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITY/INFO/clobFiles/908b219b-83e6-4148-84a8-84db75fe8683.txt b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY/INFO/clobFiles/908b219b-83e6-4148-84a8-84db75fe8683.txt
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITY/INFO/clobFiles/908b219b-83e6-4148-84a8-84db75fe8683.txt
rename to .liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITY/INFO/clobFiles/908b219b-83e6-4148-84a8-84db75fe8683.txt
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITYLINK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml
similarity index 99%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITYLINK.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml
index b2de4a7f93662a43ff0755c948b8f2bbebff7b25..85e8b25f4d1c81f92d9572ddd3e7b7fbae7c8a21 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ACTIVITYLINK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ACTIVITYLINK.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="72e2f2ed-ecc0-41e5-87d2-426d989a024d">
- <delete tableName="ACTIVITYLINK"/>
<insert tableName="ACTIVITYLINK">
<column name="ACTIVITYLINKID" value="7f9cbd45-7ff0-4d7d-9412-58db6245f400"/>
<column name="ACTIVITY_ID" value="91f7f3c5-8f36-44a7-ba0b-503a05c81d3b"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ADDRESS.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
similarity index 89%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ADDRESS.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
index bf76c0a5718b43d06f0980c17ec24f7bcdfcf7bd..1c6edf7f001f3d117f664da2732ca6f845e17d65 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ADDRESS.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ADDRESS.xml
@@ -1,11 +1,10 @@
<?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="d2e11022-b07b-4bc2-a6b3-0c2dc922f6e6">
- <delete tableName="ADDRESS"/>
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Spresstrasse"/>
<column name="ADDRESSID" value="f00966ec-693b-4bb5-8c66-26a40f18394f"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="67"/>
<column name="CITY" value="Bielefeld Babenhausen"/>
<column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
@@ -19,7 +18,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Kurfürstendamm"/>
<column name="ADDRESSID" value="85bc81b9-5553-42a8-a643-eb47e1ed3c42"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="95"/>
<column name="CITY" value="Rostock"/>
<column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
@@ -33,7 +32,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Stahlstraße"/>
<column name="ADDRESSID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="24"/>
<column name="CITY" value="Hamburg"/>
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
@@ -46,7 +45,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Hafenstraße"/>
<column name="ADDRESSID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="12"/>
<column name="CITY" value="Friedrichshafen"/>
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -59,7 +58,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Baustraße"/>
<column name="ADDRESSID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="64"/>
<column name="CITY" value="Stuttgart"/>
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
@@ -72,7 +71,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Kronenstraße"/>
<column name="ADDRESSID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="45"/>
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
@@ -85,7 +84,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Grassstraße"/>
<column name="ADDRESSID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="32"/>
<column name="CITY" value="Geisenhausen"/>
<column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
@@ -98,7 +97,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Leasingstrasse"/>
<column name="ADDRESSID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="78"/>
<column name="CITY" value="Berlin"/>
<column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
@@ -111,7 +110,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Eichenallee"/>
<column name="ADDRESSID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="45"/>
<column name="CITY" value="München"/>
<column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
@@ -124,7 +123,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Steinstraße"/>
<column name="ADDRESSID" value="85ab4644-98f1-41ae-8678-67e76dd03706"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="35"/>
<column name="CITY" value="Regensburg"/>
<column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
@@ -137,7 +136,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Dotterblumenstrasse"/>
<column name="ADDRESSID" value="25360df5-104e-4903-8440-f848d025a24b"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="CITY" value="Ingolstadt"/>
<column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="COUNTRY" value="DE"/>
@@ -149,7 +148,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Birkenstrasse"/>
<column name="ADDRESSID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="78"/>
<column name="CITY" value="Augsburg"/>
<column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
@@ -162,7 +161,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Bogenallee"/>
<column name="ADDRESSID" value="e0a93855-d573-405b-8ee2-3b3927762d21"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="6"/>
<column name="CITY" value="Bremen"/>
<column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
@@ -175,7 +174,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Grabweg"/>
<column name="ADDRESSID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="17a"/>
<column name="CITY" value="Neumünster"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
@@ -191,7 +190,7 @@
<column name="ADDRESS" value="Wilhelm-Straße"/>
<column name="ADDRESSID" value="14d03432-985b-4efe-a634-da71ae482907"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="2"/>
<column name="CITY" value="München"/>
<column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -206,7 +205,7 @@
<column name="ADDRESS" value="Laufertorgraben"/>
<column name="ADDRESSID" value="14d01332-985b-4efe-a634-da71ae482907"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="25"/>
<column name="CITY" value="Nürnberg"/>
<column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
@@ -221,7 +220,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Neustadt"/>
<column name="ADDRESSID" value="11d01332-985b-4efe-a634-da71ae482907"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="12"/>
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
@@ -236,7 +235,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Neustadt"/>
<column name="ADDRESSID" value="ce990566-3b86-48fe-bd0c-1167142e584b"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="12"/>
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
@@ -251,7 +250,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Neustadt"/>
<column name="ADDRESSID" value="43b8aea1-2444-448f-87c5-f12fe1ef4ca0"/>
- <column name="ADDR_TYPE" value="cf1c4cab-d24e-4690-ba52-54bae711cd47"/>
+ <column name="ADDR_TYPE" value="DELIVERADDR"/>
<column name="BUILDINGNO" value="13"/>
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
@@ -266,7 +265,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Hauptstraße"/>
<column name="ADDRESSID" value="89cbad0e-9901-42e2-ae40-a5a20c7ed5c8"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="110"/>
<column name="CITY" value="Windach"/>
<column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
@@ -281,7 +280,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Rudolstaedter Strasse"/>
<column name="ADDRESSID" value="0e6d2504-adda-453a-bb36-981e6d0f06c7"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="77"/>
<column name="CITY" value="Heinrichsthal"/>
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
@@ -296,7 +295,7 @@
<column name="ADDRESS" value="Muster-Straße"/>
<column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="3"/>
<column name="CITY" value="München"/>
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -311,7 +310,7 @@
<column name="ADDRESS" value="Lützowplatz"/>
<column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
<column name="ADDRIDENTIFIER" value="Tor 4"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="35"/>
<column name="CITY" value="München"/>
<column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
@@ -328,7 +327,7 @@
<column name="ADDRESS" value="Hildburghausen"/>
<column name="ADDRESSID" value="92a244c5-6065-458c-abc7-57d0dc955011"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="48"/>
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
@@ -345,7 +344,7 @@
<column name="ADDRESS" value="Rudower Strasse"/>
<column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="6"/>
<column name="CITY" value="München"/>
<column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
@@ -359,7 +358,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Büsingstrasse"/>
<column name="ADDRESSID" value="5773392d-cc7a-4170-8ffe-867807634c3c"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="32"/>
<column name="CITY" value="Bergkirchen"/>
<column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
@@ -373,7 +372,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Landsberger Allee"/>
<column name="ADDRESSID" value="8f6da43d-adc5-410e-8bc5-14adca88ebfe"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="83"/>
<column name="CITY" value="München"/>
<column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
@@ -387,7 +386,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Grosse Praesidenten Str."/>
<column name="ADDRESSID" value="84e040be-5a5f-48e7-be2c-769d4a169390"/>
- <column name="ADDR_TYPE" value="a7466ee5-3fba-40bf-93cf-aa20a2b32ad6"/>
+ <column name="ADDR_TYPE" value="HOMEADDR"/>
<column name="BUILDINGNO" value="48"/>
<column name="CITY" value="Niederkirchen"/>
<column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
@@ -401,7 +400,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Lagerstraße"/>
<column name="ADDRESSID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="2"/>
<column name="CITY" value="Augsburg"/>
<column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
@@ -414,7 +413,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Großstraße"/>
<column name="ADDRESSID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
- <column name="ADDR_TYPE" value="cf1c4cab-d24e-4690-ba52-54bae711cd47"/>
+ <column name="ADDR_TYPE" value="DELIVERADDR"/>
<column name="BUILDINGNO" value="6"/>
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
@@ -427,7 +426,7 @@
<insert tableName="ADDRESS">
<column name="ADDRESS" value="Augsburger Straße"/>
<column name="ADDRESSID" value="8ac42a08-6e71-4bc4-a46d-5cf17e4a941c"/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="6"/>
<column name="CITY" value="Augsburg"/>
<column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
@@ -441,7 +440,7 @@
<column name="ADDRESS" value="Hildburghausen"/>
<column name="ADDRESSID" value="2825d85f-879a-4899-a1bb-a6750ad2aee9"/>
<column name="ADDRIDENTIFIER" value="Tor 1 "/>
- <column name="ADDR_TYPE" value="b3292432-bca2-4674-8b06-b78b2b06351e"/>
+ <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="48"/>
<column name="CITY" value="Landshut"/>
<column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/COMMUNICATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
similarity index 86%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/COMMUNICATION.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
index a1cc024cc25ace344b254f15b1454cdf0ac4a5d3..624e841c2a02368247cf28359c764788456e7b88 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/COMMUNICATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/COMMUNICATION.xml
@@ -1,14 +1,13 @@
<?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="c65e668b-1ab5-4166-88f4-d65e0f36325e">
- <delete tableName="COMMUNICATION"/>
<insert tableName="COMMUNICATION">
<column name="ADDR" value="tadmin@meine-firma.de"/>
<column name="COMMUNICATIONID" value="3ccc54d5-dfb0-4da9-a0a0-472025f65994"/>
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:48:55"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -19,7 +18,7 @@
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:46:11"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
- <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+ <column name="MEDIUM_ID" value="COMMINTERNET"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -30,7 +29,7 @@
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="DATE_EDIT" valueDate="2019-06-06T02:50:34"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
- <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+ <column name="MEDIUM_ID" value="COMMINTERNET"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -40,7 +39,7 @@
<column name="COMMUNICATIONID" value="417ce25b-8d42-47b2-b7df-1dfcc28075be"/>
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:41:53"/>
- <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+ <column name="MEDIUM_ID" value="COMMINTERNET"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -50,7 +49,7 @@
<column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:36:32"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:56:26"/>
- <column name="MEDIUM_ID" value="1a4b1ebe-cf06-4bc1-b7af-e4633d38dc79"/>
+ <column name="MEDIUM_ID" value="COMMMOBIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -60,7 +59,7 @@
<column name="COMMUNICATIONID" value="e076075c-1d67-4a9d-aed8-1a66bb1adfb2"/>
<column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:10:34"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -69,7 +68,7 @@
<column name="COMMUNICATIONID" value="674a8118-31ef-492c-83c6-6ecfcebc9c9a"/>
<column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
<column name="DATE_NEW" valueDate="2019-05-15T05:13:19"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -78,7 +77,7 @@
<column name="COMMUNICATIONID" value="ea561d25-863a-4666-bc57-00a414fa1bf2"/>
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:24:26"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -88,7 +87,7 @@
<column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:41:37"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:26:03"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -99,7 +98,7 @@
<column name="CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:32:33"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:03:15"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -110,7 +109,7 @@
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
<column name="DATE_EDIT" valueDate="2019-06-11T08:26:27"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:04:03"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -121,7 +120,7 @@
<column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:50:57"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -132,7 +131,7 @@
<column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:59:10"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:06:21"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -142,7 +141,7 @@
<column name="COMMUNICATIONID" value="76a59a85-c04a-4f37-b276-d022c568e071"/>
<column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -152,7 +151,7 @@
<column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:57:27"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:10:21"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -162,7 +161,7 @@
<column name="COMMUNICATIONID" value="d5a90157-2c05-474c-aeda-0ab08d26075a"/>
<column name="CONTACT_ID" value="73d73404-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:11:20"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -171,7 +170,7 @@
<column name="COMMUNICATIONID" value="56e9d5fe-b77d-4321-938c-d331cd5b3e1e"/>
<column name="CONTACT_ID" value="73d731a2-e7f5-11e8-9f32-f2801f1b9fd1"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:13:02"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -181,7 +180,7 @@
<column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:35:59"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -192,7 +191,7 @@
<column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:39:42"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -203,7 +202,7 @@
<column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="DATE_EDIT" valueDate="2019-06-11T10:41:56"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -213,7 +212,7 @@
<column name="COMMUNICATIONID" value="00d07819-985b-4efe-a634-da71ae482907"/>
<column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="MEDIUM_ID" value="d08956b8-369e-4b65-88fa-1c37b3368ae3"/>
+ <column name="MEDIUM_ID" value="COMMINTERNET"/>
<column name="STANDARD" valueNumeric="0"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -223,7 +222,7 @@
<column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:48:25"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -234,7 +233,7 @@
<column name="CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:38:02"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -245,7 +244,7 @@
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:49:15"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -256,7 +255,7 @@
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:41:47"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -266,7 +265,7 @@
<column name="COMMUNICATIONID" value="529cadf7-7e9c-4828-9497-6ce6effb1624"/>
<column name="CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:14:38"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -276,7 +275,7 @@
<column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:36:21"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -286,7 +285,7 @@
<column name="COMMUNICATIONID" value="bde2ff44-c2f1-421e-919f-6e7194c951ec"/>
<column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:16:40"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -296,7 +295,7 @@
<column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:59:17"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -307,7 +306,7 @@
<column name="CONTACT_ID" value="19c6bf30-cd8b-40df-980c-ce71c92c194c"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:50:35"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:20:04"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -318,7 +317,7 @@
<column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:57:36"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:22:23"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -328,7 +327,7 @@
<column name="COMMUNICATIONID" value="c7d84edf-1a48-45fd-8364-e29f45ac1739"/>
<column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:22:24"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -337,7 +336,7 @@
<column name="COMMUNICATIONID" value="de32eb0c-672b-4ce5-a80e-63a8ac976599"/>
<column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -347,7 +346,7 @@
<column name="CONTACT_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:37:07"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:23:58"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -358,7 +357,7 @@
<column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:37:23"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -368,7 +367,7 @@
<column name="COMMUNICATIONID" value="e21bc8d9-f546-4f97-9c4c-4e4de67512a7"/>
<column name="CONTACT_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:26:54"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -378,7 +377,7 @@
<column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:57:45"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:30:47"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -388,7 +387,7 @@
<column name="COMMUNICATIONID" value="cc2f1e5f-9cd9-4bbb-87d4-a98d883ebbc1"/>
<column name="CONTACT_ID" value="3ac53b27-450d-4a2a-9160-bb223b8deef8"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:30:48"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -398,7 +397,7 @@
<column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:41:28"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -408,7 +407,7 @@
<column name="COMMUNICATIONID" value="4602f1f8-7a40-4c0d-bb92-649935d11bd6"/>
<column name="CONTACT_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:31:51"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -417,7 +416,7 @@
<column name="COMMUNICATIONID" value="b3be54f7-884c-4a88-8c4b-b52a4595d547"/>
<column name="CONTACT_ID" value="2c427e51-0434-40b3-ad00-3a9076067e03"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:32:30"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -427,7 +426,7 @@
<column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:59:36"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -437,7 +436,7 @@
<column name="COMMUNICATIONID" value="82584c83-5a7d-4923-8907-2953240fb8e5"/>
<column name="CONTACT_ID" value="29271db0-4253-46c9-b7c2-5e25376b9d19"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:35:38"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -447,7 +446,7 @@
<column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:57:53"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -458,7 +457,7 @@
<column name="CONTACT_ID" value="6c612f91-0160-4f09-9103-dccee7f7a6b7"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:51:51"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:39:25"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -469,7 +468,7 @@
<column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:59:26"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -479,7 +478,7 @@
<column name="COMMUNICATIONID" value="38d42eff-c782-4ffa-80d7-db812cf1c6db"/>
<column name="CONTACT_ID" value="1868bd3a-05af-4b7f-a633-e3aec50ac45c"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:41:21"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -489,7 +488,7 @@
<column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
<column name="DATE_EDIT" valueDate="2019-06-05T03:52:13"/>
<column name="DATE_NEW" valueDate="2019-05-19T08:42:07"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -499,7 +498,7 @@
<column name="COMMUNICATIONID" value="954a729a-dd11-4760-86a8-dc09e9c11d1a"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:09:20"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -508,7 +507,7 @@
<column name="COMMUNICATIONID" value="ab6da5e4-bea2-4a66-b818-b8ad5c57a167"/>
<column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:10:07"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -517,7 +516,7 @@
<column name="COMMUNICATIONID" value="786bdaba-c36d-4107-9c6f-abc15ebb4e25"/>
<column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:10:46"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -526,7 +525,7 @@
<column name="COMMUNICATIONID" value="2f571583-f8d2-47ad-b183-8d9cab3b3c19"/>
<column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:11:18"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -535,7 +534,7 @@
<column name="COMMUNICATIONID" value="5ea00579-3eb5-4c1f-9396-63a15b134f60"/>
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:19:53"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -544,7 +543,7 @@
<column name="COMMUNICATIONID" value="86784334-c997-4305-8526-35db5047ce93"/>
<column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:20:31"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -554,7 +553,7 @@
<column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:44:07"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:21:42"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -564,7 +563,7 @@
<column name="COMMUNICATIONID" value="69c70cb5-276d-4983-9607-a5fd55196573"/>
<column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:22:21"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -574,7 +573,7 @@
<column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:43:55"/>
<column name="DATE_NEW" valueDate="2019-05-21T09:24:31"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -584,7 +583,7 @@
<column name="COMMUNICATIONID" value="a0ba95f9-c872-4bfc-9591-868aaa3b2ac3"/>
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:27:25"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -593,7 +592,7 @@
<column name="COMMUNICATIONID" value="f2f8499d-2d00-485f-9d2f-381fd5e8f7ce"/>
<column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:27:48"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -602,7 +601,7 @@
<column name="COMMUNICATIONID" value="5f9aaf24-69d7-4089-a31d-e15d6d55dc92"/>
<column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:30:12"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -612,7 +611,7 @@
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:41:44"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:31:52"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -622,7 +621,7 @@
<column name="COMMUNICATIONID" value="4f3230c0-41e4-4861-880f-14ad0fcc5a35"/>
<column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:32:15"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -632,7 +631,7 @@
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:41:08"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:32:54"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -643,7 +642,7 @@
<column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:40:05"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:33:16"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -654,7 +653,7 @@
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:43:26"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:34:41"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -665,7 +664,7 @@
<column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:43:37"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:45:42"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -676,7 +675,7 @@
<column name="CONTACT_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:43:48"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:46:23"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -687,7 +686,7 @@
<column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:43:59"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:46:57"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -698,7 +697,7 @@
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="DATE_EDIT" valueDate="2019-05-23T11:23:53"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:48:09"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -709,7 +708,7 @@
<column name="CONTACT_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:44:31"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:48:35"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -720,7 +719,7 @@
<column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:44:43"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:49:12"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -731,7 +730,7 @@
<column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:44:52"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:49:30"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -742,7 +741,7 @@
<column name="CONTACT_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:45:02"/>
<column name="DATE_NEW" valueDate="2019-05-22T03:49:52"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -753,7 +752,7 @@
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:45:29"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:29:24"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -764,7 +763,7 @@
<column name="CONTACT_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:45:57"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:30:33"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -775,7 +774,7 @@
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:57:16"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:31:22"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -786,7 +785,7 @@
<column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:45:46"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:32:03"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -797,7 +796,7 @@
<column name="CONTACT_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:46:14"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:32:40"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -808,7 +807,7 @@
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:58:59"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:36:18"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -819,7 +818,7 @@
<column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:46:49"/>
<column name="DATE_NEW" valueDate="2019-05-22T05:36:39"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -829,7 +828,7 @@
<column name="COMMUNICATIONID" value="dead3100-379c-4ca3-958f-006ba17a78ad"/>
<column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:42:41"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -839,7 +838,7 @@
<column name="CONTACT_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
<column name="DATE_EDIT" valueDate="2019-05-28T07:45:37"/>
<column name="DATE_NEW" valueDate="2019-05-23T10:42:51"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
@@ -849,7 +848,7 @@
<column name="COMMUNICATIONID" value="a8dca1e8-f787-446b-b065-8089322b0402"/>
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
<column name="DATE_NEW" valueDate="2019-05-23T11:42:52"/>
- <column name="MEDIUM_ID" value="d9434c95-9abb-4661-a4c0-65d8a9eb676e"/>
+ <column name="MEDIUM_ID" value="COMMXING"/>
<column name="STANDARD" valueNumeric="0"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -858,7 +857,7 @@
<column name="COMMUNICATIONID" value="886854ab-635e-40e5-9427-c90a6642b964"/>
<column name="CONTACT_ID" value="6e667085-bb97-4039-8dfe-2230002985e0"/>
<column name="DATE_NEW" valueDate="2019-06-05T03:52:59"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -867,7 +866,7 @@
<column name="COMMUNICATIONID" value="c68be666-221e-46b4-8fad-d49bb1117c3a"/>
<column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
<column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -876,7 +875,7 @@
<column name="COMMUNICATIONID" value="b9b0499c-ea37-4a41-9a0b-8ed570d91683"/>
<column name="CONTACT_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
<column name="DATE_NEW" valueDate="2019-06-07T02:39:32"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -885,7 +884,7 @@
<column name="COMMUNICATIONID" value="5136702b-2898-4db3-98d2-436772febc35"/>
<column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
<column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -894,7 +893,7 @@
<column name="COMMUNICATIONID" value="b9773f8a-97bf-4071-9b1e-32b5e89e526a"/>
<column name="CONTACT_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
<column name="DATE_NEW" valueDate="2019-06-07T02:47:29"/>
- <column name="MEDIUM_ID" value="85ee16dd-c878-4463-be6a-324c25e76764"/>
+ <column name="MEDIUM_ID" value="COMMEMAIL"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -903,7 +902,7 @@
<column name="COMMUNICATIONID" value="2561b25b-1af2-4512-a77f-97d542c578b7"/>
<column name="CONTACT_ID" value="d3ec3869-b710-44d9-b20f-50f0724631ac"/>
<column name="DATE_NEW" valueDate="2019-06-11T08:26:11"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -912,7 +911,7 @@
<column name="COMMUNICATIONID" value="9a440c7f-5f00-43f0-9c0b-fb1b8a35721e"/>
<column name="CONTACT_ID" value="45635aca-7971-43df-a683-c80c86cb58cc"/>
<column name="DATE_NEW" valueDate="2019-06-11T08:26:49"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -921,7 +920,7 @@
<column name="COMMUNICATIONID" value="e2fcaf67-b1fd-4d2e-9848-ba45677cf494"/>
<column name="CONTACT_ID" value="d8c1e4c9-35b4-45c8-bf4c-eb55137cd25c"/>
<column name="DATE_NEW" valueDate="2019-06-11T11:58:07"/>
- <column name="MEDIUM_ID" value="2f48600a-5c3f-4201-a0c6-5ce1eb9fee13"/>
+ <column name="MEDIUM_ID" value="COMMPHONE"/>
<column name="STANDARD" valueNumeric="1"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/CONTACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
similarity index 86%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/CONTACT.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
index fa0d4e3440bf6d077fa158bc3be7bbbbdf6b7c5e..b976d26396755e4c3e7828b9afd50bfcbab2da5a 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/CONTACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTACT.xml
@@ -1,23 +1,13 @@
<?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="d1193964-e9b4-4f15-bbde-1512168c57a6">
- <delete tableName="CONTACT"/>
- <insert tableName="CONTACT">
- <column name="ADDRESS_ID" value="0 "/>
- <column name="CONTACTID" value="0 "/>
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="LANGUAGE" value="deu"/>
- <column name="ORGANISATION_ID" value="0 "/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
- <column name="USER_NEW" value="Admin"/>
- </insert>
<insert tableName="CONTACT">
<column name="ADDRESS_ID" value="14d03432-985b-4efe-a634-da71ae482907"/>
<column name="CONTACTID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -26,7 +16,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -35,7 +25,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="e83c45e0-c30b-436e-b445-00a8b58383b0"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -44,7 +34,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="eda61ea6-35ed-4a92-a93c-6118fc67d533"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -53,7 +43,7 @@
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -64,7 +54,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -75,7 +65,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -86,7 +76,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="f0fb7676-8183-4bc7-beca-ca32c1e11c10"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -97,7 +87,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -108,7 +98,7 @@
<column name="ORGANISATION_ID" value="0 "/>
<column name="PERSON_ID" value="4a55726c-4ca6-43cb-9d3f-8e55d97b7aaf"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -119,7 +109,7 @@
<column name="ORGANISATION_ID" value="0 "/>
<column name="PERSON_ID" value="7c1efe4c-cc73-4e95-bdf0-208a3ff699b5"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -130,7 +120,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="57d524f6-ad66-4550-be83-fee6e31b7a52"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -141,7 +131,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="d105f7f4-afd1-4a98-adc2-13fd6934b7e9"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -152,7 +142,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -163,7 +153,7 @@
<column name="ORGANISATION_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="PERSON_ID" value="b16282bd-254e-4569-a56e-675449821467"/>
<column name="RELATIONSHIP" valueNumeric="1"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -172,7 +162,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T03:16:58"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -181,7 +171,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T03:23:13"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -190,7 +180,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T03:33:57"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -203,7 +193,7 @@
<column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="PERSON_ID" value="08c36adc-cd2b-4ce9-a51b-944667084f7f"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -216,7 +206,7 @@
<column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="PERSON_ID" value="b4c37f47-b4b8-4fe4-812a-9043530cce84"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -229,7 +219,7 @@
<column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="PERSON_ID" value="c4e24800-e9f3-4226-afd7-cfd5dd670d93"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -242,7 +232,7 @@
<column name="PERSON_ID" value="0a611832-9476-481e-bde5-af3c3a98f1b4"/>
<column name="POSITION" value="Produktionsleiter"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -255,7 +245,7 @@
<column name="ORGANISATION_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="PERSON_ID" value="e35de858-6eca-4328-9efb-dc705ca6792c"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -267,7 +257,7 @@
<column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="PERSON_ID" value="528d7307-295c-4829-a2e4-9b59e43cf3bb"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -280,7 +270,7 @@
<column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="PERSON_ID" value="9874de9b-d517-42f2-81b9-b5f3f0b0dae3"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -293,7 +283,7 @@
<column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="PERSON_ID" value="3660abd7-73de-4825-83a1-e1992469cf56"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -306,7 +296,7 @@
<column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="PERSON_ID" value="57ec6707-e4a4-4702-9356-ee43dd4c5b00"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -318,7 +308,7 @@
<column name="ORGANISATION_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="PERSON_ID" value="44c5d7db-b96e-4f67-a00f-c206cd3f7e1b"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -331,7 +321,7 @@
<column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="PERSON_ID" value="9f4528ce-3d83-4292-ae23-d9b314271f69"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -344,7 +334,7 @@
<column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="PERSON_ID" value="c41afea2-c4b5-45dd-a4a7-05826b9dd38c"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -355,7 +345,7 @@
<column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="PERSON_ID" value="22a497cb-39c3-4e72-9f88-423d7630c7e1"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -366,7 +356,7 @@
<column name="ORGANISATION_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="PERSON_ID" value="09514fe1-a0d6-465e-883b-6cc93cc758a2"/>
<column name="RELATIONSHIP" valueNumeric="2"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -375,7 +365,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:39:15"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -384,7 +374,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -393,7 +383,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:42:16"/>
<column name="LANGUAGE" value="eng"/>
<column name="ORGANISATION_ID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -402,7 +392,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:44:27"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -411,7 +401,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -420,7 +410,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -429,7 +419,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:49:58"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -438,7 +428,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -447,7 +437,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="LANGUAGE" value="eng"/>
<column name="ORGANISATION_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -456,7 +446,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -465,7 +455,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="LANGUAGE" value="eng"/>
<column name="ORGANISATION_ID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="CONTACT">
@@ -474,7 +464,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="LANGUAGE" value="deu"/>
<column name="ORGANISATION_ID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
- <column name="STATUS" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="STATUS" value="CONTACTSTATACTIVE"/>
<column name="USER_NEW" value="Admin"/>
</insert>
</changeSet>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/CONTRACT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
similarity index 68%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/CONTRACT.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
index 729114ee1926d70c5a3b87679cc6f6380143f1a2..6201aa0873d9be0b803df612347e27157d8d1dae 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/CONTRACT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/CONTRACT.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="e80a27d2-2ebf-470c-a0a3-ac41eb9bf30f">
- <delete tableName="CONTRACT"/>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
<column name="CONTRACTCODE" value="1000"/>
@@ -9,9 +8,9 @@
<column name="CONTRACTEND" valueDate="2019-09-30T02:00:00"/>
<column name="CONTRACTID" value="384c9d31-9923-4e6a-8a7f-2d2890470b70"/>
<column name="CONTRACTSTART" valueDate="2018-10-01T02:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -20,9 +19,9 @@
<column name="CONTRACTEND" valueDate="2018-09-15T02:00:00"/>
<column name="CONTRACTID" value="8b95a074-086e-44c8-bd45-fb8e33803da3"/>
<column name="CONTRACTSTART" valueDate="2017-05-01T02:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
@@ -31,9 +30,9 @@
<column name="CONTRACTEND" valueDate="2020-09-15T02:00:00"/>
<column name="CONTRACTID" value="eb182167-1e33-4290-a160-a86d09685cba"/>
<column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -42,9 +41,9 @@
<column name="CONTRACTEND" valueDate="2021-09-15T02:00:00"/>
<column name="CONTRACTID" value="6fc9483c-fcfc-48fb-b48f-18e6b11f31fc"/>
<column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
@@ -53,9 +52,9 @@
<column name="CONTRACTEND" valueDate="2022-09-15T02:00:00"/>
<column name="CONTRACTID" value="a944b07c-aaed-4bcf-820c-9e6031bc3d6c"/>
<column name="CONTRACTSTART" valueDate="2015-03-20T01:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYQUARTER"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
@@ -64,9 +63,9 @@
<column name="CONTRACTEND" valueDate="2021-02-11T01:00:00"/>
<column name="CONTRACTID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
<column name="CONTRACTSTART" valueDate="2019-05-16T02:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
@@ -74,9 +73,9 @@
<column name="CONTRACTDUE" valueDate="2020-06-01T02:00:00"/>
<column name="CONTRACTID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
<column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="25faee74-d340-41f2-97f9-ed34c4f8ff42"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYANNUAL"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -84,9 +83,9 @@
<column name="CONTRACTEND" valueDate="2025-03-11T01:00:00"/>
<column name="CONTRACTID" value="28234066-ad12-451d-9cd2-fbc9f8ee0412"/>
<column name="CONTRACTSTART" valueDate="2019-03-11T01:00:00"/>
- <column name="CONTRACTSTATUS" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
- <column name="CONTRACTTYPE" value="ee4c5e6e-b802-4c1c-8aed-a031a2a8126f"/>
- <column name="PAYMENT" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
+ <column name="CONTRACTSTATUS" value="CONTRACTSTATVALIDLI"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEMAIN"/>
+ <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
</insert>
<insert tableName="CONTRACT">
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
@@ -95,8 +94,8 @@
<column name="CONTRACTEND" valueDate="2022-05-17T02:00:00"/>
<column name="CONTRACTID" value="5fcfa9a9-2f3d-43f0-8be0-21241a5f2ec3"/>
<column name="CONTRACTSTART" valueDate="2019-05-17T02:00:00"/>
- <column name="CONTRACTTYPE" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
- <column name="PAYMENT" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
+ <column name="CONTRACTTYPE" value="CONTRACTTYPEFRAME"/>
+ <column name="PAYMENT" value="CONTRACTPAYSEMIANNUAL"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/DOCUMENTTEMPLATE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
similarity index 97%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/DOCUMENTTEMPLATE.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
index c10eddbb98a501a44fffcc0b50339f9bb19bf819..25f71603c87de7fb9198c6e8ee02e9cb891b4755 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/DOCUMENTTEMPLATE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="6bbd2406-6a0d-4181-a3af-a0bf75eced39">
- <delete tableName="DOCUMENTTEMPLATE"/>
<insert tableName="DOCUMENTTEMPLATE">
<column name="DATE_NEW" valueDate="2019-05-24"/>
<column name="DOCUMENTTEMPLATEID" value="f032c593-f108-47dd-9fc2-357c14757a9d"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/FORECAST.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
similarity index 84%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/FORECAST.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
index 9f09cc92b747343594ab739ff8addca2e5d84a77..2e8147844f8d7ae49d8b7e4d943c6cde52e074a5 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/FORECAST.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/FORECAST.xml
@@ -3,10 +3,9 @@
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="4dd98257-1230-490f-bbe3-5122bd40ace4">
- <delete tableName="FORECAST"/>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2019-05-17T02:00:00"/>
- <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP3"/>
<column name="FORECASTID" value="2ba9de60-4c59-4441-96d8-2bee798b80fb"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -14,7 +13,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2019-09-23T02:00:00"/>
- <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP3"/>
<column name="FORECASTID" value="6e36057c-1cf3-442a-ab7c-d608195c4290"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -22,7 +21,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2019-12-23T01:00:00"/>
- <column name="GROUPCODE" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP2"/>
<column name="FORECASTID" value="02f21967-1303-4a82-b4f7-3959097dca9c"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
@@ -30,7 +29,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2017-10-03T02:00:00"/>
- <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP3"/>
<column name="FORECASTID" value="fbddbffb-dca1-4a83-95ea-0c518ed63363"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -38,7 +37,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2019-10-17T02:00:00"/>
- <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP3"/>
<column name="FORECASTID" value="b17a9912-07d3-46b7-90e3-cc912f3d85d8"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
@@ -46,7 +45,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2019-05-22T02:00:00"/>
- <column name="GROUPCODE" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP1"/>
<column name="FORECASTID" value="3379d40c-a21c-42ba-a9db-29eef26fcb35"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
@@ -54,7 +53,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2018-04-17T02:00:00"/>
- <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP3"/>
<column name="FORECASTID" value="5470f7bb-5917-4c11-8c24-b6c91cf4bd29"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
@@ -62,7 +61,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2016-05-02T02:00:00"/>
- <column name="GROUPCODE" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODE" value="PRODUCTGROUP3"/>
<column name="FORECASTID" value="b161df55-a04b-484f-b337-5e83bf4f38d3"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
@@ -70,7 +69,7 @@
</insert>
<insert tableName="FORECAST">
<column name="DATE_START" valueDate="2019-05-23T02:00:00"/>
- <column name="GROUPCODE" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+ <column name="GROUPCODE" value="PRODUCTSERVICE"/>
<column name="FORECASTID" value="a537b090-4292-446f-bdec-db491023a6bf"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/MEMBER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
similarity index 88%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/MEMBER.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
index 08884e9e21cc898cb541a0276ef63797e4131a1c..3c65f994e289f4a10bb660d47fe7e5a05a1cd6cc 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/MEMBER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/MEMBER.xml
@@ -3,20 +3,19 @@
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="9830be31-7d74-46f8-a006-06d25b8229eb">
- <delete tableName="MEMBER"/>
<insert tableName="MEMBER">
<column name="CONTACT_ID" value="d4c1bec3-656f-45ec-ae03-1c4d729d99fe"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="MEMBERID" value="336e8c10-376c-422e-afd9-1faef77c6f0c"/>
- <column name="ROLE" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
+ <column name="ROLE" value="MEMROLEPROJMANAG"/>
</insert>
<insert tableName="MEMBER">
<column name="CONTACT_ID" value="7a34d9d0-04c7-478c-a8e2-f584fe625c45"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="MEMBERID" value="c3b8a835-e9b2-40d1-aa4d-83838c5714ba"/>
- <column name="ROLE" value="8fb09614-5dc4-4d68-ac66-bf7bbebcb3ad"/>
+ <column name="ROLE" value="MEMROLEPROJASSIST"/>
</insert>
<insert tableName="MEMBER">
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
@@ -30,14 +29,14 @@
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="MEMBERID" value="685666f6-6545-4a51-8340-d98115b3d710"/>
- <column name="ROLE" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
+ <column name="ROLE" value="MEMROLEPROJMANAG"/>
</insert>
<insert tableName="MEMBER">
<column name="CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="MEMBERID" value="3bd6db09-063c-43a5-828d-9fe6e958d142"/>
- <column name="ROLE" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
+ <column name="ROLE" value="MEMROLEADVISE"/>
</insert>
<insert tableName="MEMBER">
<column name="CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
@@ -51,14 +50,14 @@
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="MEMBERID" value="094fa52f-28ee-4988-9169-c4fcf0fd58e7"/>
- <column name="ROLE" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
+ <column name="ROLE" value="MEMROLEADVISE"/>
</insert>
<insert tableName="MEMBER">
<column name="CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="MEMBERID" value="b91e741e-6e23-4a0a-a3de-06b9be398ed6"/>
- <column name="ROLE" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
+ <column name="ROLE" value="MEMROLEEXSALEMANAG"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/OFFER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
similarity index 81%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/OFFER.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
index 224a7dce263a8964a2ef1f4b533bb1ea40e51e36..3e526eb45e64283012ae02094f22f72f02ea8bac 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/OFFER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFER.xml
@@ -3,24 +3,23 @@
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="25f7045d-e9e6-4a1b-b71a-9e6743a92cd8">
- <delete tableName="OFFER"/>
<insert tableName="OFFER">
<column name="ADDRESS" value="Industrial Steel AG Stahlstraße 24 20095 Hamburg"/>
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="CURRENCY" value="EUR "/>
<column name="DATE_NEW" valueDate="2019-05-16T01:35:17"/>
- <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
<column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
<column name="LANGUAGE" value="deu"/>
<column name="NET" valueNumeric="210.00"/>
<column name="OFFERCODE" valueNumeric="1005"/>
<column name="OFFERDATE" valueDate="2019-05-16T02:00:00"/>
<column name="OFFERID" value="a9b597f0-a353-48f3-b5eb-f47d2968ebaa"/>
- <column name="PAYMENTTERMS" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
- <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+ <column name="PROBABILITY" value="50"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="39.90"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -31,18 +30,18 @@
<column name="CURRENCY" value="EUR "/>
<column name="DATE_EDIT" valueDate="2019-05-17T08:26:55"/>
<column name="DATE_NEW" valueDate="2019-05-17T08:23:52"/>
- <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="DELIVERYTERMS" value="DELIVERFREE"/>
<column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
<column name="LANGUAGE" value="deu"/>
<column name="NET" valueNumeric="3500.00"/>
<column name="OFFERCODE" valueNumeric="1006"/>
<column name="OFFERDATE" valueDate="2019-03-08T01:00:00"/>
<column name="OFFERID" value="5abae3a9-8d96-4709-b6be-7fc7e87f002b"/>
- <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
- <column name="PROBABILITY" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+ <column name="PAYMENTTERMS" value="PAYTERM30"/>
+ <column name="PROBABILITY" value="25"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="0.00"/>
@@ -60,10 +59,10 @@
<column name="OFFERCODE" valueNumeric="1007"/>
<column name="OFFERDATE" valueDate="2019-05-17T02:00:00"/>
<column name="OFFERID" value="3d13ef72-0f23-40fc-a66f-af29511a6ad9"/>
- <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="PAYMENTTERMS" value="PAYTERM30"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="0.00"/>
@@ -74,18 +73,18 @@
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="CURRENCY" value="EUR "/>
<column name="DATE_NEW" valueDate="2019-05-17T09:03:46"/>
- <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
<column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
<column name="LANGUAGE" value="deu"/>
<column name="NET" valueNumeric="192500.00"/>
<column name="OFFERCODE" valueNumeric="1008"/>
<column name="OFFERDATE" valueDate="2019-02-22T01:00:00"/>
<column name="OFFERID" value="182d647a-addd-4ef5-9c42-3912596ad63e"/>
- <column name="PAYMENTTERMS" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
- <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="PAYMENTTERMS" value="PAYTERM7"/>
+ <column name="PROBABILITY" value="50"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -96,18 +95,18 @@
<column name="CURRENCY" value="EUR "/>
<column name="DATE_EDIT" valueDate="2019-05-22T11:43:39"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:27:12"/>
- <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
<column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
<column name="LANGUAGE" value="deu"/>
<column name="NET" valueNumeric="175000.00"/>
<column name="OFFERCODE" valueNumeric="1009"/>
<column name="OFFERDATE" valueDate="2018-08-14T02:00:00"/>
<column name="OFFERID" value="fc02f9d0-06c5-4073-ac95-a59403988697"/>
- <column name="PAYMENTTERMS" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
- <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+ <column name="PAYMENTTERMS" value="PAYTERMDISCOUNT"/>
+ <column name="PROBABILITY" value="75"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="0.00"/>
@@ -118,18 +117,18 @@
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="CURRENCY" value="EUR "/>
<column name="DATE_NEW" valueDate="2019-05-17T10:28:20"/>
- <column name="DELIVERYTERMS" value="aa8713c9-ae12-4ce3-a588-0303cea11b44"/>
+ <column name="DELIVERYTERMS" value="DELIVERCIF"/>
<column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
<column name="LANGUAGE" value="deu"/>
<column name="NET" valueNumeric="17500.00"/>
<column name="OFFERCODE" valueNumeric="1010"/>
<column name="OFFERDATE" valueDate="2019-05-17T02:00:00"/>
<column name="OFFERID" value="a4fd6030-bb7e-419e-877c-816d343feea7"/>
- <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
- <column name="PROBABILITY" value="98ce5f41-90f5-434f-9e72-cdac4a0f5214"/>
+ <column name="PAYMENTTERMS" value="PAYTERM30"/>
+ <column name="PROBABILITY" value="25"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -145,11 +144,11 @@
<column name="OFFERCODE" valueNumeric="1011"/>
<column name="OFFERDATE" valueDate="2017-07-11T02:00:00"/>
<column name="OFFERID" value="30ff28e2-062f-4950-b4a1-71e51ff71acf"/>
- <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
- <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="PAYMENTTERMS" value="PAYTERM30"/>
+ <column name="PROBABILITY" value="50"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="10165.00"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -159,18 +158,18 @@
<column name="CONTACT_ID" value="a8a5f214-8165-4627-bee2-bceb3578147e"/>
<column name="CURRENCY" value="EUR "/>
<column name="DATE_NEW" valueDate="2019-05-23T09:00:44"/>
- <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
<column name="HEADER" value="gerne bieten wir Ihnen wie folgt an:"/>
<column name="LANGUAGE" value="deu"/>
<column name="NET" valueNumeric="45000.00"/>
<column name="OFFERCODE" valueNumeric="1012"/>
<column name="OFFERDATE" valueDate="2019-03-25T01:00:00"/>
<column name="OFFERID" value="e809c46a-c664-4e39-b203-55987c0379c0"/>
- <column name="PAYMENTTERMS" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
- <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="PAYMENTTERMS" value="PAYTERM7"/>
+ <column name="PROBABILITY" value="50"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="8550.00"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -181,18 +180,18 @@
<column name="CURRENCY" value="EUR "/>
<column name="DATE_EDIT" valueDate="2019-05-23T11:33:16"/>
<column name="DATE_NEW" valueDate="2019-05-23T09:04:28"/>
- <column name="DELIVERYTERMS" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="DELIVERYTERMS" value="DELIVERCARRIAGE"/>
<column name="HEADER" value="Für die bisherigen Gespräche möchten wir uns bei Ihnen bedanken. Gerne bieten wir Ihnen wie folgt an: "/>
<column name="LANGUAGE" value="deu"/>
<column name="NET" valueNumeric="25000.00"/>
<column name="OFFERCODE" valueNumeric="1013"/>
<column name="OFFERDATE" valueDate="2019-03-25T01:00:00"/>
<column name="OFFERID" value="2497128b-c07d-4fe8-b927-1bea929cce4d"/>
- <column name="PAYMENTTERMS" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
- <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+ <column name="PAYMENTTERMS" value="PAYTERM30"/>
+ <column name="PROBABILITY" value="75"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
- <column name="STATUS" value="70d27a1b-7233-481d-826f-01a13a4bb0b2"/>
+ <column name="STATUS" value="OFFERSTATOPEN"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="4750.00"/>
@@ -208,10 +207,10 @@
<column name="OFFERCODE" valueNumeric="1000"/>
<column name="OFFERDATE" valueDate="2018-11-21T01:00:00"/>
<column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f26254dbe"/>
- <column name="PROBABILITY" value="dc7c62fe-ce4b-41e3-91ab-ce0b740ccaeb"/>
+ <column name="PROBABILITY" value="100"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+ <column name="STATUS" value="OFFERSTATSENT"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="39.90"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -226,10 +225,10 @@
<column name="OFFERCODE" valueNumeric="1001"/>
<column name="OFFERDATE" valueDate="2018-08-12T02:00:00"/>
<column name="OFFERID" value="0461959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="PROBABILITY" value="50"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+ <column name="STATUS" value="OFFERSTATSENT"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -244,10 +243,10 @@
<column name="OFFERCODE" valueNumeric="1002"/>
<column name="OFFERDATE" valueDate="2018-06-14T02:00:00"/>
<column name="OFFERID" value="5561959c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="PROBABILITY" value="2dca6f38-b49a-4716-8c83-9d2183c5c065"/>
+ <column name="PROBABILITY" value="75"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+ <column name="STATUS" value="OFFERSTATSENT"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="119.70"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -262,10 +261,10 @@
<column name="OFFERCODE" valueNumeric="1003"/>
<column name="OFFERDATE" valueDate="2018-02-23T01:00:00"/>
<column name="OFFERID" value="0461959c-11c5-4d79-9ac2-f41f21154dbe"/>
- <column name="PROBABILITY" value="834f814d-4e31-4289-be6c-fad2dea3f2f0"/>
+ <column name="PROBABILITY" value="0"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
+ <column name="STATUS" value="OFFERSTATCHECK"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
@@ -280,10 +279,10 @@
<column name="OFFERCODE" valueNumeric="1004"/>
<column name="OFFERDATE" valueDate="2017-11-09T01:00:00"/>
<column name="OFFERID" value="ab61911c-88c5-4d79-9ac2-f41f21154dbe"/>
- <column name="PROBABILITY" value="c510907f-8478-471e-b702-5008908504bd"/>
+ <column name="PROBABILITY" value="50"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
<column name="OBJECT_ROWID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
+ <column name="STATUS" value="OFFERSTATCHECK"/>
<column name="USER_NEW" value="Admin"/>
<column name="VAT" valueNumeric="159.60"/>
<column name="VERSNR" valueNumeric="1"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/OFFERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
similarity index 80%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/OFFERITEM.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
index 229a5953171fdfd9d7e7c12811a5b32defb4d24c..3b0c49b7d816ade70647101a032d8a6d174d284a 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/OFFERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/OFFERITEM.xml
@@ -1,9 +1,8 @@
<?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="ed3c0518-7df4-4d57-a72e-2a74f75f374a">
- <delete tableName="OFFERITEM"/>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -13,12 +12,12 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX47"/>
<column name="ITEMPOSITION" value="1.1"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -27,11 +26,11 @@
<column name="OPTIONAL" valueNumeric="0"/>
<column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.1"/>
<column name="ITEMPOSITION" value="1.1.1"/>
<column name="ITEMSORT" valueNumeric="3"/>
@@ -40,11 +39,11 @@
<column name="OPTIONAL" valueNumeric="0"/>
<column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="44b75a12-ae8b-4003-9347-9952843425a9"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+ <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
<column name="ITEMNAME" value="Sonderrabatt"/>
<column name="ITEMPOSITION" value="1.1.1.1"/>
<column name="ITEMSORT" valueNumeric="4"/>
@@ -53,11 +52,11 @@
<column name="OPTIONAL" valueNumeric="0"/>
<column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="306997c2-212f-4ee3-97a2-525320c67f67"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.2a"/>
<column name="ITEMPOSITION" value="1.1.2"/>
<column name="ITEMSORT" valueNumeric="5"/>
@@ -66,11 +65,11 @@
<column name="OPTIONAL" valueNumeric="0"/>
<column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.1"/>
<column name="ITEMPOSITION" value="1.2"/>
<column name="ITEMSORT" valueNumeric="6"/>
@@ -79,11 +78,11 @@
<column name="OPTIONAL" valueNumeric="0"/>
<column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="QUANTITY" valueNumeric="2.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="aea44090-b57a-4620-ae65-12c9ade05c79"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.2"/>
<column name="ITEMPOSITION" value="1.3"/>
<column name="ITEMSORT" valueNumeric="7"/>
@@ -92,10 +91,10 @@
<column name="OPTIONAL" valueNumeric="0"/>
<column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -105,11 +104,11 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="QUANTITY" valueNumeric="2.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -119,11 +118,11 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -133,11 +132,11 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="QUANTITY" valueNumeric="2.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -147,11 +146,11 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="QUANTITY" valueNumeric="2.00"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="UNIT" value="QUANTITYHOUR"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -161,12 +160,12 @@
<column name="PRICE" valueNumeric="210.00"/>
<column name="PRODUCT_ID" value="a2e76fe1-e49b-4f2b-8da5-12660738043d"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX47"/>
<column name="ITEMPOSITION" value="1.1"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -175,11 +174,11 @@
<column name="OPTIONAL" valueNumeric="1"/>
<column name="PRODUCT_ID" value="feefb3a9-f02a-4536-9ebb-ab7070cc71ba"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.1"/>
<column name="ITEMPOSITION" value="1.1.1"/>
<column name="ITEMSORT" valueNumeric="3"/>
@@ -188,11 +187,11 @@
<column name="OPTIONAL" valueNumeric="1"/>
<column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="6c60f55e-27d3-44a5-a324-d184a067237a"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+ <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
<column name="ITEMNAME" value="Sonderrabatt"/>
<column name="ITEMPOSITION" value="1.1.1.1"/>
<column name="ITEMSORT" valueNumeric="4"/>
@@ -201,11 +200,11 @@
<column name="OPTIONAL" valueNumeric="1"/>
<column name="PRODUCT_ID" value="368aa1c0-b802-4dea-844e-e61bf85a03c9"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="bd35c94b-5ad8-43eb-a131-501e3577d9c9"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.2"/>
<column name="ITEMPOSITION" value="1.1.1.1.1"/>
<column name="ITEMSORT" valueNumeric="5"/>
@@ -214,11 +213,11 @@
<column name="OPTIONAL" valueNumeric="1"/>
<column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="9809d10a-5979-458f-9e32-2d3771285d65"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.2a"/>
<column name="ITEMPOSITION" value="1.1.2"/>
<column name="ITEMSORT" valueNumeric="6"/>
@@ -227,11 +226,11 @@
<column name="OPTIONAL" valueNumeric="1"/>
<column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.1"/>
<column name="ITEMPOSITION" value="1.2"/>
<column name="ITEMSORT" valueNumeric="7"/>
@@ -240,11 +239,11 @@
<column name="OPTIONAL" valueNumeric="1"/>
<column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="QUANTITY" valueNumeric="2.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="ASSIGNEDTO" value="fbf00bb1-b048-4b04-b585-392f87b5c591"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.2"/>
<column name="ITEMPOSITION" value="1.3"/>
<column name="ITEMSORT" valueNumeric="8"/>
@@ -253,10 +252,10 @@
<column name="OPTIONAL" valueNumeric="1"/>
<column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="QUANTITY" valueNumeric="3.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="Bremsscheiben"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -266,10 +265,10 @@
<column name="PRICE" valueNumeric="1000.00"/>
<column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
<column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
<column name="ITEMPOSITION" value="2"/>
@@ -280,10 +279,10 @@
<column name="PRICE" valueNumeric="2500.00"/>
<column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="Turbolader"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -293,10 +292,10 @@
<column name="PRICE" valueNumeric="3500.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
<column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
<column name="ITEMPOSITION" value="2"/>
@@ -307,11 +306,11 @@
<column name="PRICE" valueNumeric="5000.00"/>
<column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="QUANTITY" valueNumeric="5.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
<column name="DISCOUNT" valueNumeric="5.00"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="Förderanlage"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -321,10 +320,10 @@
<column name="PRICE" valueNumeric="150000.00"/>
<column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
<column name="ITEMNAME" value="Stahlträger Standard"/>
<column name="ITEMPOSITION" value="2"/>
@@ -335,10 +334,10 @@
<column name="PRICE" valueNumeric="5000.00"/>
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="QUANTITY" valueNumeric="10.00"/>
- <column name="UNIT" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+ <column name="UNIT" value="QUANTITYKGS"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ITEMNAME" value="Gipsplatten"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -348,10 +347,10 @@
<column name="PRICE" valueNumeric="150.00"/>
<column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
<column name="QUANTITY" valueNumeric="1000.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ITEMNAME" value="Standard Gerüst"/>
<column name="ITEMPOSITION" value="2"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -361,10 +360,10 @@
<column name="PRICE" valueNumeric="25000.00"/>
<column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ITEMNAME" value="Gipsplatten"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -374,10 +373,10 @@
<column name="PRICE" valueNumeric="15000.00"/>
<column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ITEMNAME" value="Vollstange"/>
<column name="ITEMPOSITION" value="2"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -387,10 +386,10 @@
<column name="PRICE" valueNumeric="250.00"/>
<column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
<column name="QUANTITY" valueNumeric="10.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="WG2 Produkt 4"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -400,11 +399,11 @@
<column name="PRICE" valueNumeric="2500.00"/>
<column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+ <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
<column name="ITEMNAME" value="Service Einsatz"/>
<column name="ITEMPOSITION" value="2"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -414,11 +413,11 @@
<column name="PRICE" valueNumeric="1000.00"/>
<column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="UNIT" value="QUANTITYHOUR"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="WG2 Proudkt 3"/>
<column name="ITEMPOSITION" value="3"/>
<column name="ITEMSORT" valueNumeric="3"/>
@@ -428,11 +427,11 @@
<column name="PRICE" valueNumeric="50000.00"/>
<column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Ersatzteil 1"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -442,11 +441,11 @@
<column name="PRICE" valueNumeric="5000.00"/>
<column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
<column name="ITEMNAME" value="WG1 Standardprodukt 1"/>
<column name="ITEMPOSITION" value="2"/>
@@ -457,11 +456,11 @@
<column name="PRICE" valueNumeric="10000.00"/>
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+ <column name="UNIT" value="QUANTITYKGS"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="WG1 Standardprodukt 3"/>
<column name="ITEMPOSITION" value="3"/>
<column name="ITEMSORT" valueNumeric="3"/>
@@ -471,11 +470,11 @@
<column name="PRICE" valueNumeric="30000.00"/>
<column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="OFFERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="WG2 Produkt 5"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -485,7 +484,7 @@
<column name="PRICE" valueNumeric="25000.00"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="QUANTITY" valueNumeric="1.00"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
</changeSet>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ORGANISATION.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
similarity index 88%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ORGANISATION.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
index ddf8e4d0f3d4f09f7973631f4b0927ec060e3cb5..c8e0ccf77f2cf09dde719e882b6dc9432c0589bb 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/ORGANISATION.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ORGANISATION.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="f0d90697-92a1-4772-aed3-a63f555e65d0">
- <delete tableName="ORGANISATION"/>
<insert tableName="ORGANISATION">
<column name="CUSTOMERCODE" value="1234"/>
<column name="DATE_EDIT" valueDate="2019-06-07T01:56:19"/>
@@ -9,7 +8,7 @@
<column name="INFO" value="Die Industrial Steal AG ist einer der führenden Stahlhersteller weltweit. Das Unternehmen agiert mit über 5.000 Mitarbeitern in über 30 Ländern. "/>
<column name="NAME" value="Industrial Steel AG"/>
<column name="ORGANISATIONID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -20,7 +19,7 @@
<column name="INFO" value="Die Transatlantik Logistic Gruppe ist ein Zusammenschluss aus mehreren Logistik Unternehmen. Über 3.000 Mitarbeiter sind bei dem europäischen Logistikriesen beschäftigt. "/>
<column name="NAME" value="Transatlantik Logistics GmbH"/>
<column name="ORGANISATIONID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -30,7 +29,7 @@
<column name="INFO" value="Die Skyscraper Bau GmbH zählt zu den führenden Unternehmen in der Baubranche. Mit ihrem breiten Portfolio überzeugen sie regelmäßig und diversifizieren sich von ihren Mitbewerbern. "/>
<column name="NAME" value="Skyscraper Bau GmbH"/>
<column name="ORGANISATIONID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ORGANISATION">
@@ -47,7 +46,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:40:51"/>
<column name="NAME" value="JPM Touristik GmbH"/>
<column name="ORGANISATIONID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ORGANISATION">
@@ -57,7 +56,7 @@
<column name="INFO" value="Automobilvermietung"/>
<column name="NAME" value="Sevent SE"/>
<column name="ORGANISATIONID" value="2c14fb05-d48e-4eeb-8a7f-85d423746848"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -76,7 +75,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:46:35"/>
<column name="NAME" value="SuperBauer AG"/>
<column name="ORGANISATIONID" value="8eecb5e5-40d9-4bf0-a152-1ca456795563"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -86,7 +85,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:47:59"/>
<column name="NAME" value="Grobbe-Werk GmbH"/>
<column name="ORGANISATIONID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -104,7 +103,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:00:09"/>
<column name="NAME" value="Firmengruppe Matthias Bogen"/>
<column name="ORGANISATIONID" value="8707accf-b1fd-4bde-97b1-ab44b75f66f9"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="ORGANISATION">
@@ -113,7 +112,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T10:03:12"/>
<column name="NAME" value="Aquire GmbH"/>
<column name="ORGANISATIONID" value="449080f6-b714-4189-a261-37439d0d4010"/>
- <column name="TYPE" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+ <column name="TYPE" value="ORGMANUF"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -123,7 +122,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T08:38:50"/>
<column name="NAME" value="Netro AG"/>
<column name="ORGANISATIONID" value="33ae2997-7bff-4c3c-8038-2fa6781dbe9d"/>
- <column name="TYPE" value="dbb3f596-bd2b-4e08-baef-ba28d7b752e9"/>
+ <column name="TYPE" value="ORGMANUF"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -133,7 +132,7 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:53:07"/>
<column name="NAME" value="Glob Group"/>
<column name="ORGANISATIONID" value="fb07cb0e-c391-4503-9c47-a39ec7388f4f"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -143,24 +142,17 @@
<column name="DATE_NEW" valueDate="2019-05-23T10:54:17"/>
<column name="NAME" value="Schild AG"/>
<column name="ORGANISATIONID" value="777246d5-7a73-4c52-af14-84df66128e5d"/>
- <column name="TYPE" value="e9f133a7-27b4-4ce1-ab93-03876ec3de61"/>
+ <column name="TYPE" value="ORGPARTNER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
- <insert tableName="ORGANISATION">
- <column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="NAME" value="privat"/>
- <column name="ORGANISATIONID" value="0 "/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
- <column name="USER_NEW" value="Admin"/>
- </insert>
<insert tableName="ORGANISATION">
<column name="CUSTOMERCODE" value="0001"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:35:38"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
<column name="NAME" value="meine Firma"/>
<column name="ORGANISATIONID" value="b219b58a-f120-42d8-9a64-0b176501eac7"/>
- <column name="TYPE" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="TYPE" value="ORGCUTOMER"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
similarity index 99%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
index 7cfd926ae9cf19c750e7b3a072beebf3a64dcd7f..efcac7a727bc99595508b68a9ab3106076dbcf4f 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="dd776383-55a6-412b-b7a9-50df698029d4">
- <delete tableName="PERSON"/>
<insert tableName="PERSON">
<column name="DATEOFBIRTH" valueDate="1991-02-01"/>
<column name="DATE_EDIT" valueDate="2019-05-29T04:02:01"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/19fd9f54-a462-4633-8d99-e3fdee85f2b0 b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/19fd9f54-a462-4633-8d99-e3fdee85f2b0
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/19fd9f54-a462-4633-8d99-e3fdee85f2b0
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/19fd9f54-a462-4633-8d99-e3fdee85f2b0
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/60cb5ede-b5a3-46f2-b7e0-a59582b4648e b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/60cb5ede-b5a3-46f2-b7e0-a59582b4648e
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/60cb5ede-b5a3-46f2-b7e0-a59582b4648e
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/60cb5ede-b5a3-46f2-b7e0-a59582b4648e
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/68050b49-0df3-45a4-9b3a-5e7c4a22f42d b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/68050b49-0df3-45a4-9b3a-5e7c4a22f42d
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/68050b49-0df3-45a4-9b3a-5e7c4a22f42d
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/68050b49-0df3-45a4-9b3a-5e7c4a22f42d
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/80bac9eb-8625-4c7c-9bb7-8b9742282c75 b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/80bac9eb-8625-4c7c-9bb7-8b9742282c75
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/80bac9eb-8625-4c7c-9bb7-8b9742282c75
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/80bac9eb-8625-4c7c-9bb7-8b9742282c75
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/8bc6a224-0c05-445a-afb0-9bc233785287 b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/8bc6a224-0c05-445a-afb0-9bc233785287
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/8bc6a224-0c05-445a-afb0-9bc233785287
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/8bc6a224-0c05-445a-afb0-9bc233785287
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/b05d15e7-92d3-4a14-834a-d4c4f2fd20e9 b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/b05d15e7-92d3-4a14-834a-d4c4f2fd20e9
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/b05d15e7-92d3-4a14-834a-d4c4f2fd20e9
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/b05d15e7-92d3-4a14-834a-d4c4f2fd20e9
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/c9449fc9-909d-4be1-a55e-96fce635dbba b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/c9449fc9-909d-4be1-a55e-96fce635dbba
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/c9449fc9-909d-4be1-a55e-96fce635dbba
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/c9449fc9-909d-4be1-a55e-96fce635dbba
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/ccb12de9-849a-4929-b530-48ce80b607df b/.liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/ccb12de9-849a-4929-b530-48ce80b607df
similarity index 100%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PERSON/PICTURE/blobFiles/ccb12de9-849a-4929-b530-48ce80b607df
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PERSON/PICTURE/blobFiles/ccb12de9-849a-4929-b530-48ce80b607df
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PRODUCT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
similarity index 76%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PRODUCT.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
index 9e50e3d7d08de98b067e804cb3dda99d6b103b6e..e8fb8fcc3a97e72d1261a1ea4b1b341043550ef1 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PRODUCT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCT.xml
@@ -1,18 +1,17 @@
<?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="61c9b746-b9ac-4521-a846-20d0361c0023">
- <delete tableName="PRODUCT"/>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-22T11:13:33"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="12"/>
<column name="PRODUCTCODE" value="ET1006"/>
<column name="PRODUCTID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="PRODUCTNAME" value="Ersatzteil 1"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -20,13 +19,13 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-22T11:13:42"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="10"/>
<column name="PRODUCTCODE" value="ET1005"/>
<column name="PRODUCTID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="PRODUCTNAME" value="Ersatzteil 2"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -34,13 +33,13 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-22T11:14:05"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="15"/>
<column name="PRODUCTCODE" value="ET1004"/>
<column name="PRODUCTID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="PRODUCTNAME" value="Ersatzteil 3"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -48,13 +47,13 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-22T11:14:32"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:36"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="MINSTOCK" valueNumeric="50"/>
<column name="PRODUCTCODE" value="ET1009"/>
<column name="PRODUCTID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="PRODUCTNAME" value="Ersatzteil 4"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -62,12 +61,12 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-22T11:22:20"/>
<column name="DATE_NEW" valueDate="2019-05-22T11:20:28"/>
- <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+ <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
<column name="PRODUCTCODE" value="DL1005"/>
<column name="PRODUCTID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
<column name="PRODUCTNAME" value="Beratungsdienstleistung"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="UNIT" value="QUANTITYHOUR"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -75,55 +74,73 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:43:25"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
- <column name="INFO" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="MINSTOCK" valueNumeric="10"/>
<column name="PRODUCTCODE" value="WG0001"/>
<column name="PRODUCTID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="PRODUCTNAME" value="WG1 Standardprodukt 1"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+ <column name="UNIT" value="QUANTITYKGS"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
+ <insert tableName="DESCRIPTIONTRANSLATION">
+ <column name="DESCRIPTIONTRANSLATIONID" value="70108db9-2c27-438d-9dff-d01c8b54c8c7"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="OBJECT_ROWID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
+ <column name="LANG" value="deu"/>
+ <column name="DESCRIPTION" value="Standard Stahlträger mit den Maßen 5m x 0,3m x 0,3m."/>
+ </insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:48:31"/>
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
- <column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="PRODUCTCODE" value="WG2002"/>
<column name="PRODUCTID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="PRODUCTNAME" value="WG2 Produkt 1"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
+ <insert tableName="DESCRIPTIONTRANSLATION">
+ <column name="DESCRIPTIONTRANSLATIONID" value="91f7d8e8-136c-46de-8d01-ba231ebb49e3"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="OBJECT_ROWID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
+ <column name="LANG" value="deu"/>
+ <column name="DESCRIPTION" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
+ </insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:49:51"/>
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
- <column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="PRODUCTCODE" value="WG2003"/>
<column name="PRODUCTID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
<column name="PRODUCTNAME" value="WG2 Produkt 2"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
+ <insert tableName="DESCRIPTIONTRANSLATION">
+ <column name="DESCRIPTIONTRANSLATIONID" value="020ca255-eae8-4771-a4a3-e62d6702f9f0"/>
+ <column name="OBJECT_TYPE" value="Product"/>
+ <column name="OBJECT_ROWID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
+ <column name="LANG" value="deu"/>
+ <column name="DESCRIPTION" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
+ </insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-16T01:53:18"/>
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="PRODUCTCODE" value="WG2004"/>
<column name="PRODUCTID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
<column name="PRODUCTNAME" value="WG2 Proudkt 3"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -131,12 +148,12 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:23:33"/>
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="PRODUCTCODE" value="WG2005"/>
<column name="PRODUCTID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
<column name="PRODUCTNAME" value="WG2 Produkt 4"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -144,36 +161,36 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:25:18"/>
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="PRODUCTCODE" value="WG2006"/>
<column name="PRODUCTID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="PRODUCTNAME" value="WG2 Produkt 5"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:30:01"/>
- <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+ <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
<column name="PRODUCTCODE" value="DL1001"/>
<column name="PRODUCTID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
<column name="PRODUCTNAME" value="Service Einsatz"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="UNIT" value="QUANTITYHOUR"/>
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="PRODUCT">
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:32:19"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="PRODUCTCODE" value="WG1005"/>
<column name="PRODUCTID" value="155ac430-ccfc-4814-95fc-189631779064"/>
<column name="PRODUCTNAME" value="WG1 Standardprodukt 3"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -181,12 +198,12 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-05-21T09:00:55"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:34:44"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="PRODUCTCODE" value="WG1003"/>
<column name="PRODUCTID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
<column name="PRODUCTNAME" value="WG1 Standardprodukt 2"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -194,12 +211,12 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:14:18"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:37:31"/>
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="PRODUCTCODE" value="WG3001"/>
<column name="PRODUCTID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
<column name="PRODUCTNAME" value="WG3 Produkt A"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -207,12 +224,12 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:14:27"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:39:37"/>
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="PRODUCTCODE" value="WG3002"/>
<column name="PRODUCTID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
<column name="PRODUCTNAME" value="WG3 Produkt B"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
@@ -220,12 +237,12 @@
<column name="ADVERTISING" value="N"/>
<column name="DATE_EDIT" valueDate="2019-06-11T11:14:35"/>
<column name="DATE_NEW" valueDate="2019-05-17T07:45:10"/>
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="PRODUCTCODE" value="WG3003"/>
<column name="PRODUCTID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
<column name="PRODUCTNAME" value="WG3 Produkt C"/>
<column name="STATUS" valueNumeric="1"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PRODUCTPRICE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
similarity index 88%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PRODUCTPRICE.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
index 2ac98ebb53a2a3ef085594f6f49e30fa0995d309..97cb34c3f225bd9dcf66cfad73bc9d8d0a2b6410 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/PRODUCTPRICE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/PRODUCTPRICE.xml
@@ -1,13 +1,12 @@
<?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="1498715a-2292-43ab-ba21-adabe92795f2">
- <delete tableName="PRODUCTPRICE"/>
<insert tableName="PRODUCTPRICE">
<column name="BUYSELL" value="SP"/>
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="1060.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="c5b5bfce-2bec-4601-ba43-2567209bea04"/>
<column name="PRODUCT_ID" value="6e52e636-284d-454b-978c-8f58844c5c5b"/>
<column name="VALID_FROM" valueDate="2018-11-01T01:00:00"/>
@@ -19,7 +18,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="1500.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="c0769e98-bf18-444c-92b0-fc5d17613ea8"/>
<column name="PRODUCT_ID" value="bb897bd1-244b-45cd-8a2f-f5a783cbbbff"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -30,7 +29,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="1000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="443b9532-7a41-481a-8f95-ffaf5e7949af"/>
<column name="PRODUCT_ID" value="239a4c58-5ae6-4aaa-aba3-7e40bf348ce2"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -41,7 +40,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="2500.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="a75cc2e2-bb81-4e9f-9fa4-95c8531e966d"/>
<column name="PRODUCT_ID" value="b973e3f9-277c-4787-96a0-7cac54472420"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -52,7 +51,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="5000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="bb425e07-4238-4cb7-b20b-a0ba4ed8b1ae"/>
<column name="PRODUCT_ID" value="f52b1d6e-bf08-4fe1-8d83-ac0728c4b1c4"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -63,7 +62,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="7500.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="ad57ee30-4afe-4426-912b-c0b9d03107f7"/>
<column name="PRODUCT_ID" value="072680e3-9e5d-4228-b5a8-f4acef8f2452"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -74,7 +73,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="10000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="a9b9097a-f664-4114-aa0a-ff2a01dddd04"/>
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -85,7 +84,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="20000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="a2c9954b-bda0-4f02-8269-96cb86cb2516"/>
<column name="PRODUCT_ID" value="c8244502-73be-4ef7-9ef7-2b5ae95d3718"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -96,7 +95,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="30000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="43fa161c-0f85-4915-89be-6bb442143506"/>
<column name="PRODUCT_ID" value="155ac430-ccfc-4814-95fc-189631779064"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -108,7 +107,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="10000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="4028dfb7-d0e4-493e-9676-6f14a24a9507"/>
<column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
<column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -120,7 +119,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="5000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="f90ff3d2-3e62-4b6f-bcfb-db4d4ecd8de8"/>
<column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -133,7 +132,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="2500.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="75365b30-fd09-4255-b1d7-f4c91e9d255e"/>
<column name="PRODUCT_ID" value="805cd37f-d6c7-424b-99b0-b3de9ec89f7b"/>
<column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -146,7 +145,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="25000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="1c5b6a5a-4aa0-499e-994f-278c7bdf87bf"/>
<column name="PRODUCT_ID" value="c9f744bc-7903-4ec0-96f9-1df010ce1f37"/>
<column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -159,7 +158,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="15000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="bf8ef6ac-9f34-40fd-aa2e-9792fee9a970"/>
<column name="PRODUCT_ID" value="e073ddc7-e3b8-4430-9e4f-12065106a624"/>
<column name="VALID_FROM" valueDate="2019-05-17T02:00:00"/>
@@ -171,7 +170,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="35000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="24d65d20-bf5c-474d-8351-2788431e0e1a"/>
<column name="PRODUCT_ID" value="80b77bce-5299-4c1d-bf41-5eca0add2f50"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -182,7 +181,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="50000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="df9fe0b0-4f16-4592-8066-fe9b3f41fdc1"/>
<column name="PRODUCT_ID" value="3d0086d3-f7fa-4328-bfc9-75cf37eb422c"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -193,7 +192,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="25000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="71d5a323-12d8-4d1b-8de6-6a7bf81d0b61"/>
<column name="PRODUCT_ID" value="895f8caf-8c91-4ba8-9619-44ea6366cbbb"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -204,7 +203,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="30000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="abfa7e4d-bd88-4186-a7ae-26385ea1d91c"/>
<column name="PRODUCT_ID" value="993f6294-f1fc-42d2-8786-1c13274fd133"/>
<column name="VALID_FROM" valueDate="2019-05-22T02:00:00"/>
@@ -216,7 +215,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="10000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="ead04c9b-955e-4595-bb31-31685b3ceaec"/>
<column name="PRODUCT_ID" value="535cec1a-e81c-4833-aad6-1d2348dbc0fb"/>
<column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
@@ -229,7 +228,7 @@
<column name="CURRENCY" value="EUR "/>
<column name="FROMQUANTITY" valueNumeric="1.00"/>
<column name="PRICE" valueNumeric="150000.00"/>
- <column name="PRICELIST" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="PRICELIST" value="PRICELISTDEFAULT"/>
<column name="PRODUCTPRICEID" value="2749f80a-f09b-4153-97dd-2284253e8228"/>
<column name="PRODUCT_ID" value="8cdbd2d8-70e2-4899-9ac6-3f0c3e28cab1"/>
<column name="VALID_FROM" valueDate="2019-05-23T02:00:00"/>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESORDER.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
similarity index 91%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESORDER.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
index 0537b78d6d62e02389daf70453e7e6100b3a9af3..c31392d80602cfce21f1add32f068ce48eddebc2 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESORDER.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDER.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="d36d2933-8630-41dd-adba-b340e7d91024">
- <delete tableName="SALESORDER"/>
<insert tableName="SALESORDER">
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="CURRENCY" value="EUR "/>
@@ -11,7 +10,7 @@
<column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
<column name="SALESORDERID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+ <column name="STATUS" value="SALORDERSTATSENT"/>
<column name="VAT" valueNumeric="39.90"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -24,7 +23,7 @@
<column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
<column name="SALESORDERID" value="41197800-027b-47f5-923a-f1004d09a969"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+ <column name="STATUS" value="SALORDERSTATSENT"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -37,7 +36,7 @@
<column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
<column name="SALESORDERID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+ <column name="STATUS" value="SALORDERSTATSENT"/>
<column name="VAT" valueNumeric="119.70"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -50,7 +49,7 @@
<column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
<column name="SALESORDERID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+ <column name="STATUS" value="SALORDERSTATCHECK"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -63,7 +62,7 @@
<column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
<column name="SALESORDERID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+ <column name="STATUS" value="SALORDERSTATCHECK"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -76,7 +75,7 @@
<column name="SALESORDERDATE" valueDate="2017-11-21T01:00:00"/>
<column name="SALESORDERID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+ <column name="STATUS" value="SALORDERSTATSENT"/>
<column name="VAT" valueNumeric="39.90"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -89,7 +88,7 @@
<column name="SALESORDERDATE" valueDate="2018-08-12T02:00:00"/>
<column name="SALESORDERID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+ <column name="STATUS" value="SALORDERSTATSENT"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -102,7 +101,7 @@
<column name="SALESORDERDATE" valueDate="2016-06-14T02:00:00"/>
<column name="SALESORDERID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+ <column name="STATUS" value="SALORDERSTATSENT"/>
<column name="VAT" valueNumeric="119.70"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -115,7 +114,7 @@
<column name="SALESORDERDATE" valueDate="2018-08-23T02:00:00"/>
<column name="SALESORDERID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+ <column name="STATUS" value="SALORDERSTATCHECK"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -128,7 +127,7 @@
<column name="SALESORDERDATE" valueDate="2017-05-09T02:00:00"/>
<column name="SALESORDERID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
<column name="SALESPROJECT_ID" value="0833465c-8851-4fbb-b7e3-8c1d73c903da"/>
- <column name="STATUS" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+ <column name="STATUS" value="SALORDERSTATCHECK"/>
<column name="VAT" valueNumeric="79.80"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -156,7 +155,7 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+ <column name="STATUS" value="SALORDERSTATWON"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -172,7 +171,7 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+ <column name="STATUS" value="SALORDERSTATWON"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -188,7 +187,7 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
- <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+ <column name="STATUS" value="SALORDERSTATWON"/>
<column name="VAT" valueNumeric="10165.00"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
@@ -204,7 +203,7 @@
<column name="SALESORDERDATE" valueDate="2019-05-22T02:00:00"/>
<column name="SALESORDERID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
- <column name="STATUS" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+ <column name="STATUS" value="SALORDERSTATWON"/>
<column name="VAT" valueNumeric="0.00"/>
<column name="VERSNR" valueNumeric="1"/>
</insert>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESORDERITEM.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
similarity index 80%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESORDERITEM.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
index 1b8f1ed5c49e218793788cfe30f9e6867765d8a5..27e204d4605622485d0bb4de51e7ec3092f1764a 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESORDERITEM.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESORDERITEM.xml
@@ -1,9 +1,8 @@
<?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="6179af3a-4596-4389-b0d9-824b5c059006">
- <delete tableName="SALESORDERITEM"/>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -13,12 +12,12 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX47"/>
<column name="ITEMPOSITION" value="1.1"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -27,11 +26,11 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.1"/>
<column name="ITEMPOSITION" value="1.1.1"/>
<column name="ITEMSORT" valueNumeric="3"/>
@@ -40,11 +39,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+ <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
<column name="ITEMNAME" value="Sonderrabatt"/>
<column name="ITEMPOSITION" value="1.1.1.1"/>
<column name="ITEMSORT" valueNumeric="4"/>
@@ -53,11 +52,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="8772eb20-dbe8-4e12-8ea8-21fb28474c3e"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.2a"/>
<column name="ITEMPOSITION" value="1.1.2"/>
<column name="ITEMSORT" valueNumeric="5"/>
@@ -66,11 +65,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="8c60146f-e950-47ad-8fed-d7bb88947789"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.1"/>
<column name="ITEMPOSITION" value="1.2"/>
<column name="ITEMSORT" valueNumeric="6"/>
@@ -79,11 +78,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="21ee4b39-876e-44a8-8153-dc7f38957fc7"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.2"/>
<column name="ITEMPOSITION" value="1.3"/>
<column name="ITEMSORT" valueNumeric="7"/>
@@ -92,10 +91,10 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="f268cf96-7ba6-44aa-8357-42e0469afe79"/>
<column name="SALESORDER_ID" value="2e661772-951f-47bc-a862-5aa3c5aa2731"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -105,11 +104,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="ed7dcd27-0369-4196-894c-bfcce94b9e73"/>
<column name="SALESORDER_ID" value="41197800-027b-47f5-923a-f1004d09a969"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -119,11 +118,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="17856c63-10f8-46c6-9295-5ad5bedff8ba"/>
<column name="SALESORDER_ID" value="373f28a5-a812-433b-8196-a6bf8bdd5656"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -133,11 +132,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="3b25eeb9-ea52-4c62-a22c-041a1a2a41c2"/>
<column name="SALESORDER_ID" value="5a34f4a2-13b2-46ec-8f61-939fe27ba484"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -147,11 +146,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="45422c17-9626-4435-80ef-58c24fdf7559"/>
<column name="SALESORDER_ID" value="545ffd81-cfa5-4be6-b62c-df269909dcd4"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="UNIT" value="QUANTITYHOUR"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -161,12 +160,12 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="92ebcce0-8970-42dc-b32f-b892fe7dbb52"/>
<column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="GROUPCODEID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP1"/>
<column name="ITEMNAME" value="AX47"/>
<column name="ITEMPOSITION" value="1.1"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -175,11 +174,11 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="2bf1eb1f-501c-4006-83cb-fb9783272e35"/>
<column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.1"/>
<column name="ITEMPOSITION" value="1.1.1"/>
<column name="ITEMSORT" valueNumeric="3"/>
@@ -188,11 +187,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="dcb02f78-8305-462f-bbeb-f7b5cb102461"/>
<column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="1e1a68ba-dc28-43e5-ad05-a2d062da2dbc"/>
- <column name="GROUPCODEID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+ <column name="GROUPCODEID" value="PRODUCTDISCOUNT"/>
<column name="ITEMNAME" value="Sonderrabatt"/>
<column name="ITEMPOSITION" value="1.1.1.1"/>
<column name="ITEMSORT" valueNumeric="4"/>
@@ -201,11 +200,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="a63b3fed-f7a4-4173-ba3e-a893f7186ed6"/>
<column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="02681c7d-7494-4c0e-8b4a-170a64b5baa1"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname4.2a"/>
<column name="ITEMPOSITION" value="1.1.2"/>
<column name="ITEMSORT" valueNumeric="5"/>
@@ -214,11 +213,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="6d59b91d-bfac-46ac-be79-35fdeb793d0d"/>
<column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.1"/>
<column name="ITEMPOSITION" value="1.2"/>
<column name="ITEMSORT" valueNumeric="6"/>
@@ -227,11 +226,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="b68656aa-84e1-4682-9c2e-2d9ec0810ecb"/>
<column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
<column name="ASSIGNEDTO" value="f6207cd1-5ab0-4a97-a243-448242c02f17"/>
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="Produktname1.2"/>
<column name="ITEMPOSITION" value="1.3"/>
<column name="ITEMSORT" valueNumeric="7"/>
@@ -240,10 +239,10 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="fafb2b07-012e-4d20-b263-2b794e5370a7"/>
<column name="SALESORDER_ID" value="de09c9c2-7560-4f3f-9284-853ad1341cf9"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -253,11 +252,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="45c38cca-86b7-46f1-aee8-635c8f0603bc"/>
<column name="SALESORDER_ID" value="3ce30718-ecc6-4543-95c8-1b25e1b6db43"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -267,11 +266,11 @@
<column name="QUANTITY" valueNumeric="3.00"/>
<column name="SALESORDERITEMID" value="c64dc823-98cd-4159-a27d-7167f510fc57"/>
<column name="SALESORDER_ID" value="fae74315-d7ac-4757-b952-cc71ae83f4b5"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -281,11 +280,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="5396e85b-3144-400f-8f5d-c01e875679f7"/>
<column name="SALESORDER_ID" value="4b0e2423-d09d-47fc-b274-5a9fde013b64"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="GROUPCODEID" value="PRODUCTSPARE"/>
<column name="ITEMNAME" value="AX45"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -295,11 +294,11 @@
<column name="QUANTITY" valueNumeric="2.00"/>
<column name="SALESORDERITEMID" value="709e37c9-0397-4b82-965c-e11416e6f090"/>
<column name="SALESORDER_ID" value="f5cf5ef9-ce09-4885-bcb0-421cd9cfac69"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="UNIT" value="QUANTITYHOUR"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="Turbolader"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -309,10 +308,10 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="08de406a-79bf-468f-8fea-29acfc79a1e8"/>
<column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="INFO" value="4 Zonen Klimaanlage für Mittelklasse Wagen"/>
<column name="ITEMNAME" value="Klimaanlage 4-Zonen"/>
<column name="ITEMPOSITION" value="2"/>
@@ -323,10 +322,10 @@
<column name="QUANTITY" valueNumeric="5.00"/>
<column name="SALESORDERITEMID" value="368569a0-4d4d-4535-b2a5-8e380d5612ef"/>
<column name="SALESORDER_ID" value="1b9bd530-f45b-4074-872f-b8362cfc5ed0"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="Bremsscheiben"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -336,10 +335,10 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="b4f02784-4593-4caf-a845-40b426d00082"/>
<column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="INFO" value="2 Zonen Klimaanlage für Klein- und Kompaktwagen"/>
<column name="ITEMNAME" value="Klimaanlage 2-Zonen"/>
<column name="ITEMPOSITION" value="2"/>
@@ -350,10 +349,10 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="001410e8-f70b-4041-901c-02275ff6deb5"/>
<column name="SALESORDER_ID" value="9069d098-7237-4fed-a365-ad2e60bf740f"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="WG2 Produkt 4"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -363,11 +362,11 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="e53aaecf-d8b6-4327-96cb-66f004e4b5fb"/>
<column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+ <column name="GROUPCODEID" value="PRODUCTSERVICE"/>
<column name="ITEMNAME" value="Service Einsatz"/>
<column name="ITEMPOSITION" value="2"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -377,11 +376,11 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="cd7c9255-0de8-4b15-a952-caf9669b447a"/>
<column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
- <column name="UNIT" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="UNIT" value="QUANTITYHOUR"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP2"/>
<column name="ITEMNAME" value="WG2 Proudkt 3"/>
<column name="ITEMPOSITION" value="3"/>
<column name="ITEMSORT" valueNumeric="3"/>
@@ -391,11 +390,11 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="468023b8-fb3e-4e4c-9d30-841d12888b73"/>
<column name="SALESORDER_ID" value="5e082fe5-99d4-43be-aaad-e596f844fa8a"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
<column name="VAT" valueNumeric="19.00"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ITEMNAME" value="Gipsplatten"/>
<column name="ITEMPOSITION" value="1"/>
<column name="ITEMSORT" valueNumeric="1"/>
@@ -405,10 +404,10 @@
<column name="QUANTITY" valueNumeric="1000.00"/>
<column name="SALESORDERITEMID" value="b5f17aaa-ffa7-4c8e-bbcb-d51cfecb06db"/>
<column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
<insert tableName="SALESORDERITEM">
- <column name="GROUPCODEID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="GROUPCODEID" value="PRODUCTGROUP3"/>
<column name="ITEMNAME" value="Standard Gerüst"/>
<column name="ITEMPOSITION" value="2"/>
<column name="ITEMSORT" valueNumeric="2"/>
@@ -418,7 +417,7 @@
<column name="QUANTITY" valueNumeric="1.00"/>
<column name="SALESORDERITEMID" value="39da8def-662f-4904-b9bf-b4e97affbeb7"/>
<column name="SALESORDER_ID" value="fc691949-4f61-485c-8e97-8f3d0d3d3962"/>
- <column name="UNIT" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="UNIT" value="QUANTITYPIECES"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
similarity index 72%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
index 6f9ff98230cba30489c52b4652499f38aacdc370..7f9edcfca85b80eef78a6716a8b31e861daa3277 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT.xml
@@ -1,65 +1,64 @@
<?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="301fa7a0-f5a7-4bc1-a53b-cb6a4a6dae35">
- <delete tableName="SALESPROJECT"/>
<insert tableName="SALESPROJECT">
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="ENDDATE" valueDate="2020-05-16T02:00:00"/>
- <column name="PHASE" value="4814b51b-40f5-49bc-897b-f0933b9fc12c"/>
- <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+ <column name="PHASE" value="SALPROJPHASEMQC"/>
+ <column name="PROBABILITY" value="SALPROJPROB25"/>
<column name="PROJECTCODE" valueNumeric="1002"/>
<column name="PROJECTTITLE" value="Erstprojekt"/>
<column name="SALESPROJECTID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="STARTDATE" valueDate="2019-05-16T02:00:00"/>
- <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="STATE" value="SALPROJSTATOPEN"/>
<column name="VOLUME" valueNumeric="200000.00"/>
</insert>
<insert tableName="SALESPROJECT">
<column name="CONTACT_ID" value="fc465f2f-803b-4a1f-b79d-7b466d7ecff4"/>
<column name="ENDDATE" valueDate="2020-05-17T02:00:00"/>
- <column name="PHASE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
- <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+ <column name="PHASE" value="SALPROJPHASESAL"/>
+ <column name="PROBABILITY" value="SALPROJPROB25"/>
<column name="PROJECTCODE" valueNumeric="1003"/>
<column name="PROJECTTITLE" value="Skyscraper / Pilotprojekt"/>
<column name="SALESPROJECTID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="STARTDATE" valueDate="2019-05-17T02:00:00"/>
- <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="STATE" value="SALPROJSTATOPEN"/>
<column name="VOLUME" valueNumeric="120000.00"/>
</insert>
<insert tableName="SALESPROJECT">
<column name="CONTACT_ID" value="6efb4fab-64f9-4d8e-aa6f-a158d13fc273"/>
<column name="ENDDATE" valueDate="2020-05-17T02:00:00"/>
- <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
- <column name="PROBABILITY" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+ <column name="PHASE" value="SALPROJPHASESQO"/>
+ <column name="PROBABILITY" value="SALPROJPROB25"/>
<column name="PROJECTCODE" valueNumeric="1004"/>
<column name="PROJECTTITLE" value="Transatlantik Initialprojekt"/>
<column name="SALESPROJECTID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="STARTDATE" valueDate="2019-05-17T02:00:00"/>
- <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="STATE" value="SALPROJSTATOPEN"/>
<column name="VOLUME" valueNumeric="250000.00"/>
</insert>
<insert tableName="SALESPROJECT">
<column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
- <column name="PHASE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
- <column name="PROBABILITY" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
+ <column name="PHASE" value="SALPROJPHASENEGO"/>
+ <column name="PROBABILITY" value="SALPROJPROB50"/>
<column name="PROJECTCODE" valueNumeric="1005"/>
<column name="PROJECTTITLE" value="Kronen Pilotprojekt"/>
<column name="SALESPROJECTID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="STARTDATE" valueDate="2017-05-16T02:00:00"/>
- <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="STATE" value="SALPROJSTATOPEN"/>
<column name="VOLUME" valueNumeric="350000.00"/>
</insert>
<insert tableName="SALESPROJECT">
<column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="ENDDATE" valueDate="2020-05-22T02:00:00"/>
- <column name="PHASE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
- <column name="PROBABILITY" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
+ <column name="PHASE" value="SALPROJPHASESQO"/>
+ <column name="PROBABILITY" value="SALPROJPROB50"/>
<column name="PROJECTCODE" valueNumeric="1006"/>
<column name="PROJECTTITLE" value="Buchner Neuprojekt"/>
<column name="SALESPROJECTID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="STARTDATE" valueDate="2016-02-05T01:00:00"/>
- <column name="STATE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="STATE" value="SALPROJSTATOPEN"/>
<column name="VOLUME" valueNumeric="450000.00"/>
</insert>
</changeSet>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT_MILESTONE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
similarity index 78%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT_MILESTONE.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
index e2481f3bcaad5e96eff18874ff364f8dee445e3b..702a5bb080d3c9a0410b247bcfac8c80e471fc6d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT_MILESTONE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_MILESTONE.xml
@@ -1,35 +1,49 @@
<?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="39eb990c-b75c-4bc2-bd52-4c91c01430fc">
- <delete tableName="SALESPROJECT_MILESTONE"/>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T10:18:10"/>
<column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="b2cb428d-b76b-423a-9b61-04d03213e6d3"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="9f7d1fa9-7c09-4037-8f7c-8458def14d89"/>
+ <column name="VALUE" value="SALPROJPHASENQC"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-16T01:34:58"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="ae7fe604-2fea-4aa1-be75-e990e8f31c74"/>
<column name="TYPE" value="SalesprojectState"/>
- <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
+
<insert tableName="SALESPROJECT_MILESTONE">
- <column name="DATE_START" valueDate="2019-05-17T08:08:07"/>
+ <column name="DATE_START" valueDate="2019-04-25T08:08:07"/>
+ <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="SALESPROJECT_MILESTONEID" value="063a2c02-4b21-459a-8ae3-558ba67973dd"/>
+ <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="VALUE" value="SALPROJPHASENQC"/>
+ </insert>
+ <insert tableName="SALESPROJECT_MILESTONE">
+ <column name="DATE_START" valueDate="2019-05-10T08:08:07"/>
+ <column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
+ <column name="SALESPROJECT_MILESTONEID" value="122a232c-0b24-45f1-a55f-d827a3d993de"/>
+ <column name="TYPE" value="SalesprojectPhase"/>
+ <column name="VALUE" value="SALPROJPHASEMAL"/>
+ </insert>
+ <insert tableName="SALESPROJECT_MILESTONE">
+ <column name="DATE_START" valueDate="2019-06-17T08:08:07"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_MILESTONEID" value="737a988e-8779-4449-ba82-50f4361974eb"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="VALUE" value="SALPROJPHASESAL"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-17T08:08:08"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_MILESTONEID" value="5189697c-5dbf-4d10-a163-dfde87e490ab"/>
<column name="TYPE" value="SalesprojectState"/>
- <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T10:44:48"/>
@@ -37,14 +51,14 @@
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="4e764ba9-8f81-4e01-93de-f9769205dd3c"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="VALUE" value="SALPROJPHASESAL"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-17T08:39:38"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="d77dc2ae-f12d-49ac-9a8f-ee0b5086f6ef"/>
<column name="TYPE" value="SalesprojectState"/>
- <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T10:44:26"/>
@@ -52,28 +66,28 @@
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="d77a1712-bd57-4d4f-bc58-69ce58f31685"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
+ <column name="VALUE" value="SALPROJPHASESAL"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-22T11:51:20"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="4529f6d1-2d4d-4dfc-b404-6a3d30e7153b"/>
<column name="TYPE" value="SalesprojectState"/>
- <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="eff31d24-4434-4b92-9de9-eeb8eb43cb72"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+ <column name="VALUE" value="SALPROJPHASESQO"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-22T01:42:51"/>
<column name="SALESPROJECT_ID" value="ef7f4726-4476-4f59-97c2-706dc1e0046f"/>
<column name="SALESPROJECT_MILESTONEID" value="381b808e-d0a7-408b-a794-55c10b0399b5"/>
<column name="TYPE" value="SalesprojectState"/>
- <column name="VALUE" value="483bcaeb-1e5b-4772-b54e-7d7d8aa65712"/>
+ <column name="VALUE" value="SALPROJSTATOPEN"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_END" valueDate="2019-05-23T11:30:09"/>
@@ -81,28 +95,28 @@
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="47999521-d6ea-4a4d-959c-e72776ba5a25"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="60d09bb1-7e02-4003-99bf-18b739a577ad"/>
+ <column name="VALUE" value="SALPROJPHASEOFFER"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T10:44:26"/>
<column name="SALESPROJECT_ID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="SALESPROJECT_MILESTONEID" value="61f7f5d6-01a6-4088-9387-820cb71ea526"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="213c8184-f930-457e-8605-703baaf21d4a"/>
+ <column name="VALUE" value="SALPROJPHASENEGO"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T10:44:48"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_MILESTONEID" value="8a33dafb-4a1b-4ec9-a1cd-37a6c75e3721"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="972a41dc-a8ae-43cd-a03b-522ea84efbfb"/>
+ <column name="VALUE" value="SALPROJPHASESQO"/>
</insert>
<insert tableName="SALESPROJECT_MILESTONE">
<column name="DATE_START" valueDate="2019-05-23T11:30:10"/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_MILESTONEID" value="14da1165-ed6c-4f2a-8766-11d3533804cb"/>
<column name="TYPE" value="SalesprojectPhase"/>
- <column name="VALUE" value="4814b51b-40f5-49bc-897b-f0933b9fc12c"/>
+ <column name="VALUE" value="SALPROJPHASEMQC"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT_SOURCE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
similarity index 84%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT_SOURCE.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
index a6afc0b6a5e8f2fb15eb0a2ce6701654761c8a41..234622c0aa677b4aec5d0a74bb6ef57271e40648 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/SALESPROJECT_SOURCE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/SALESPROJECT_SOURCE.xml
@@ -1,46 +1,45 @@
<?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="a4a96fc2-81cb-41a6-ac45-e935fe7378db">
- <delete tableName="SALESPROJECT_SOURCE"/>
<insert tableName="SALESPROJECT_SOURCE">
<column name="ENTRYDATE" valueDate="2019-05-17T08:22:56"/>
<column name="INFO" value="Kontakt über die Webseite"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_SOURCEID" value="2290111c-005b-4602-8adb-fb13844e065f"/>
- <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+ <column name="SOURCE" value="SALPROJSCOWNWEB"/>
</insert>
<insert tableName="SALESPROJECT_SOURCE">
<column name="ENTRYDATE" valueDate="2019-05-17T08:23:27"/>
<column name="INFO" value="Besuch bei der Messe"/>
<column name="SALESPROJECT_ID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="SALESPROJECT_SOURCEID" value="a3e94450-561f-43a8-bdec-64b093056187"/>
- <column name="SOURCE" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+ <column name="SOURCE" value="SALPROJSCFAIR"/>
</insert>
<insert tableName="SALESPROJECT_SOURCE">
<column name="ENTRYDATE" valueDate="2019-03-12T01:00:00"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_SOURCEID" value="d178bb9e-0b6f-4f61-ac5e-f29b14488185"/>
- <column name="SOURCE" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+ <column name="SOURCE" value="SALPROJSCFAIR"/>
</insert>
<insert tableName="SALESPROJECT_SOURCE">
<column name="ENTRYDATE" valueDate="2019-03-25T01:00:00"/>
<column name="SALESPROJECT_ID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="SALESPROJECT_SOURCEID" value="f42c0831-5f10-4b32-af21-62b334fd21d7"/>
- <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+ <column name="SOURCE" value="SALPROJSCOWNWEB"/>
</insert>
<insert tableName="SALESPROJECT_SOURCE">
<column name="ENTRYDATE" valueDate="2019-05-23T10:19:16"/>
<column name="INFO" value="Die relevanten AP's waren am Stand. Hatten ein sehr produktives Gespräch."/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_SOURCEID" value="675253dd-0337-44c0-b230-71f030ee0246"/>
- <column name="SOURCE" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+ <column name="SOURCE" value="SALPROJSCFAIR"/>
</insert>
<insert tableName="SALESPROJECT_SOURCE">
<column name="ENTRYDATE" valueDate="2019-05-23T10:33:18"/>
<column name="INFO" value="Erster Kontakt mit uns."/>
<column name="SALESPROJECT_ID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="SALESPROJECT_SOURCEID" value="515ac173-4eab-4783-9c3f-e637c462f6b3"/>
- <column name="SOURCE" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+ <column name="SOURCE" value="SALPROJSCOWNWEB"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/TASK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
similarity index 66%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/TASK.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
index 8d62a085a76e4c320d163c2140217a49e1cc3f5c..aeb8b84043ae3f7d5b4b2be615cb69da6dcc6a61 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/TASK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TASK.xml
@@ -1,186 +1,185 @@
<?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="08f2d3ea-72db-4aad-b18e-d3f36eb83ee0">
- <delete tableName="TASK"/>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Zu offenen Opportunities den Forecast anpassen"/>
<column name="MATURITY_DATE" valueDate="2019-05-24T09:34:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="START_DATE" valueDate="2019-05-17T09:34:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Forecast anpassen"/>
<column name="TASKID" value="7d404da2-78bf-427b-8abb-4c7e953220ca"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kunde wollte ein Angebot, hierzu die offenen Posten klären"/>
<column name="MATURITY_DATE" valueDate="2019-05-15T09:36:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="START_DATE" valueDate="2019-05-08T09:36:00"/>
- <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+ <column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="Nachfassen bei Kunden"/>
<column name="TASKID" value="783f38b6-db71-42b5-9117-848553905c93"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="4cc98357-25f3-462b-898c-440f9faf4b97"/>
<column name="MATURITY_DATE" valueDate="2019-05-24T09:38:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="START_DATE" valueDate="2019-05-17T09:38:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Besuch vorbereiten"/>
<column name="TASKID" value="d6217dc5-5585-4919-a545-9cdc64a1ca58"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kampagnenplanung für dieses Jahr beenden."/>
<column name="MATURITY_DATE" valueDate="2019-05-22T10:25:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="START_DATE" valueDate="2019-05-17T10:25:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Kampagne zu Akquise planen"/>
<column name="TASKID" value="380c1ae1-c7d4-49b7-87e1-4fe2e16c4c52"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="MATURITY_DATE" valueDate="2019-05-29T01:44:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG50"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="START_DATE" valueDate="2019-05-22T01:44:00"/>
- <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+ <column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="Skyscraper VP für nächste Schritte"/>
<column name="TASKID" value="f8fcdce1-da60-46d6-9ce3-3866e093730d"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="MATURITY_DATE" valueDate="2019-05-24T01:46:00"/>
- <column name="PRIORITY" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
- <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="PRIORITY" value="SALPROJPHASESAL"/>
+ <column name="PROGRESS" value="TASKPROG50"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
<column name="START_DATE" valueDate="2019-05-22T01:46:00"/>
- <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+ <column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="Vorbereitung Präsentation"/>
<column name="TASKID" value="2e50d2cd-9429-433c-8f6e-2e31a9e7908e"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Kunde ist sehr interessiert an unserem Produkten, weitere Produktabstimmung intern."/>
<column name="EDITOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="MATURITY_DATE" valueDate="2019-05-29T01:48:00"/>
- <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
- <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="PRIORITY" value="SALPROJPHASEMQL"/>
+ <column name="PROGRESS" value="TASKPROG50"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="START_DATE" valueDate="2019-02-11T01:48:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Lead nachfassen"/>
<column name="TASKID" value="67afcc4b-f71b-4da6-a8b3-e7947c411a2a"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-06-21T06:03:00"/>
- <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
- <column name="PROGRESS" value="5098fde4-660f-4381-9ff5-6d29a858e68e"/>
+ <column name="PRIORITY" value="SALPROJPHASEMQL"/>
+ <column name="PROGRESS" value="TASKPROG25"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="START_DATE" valueDate="2019-03-11T06:03:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Produkt Präsentation vorbereiten und mit Lisa Sommer abstimmen"/>
<column name="TASKID" value="cf99cace-a6e1-46a6-ad83-c634e373f320"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Strategieevent 2-Tage"/>
<column name="MATURITY_DATE" valueDate="2019-11-13T06:04:00"/>
- <column name="PRIORITY" value="1e42f183-fb97-415f-9917-b43ca159fde4"/>
- <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="PRIORITY" value="SALPROJPHASESAL"/>
+ <column name="PROGRESS" value="TASKPROG75"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="START_DATE" valueDate="2019-05-22T06:04:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Event im Hause"/>
<column name="TASKID" value="d8f35764-2c56-45be-93c7-f1e0695e2417"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Winterreifen draufmachen lassen"/>
<column name="MATURITY_DATE" valueDate="2019-10-01T06:05:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="a2e084e2-d68a-4f1e-a1bb-f8d46ad6293d"/>
<column name="START_DATE" valueDate="2019-05-22T06:05:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Autoreifen wechseln"/>
<column name="TASKID" value="0d126a7e-4308-4857-9245-5a40f3e2b36e"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Preisabstimmung."/>
<column name="MATURITY_DATE" valueDate="2019-04-05T09:08:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG75"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="START_DATE" valueDate="2019-04-01T09:08:00"/>
- <column name="STATUS" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
+ <column name="STATUS" value="WAITING"/>
<column name="SUBJECT" value="Mit der Vertriebsleitung abstimmen wie viel Prozent Rabatt gegeben werden kann."/>
<column name="TASKID" value="81a4c8e7-4429-41e1-a534-f1be21e56b5e"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-05-30T09:21:00"/>
- <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
- <column name="PROGRESS" value="be372581-b785-44f4-be6a-c0d7b4d32a72"/>
+ <column name="PRIORITY" value="SALPROJPHASEMQL"/>
+ <column name="PROGRESS" value="TASKPROG75"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="d5a2dc64-e503-4aed-a0c6-d54f49b8db87"/>
<column name="START_DATE" valueDate="2019-05-23T09:21:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Präsentation vor Ort vorbereiten"/>
<column name="TASKID" value="96ec8b48-9fac-4216-bc98-a8323f0592f9"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="MATURITY_DATE" valueDate="2019-05-30T11:50:00"/>
- <column name="PRIORITY" value="09072b59-d12f-469b-acbd-18a28232ff70"/>
- <column name="PROGRESS" value="ec92271b-eac2-4ec2-be24-ab4abde7e939"/>
+ <column name="PRIORITY" value="TASKPRIONORMAL"/>
+ <column name="PROGRESS" value="TASKPROG0"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="c7ddf982-0e58-4152-b82b-8f5673b0b729"/>
<column name="START_DATE" valueDate="2019-05-23T11:50:00"/>
- <column name="STATUS" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="STATUS" value="NEW"/>
<column name="SUBJECT" value="Test"/>
<column name="TASKID" value="81a4d411-f317-4080-84b6-55ed91d26d34"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
<insert tableName="TASK">
<column name="DESCRIPTION" value="Es sollen die effizienten Wertschöpfungsketten der Prozessdefinitionseinheiten im primären Schritt gebündelt und sekundär analysiert und verifiziert werden."/>
<column name="EDITOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="MATURITY_DATE" valueDate="2019-01-20T05:00:00"/>
- <column name="PRIORITY" value="4467b33c-3a68-4c8b-ba4a-1eb666a6c774"/>
+ <column name="PRIORITY" value="SALPROJPHASEMQL"/>
<column name="PROTECTIONLEVEL" valueNumeric="0"/>
<column name="REQUESTOR_CONTACT_ID" value="ef345d11-a40d-59e0-a24c-afcb6095d2cb"/>
<column name="START_DATE" valueDate="2019-01-20T03:00:00"/>
- <column name="STATUS" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+ <column name="STATUS" value="IN-PROGRESS"/>
<column name="SUBJECT" value="effiziente Wertschöpfungsketten bündeln und anlaysieren"/>
<column name="TASKID" value="e9cb198d-c420-4192-9c29-b23682457d8e"/>
- <column name="TYPE" value="4dee8727-8299-422e-ae41-6cdf9de2dfd7"/>
+ <column name="TYPE" value="TASK"/>
</insert>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/TASKLINK.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/TASKLINK.xml
similarity index 98%
rename from .liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/TASKLINK.xml
rename to .liquibase/Data_alias/basic/_demoData/generatedData/TASKLINK.xml
index d92a45fe48eec05d589344f0fa14e8d0b6c25ad0..4d1b838bff9f5a502d7a931c75f8117480ecf927 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/newExampleData/generatedData/TASKLINK.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/TASKLINK.xml
@@ -1,7 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="a7e29a35-f91f-4de3-a7f1-3fe9f1617a8c">
- <delete tableName="TASKLINK"/>
<insert tableName="TASKLINK">
<column name="OBJECT_ROWID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="OBJECT_TYPE" value="Salesproject"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
index d89ba575404875202826a64b02160560f9c98984..46a37175ca01e03be838df215e357298891db768 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ActivityDirection.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c564719a-18ef-4b9e-b130-dde8b2b518ad"/>
- <column name="KEYID" value="BSICacti-0dir-0inc-b8a3-f43e2c73df65"/>
+ <column name="KEYID" value="i"/>
<column name="TITLE" value="Incoming"/>
<column name="CONTAINER" value="ActivityDirection"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6f4c6e49-36ca-4b91-ba83-c507203e1eac"/>
- <column name="KEYID" value="BSICacti-0dir-outg-8337-909b0f93143a"/>
+ <column name="KEYID" value="o"/>
<column name="TITLE" value="Outgoing"/>
<column name="CONTAINER" value="ActivityDirection"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="bb386131-ee36-4835-b458-6751f137a941"/>
- <column name="KEYID" value="BSICacti-0dir-0int-914e-15bf3ad471f5"/>
+ <column name="KEYID" value="x"/>
<column name="TITLE" value="Internal"/>
<column name="CONTAINER" value="ActivityDirection"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
index dcc9bdaa4c61075d9adf169dc70ad5df125bf780..d011a25db5fa43e88eae91fd4ba5313b2e0b3976 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContactStatus.xml
@@ -4,7 +4,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d453609f-0229-4073-982a-9d6f753515b1"/>
- <column name="KEYID" value="BSIC0rel-stat-iact-b56a-71432dd92e27"/>
+ <column name="KEYID" value="CONTACTSTATINACTIVE"/>
<column name="TITLE" value="Inactive"/>
<column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="0"/>
@@ -14,7 +14,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="5ce88207-6c9b-4f3e-9f97-d6ca219c6cb4"/>
- <column name="KEYID" value="BSIC0rel-stat-actv-ae03-b6b04430e90b"/>
+ <column name="KEYID" value="CONTACTSTATACTIVE"/>
<column name="TITLE" value="Active"/>
<column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="1"/>
@@ -24,7 +24,7 @@
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="59a39f58-9ba1-4c2d-9d2b-43d43c6c8acd"/>
- <column name="KEYID" value="BSIC0rel-stat-0673-840d-d3f6a4d4982b"/>
+ <column name="KEYID" value="CONTACTSTATREVIEW"/>
<column name="TITLE" value="In review"/>
<column name="CONTAINER" value="ContactStatus"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
index f0832d87bce545c5419a4982d06c8ce302387d78..0289d9e49de37415290402ad90d445fdb01b8ad9 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractPayment.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="03a1e5b6-64d3-47fd-8085-08b9b95bab19"/>
- <column name="KEYID" value="25faee74-d340-41f2-97f9-ed34c4f8ff42"/>
+ <column name="KEYID" value="CONTRACTPAYANNUAL"/>
<column name="TITLE" value="Annually"/>
<column name="CONTAINER" value="ContractPayment"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="539a4ed0-d3f1-4e2f-b3ff-339276045269"/>
- <column name="KEYID" value="69d24528-ee0b-4539-a695-cf351bd64212"/>
+ <column name="KEYID" value="CONTRACTPAYSEMIANNUAL"/>
<column name="TITLE" value="Semiannually"/>
<column name="CONTAINER" value="ContractPayment"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6bfb93b6-7940-4713-a053-16e17d875032"/>
- <column name="KEYID" value="ca4d845b-f299-40c8-ace5-174bcfbb2d12"/>
+ <column name="KEYID" value="CONTRACTPAYQUARTER"/>
<column name="TITLE" value="Quarterly"/>
<column name="CONTAINER" value="ContractPayment"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
index 40355683a58a28c6b4677c0b93a483eb3174cb3c..055532f0ccb6fd19fc505440e4767215bac607f3 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractStatus.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c1c736a7-95af-417d-8993-3c6cbf065059"/>
- <column name="KEYID" value="e12d37e9-3429-40b5-973b-c1569843ca46"/>
+ <column name="KEYID" value="CONTRACTSTATVALIDUNLI"/>
<column name="TITLE" value="Valid, unlimited"/>
<column name="CONTAINER" value="ContractStatus"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="41b15842-0d31-4023-b0b9-fa97f25bc444"/>
- <column name="KEYID" value="3579eb0c-d8ca-4b6b-85ee-f1800a9301eb"/>
+ <column name="KEYID" value="CONTRACTSTATVALIDLI"/>
<column name="TITLE" value="Valid, limited"/>
<column name="CONTAINER" value="ContractStatus"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1bebbb3c-f412-4031-b533-f1e38c86eb17"/>
- <column name="KEYID" value="4c63c82d-0276-4c12-9937-13fd361ad786"/>
+ <column name="KEYID" value="CONTRACTSTATSIGN"/>
<column name="TITLE" value="Not signed yet"/>
<column name="CONTAINER" value="ContractStatus"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="03f62e1e-0b9a-4e7e-a895-2d10bf57712f"/>
- <column name="KEYID" value="bd809b1c-f6ef-42c0-8659-4800393f7280"/>
+ <column name="KEYID" value="CONTRACTSTATNONE"/>
<column name="TITLE" value="None, individual count"/>
<column name="CONTAINER" value="ContractStatus"/>
<column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="4959d607-b218-4e45-9c4b-b28f3ae6b0ff"/>
- <column name="KEYID" value="56ad22dd-4bca-4e5a-b1a4-1db2376d7ed9"/>
+ <column name="KEYID" value="CONTRACTSTATRESIGN"/>
<column name="TITLE" value="Resigned"/>
<column name="CONTAINER" value="ContractStatus"/>
<column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
index d6673489e474bf021d22b3e1901f3a627668cb2a..bcce08c9a0bb726e0fe525778459f3254909f76b 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ContractType.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2c440f87-292d-4ec3-8eb2-74821e251365"/>
- <column name="KEYID" value="612f49d7-66c9-4304-ac3f-0ea19bb50948"/>
+ <column name="KEYID" value="CONTRACTTYPEFRAME"/>
<column name="TITLE" value="Framework contract"/>
<column name="CONTAINER" value="ContractType"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8dc775f2-05e1-47b5-b372-54c261f1f9d8"/>
- <column name="KEYID" value="5117d48e-d6cb-4402-9f87-590c68625cb7"/>
+ <column name="KEYID" value="CONTRACTTYPESERVICE"/>
<column name="TITLE" value="Service contract"/>
<column name="CONTAINER" value="ContractType"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9c2a1b76-b9c4-486d-a1d2-d12970f20bd0"/>
- <column name="KEYID" value="ee4c5e6e-b802-4c1c-8aed-a031a2a8126f"/>
+ <column name="KEYID" value="CONTRACTTYPEMAIN"/>
<column name="TITLE" value="Maintenance contract"/>
<column name="CONTAINER" value="ContractType"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
index 5714d7f2722b9bcf4e3d69db73962ff271e0ff3d..de734a7782ebb83362dc501057a412cfd11a68d8 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OfferStatus.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="87bd1a28-d364-47ee-9a01-33714f6998ba"/>
- <column name="KEYID" value="5134153d-2e18-452f-ab35-7a52f1aee7d1"/>
+ <column name="KEYID" value="OFFERSTATCHECK"/>
<column name="TITLE" value="Checked"/>
<column name="CONTAINER" value="OfferStatus"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9912dcc6-edf1-4a68-b605-925a31b7f9a4"/>
- <column name="KEYID" value="e5d6b5a4-7576-440f-8332-bc40147c0335"/>
+ <column name="KEYID" value="OFFERSTATSENT"/>
<column name="TITLE" value="Sent"/>
<column name="CONTAINER" value="OfferStatus"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d3bd6272-d1d9-4a5c-9f5c-772f0ee2551e"/>
- <column name="KEYID" value="b3538091-4714-4ed3-93fe-19a0862dd7a3"/>
+ <column name="KEYID" value="OFFERSTATWON"/>
<column name="TITLE" value="Won"/>
<column name="CONTAINER" value="OfferStatus"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0cba2fe7-97c3-4eb4-9999-1fc4e8e93a7a"/>
- <column name="KEYID" value="a5682630-01ae-4769-8f03-47dc1db44da4"/>
+ <column name="KEYID" value="OFFERSTATLOST"/>
<column name="TITLE" value="Lost"/>
<column name="CONTAINER" value="OfferStatus"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
index 57971e3f4877fcd8c95c6ab255ca546b0baf3b14..ec55179d084a6ea408cd4a501db60165faf696bb 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_OrganisationType.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b25309f8-d923-4b9e-9689-b14c3463c9e0"/>
- <column name="KEYID" value="9cac8c7f-b9d8-45ad-ba0a-7ac17341c970"/>
+ <column name="KEYID" value="ORGCUTOMER"/>
<column name="TITLE" value="Customer"/>
<column name="CONTAINER" value="OrganisationType"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="17ef91a4-5af5-4ae1-86cd-49568a88a2a2"/>
- <column name="KEYID" value="6fccd085-1200-4d98-aacb-e5ea8c9dcb2b"/>
+ <column name="KEYID" value="ORGPROSPECT"/>
<column name="TITLE" value="Prospect"/>
<column name="CONTAINER" value="OrganisationType"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="3ba58828-f27e-4342-b3e5-78d562756322"/>
- <column name="KEYID" value="4dd007ac-d547-49db-b431-681f867f054e"/>
+ <column name="KEYID" value="ORGSUP"/>
<column name="TITLE" value="Supplier"/>
<column name="CONTAINER" value="OrganisationType"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="0e3b1e24-af88-4058-bd7c-23aba5d36e06"/>
- <column name="KEYID" value="cf1d1fd8-4cee-481c-9da0-6d4e82826fe0"/>
+ <column name="KEYID" value="ORGTYPEOTHER"/>
<column name="TITLE" value="${ORGTYPE_OTHER}"/>
<column name="CONTAINER" value="OrganisationType"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
index 87e63f3f38597041b6b8b740aa8ea169d26e49b9..abfd573f74f48f87d78c66004ef9137c0a9abe79 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductGroupcode.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b6079a56-594f-463d-8b85-67db622cf522"/>
- <column name="KEYID" value="f0ef0c0d-c972-4db5-9ec4-99dcc3363192"/>
+ <column name="KEYID" value="PRODUCTGROUP1"/>
<column name="TITLE" value="Commodity group 1"/>
<column name="CONTAINER" value="ProductGroupcode"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7c666a94-ef9a-42e9-83c8-de3a97123bce"/>
- <column name="KEYID" value="2a87ee6c-3c20-40ef-8329-c353cbeb58a6"/>
+ <column name="KEYID" value="PRODUCTGROUP2"/>
<column name="TITLE" value="Commodity group 2"/>
<column name="CONTAINER" value="ProductGroupcode"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="72ffaa0b-9982-4614-93be-31ae76f91d19"/>
- <column name="KEYID" value="dd51e43d-fed3-4402-9616-5d9dbdbbfd71"/>
+ <column name="KEYID" value="PRODUCTGROUP3"/>
<column name="TITLE" value="Commodity group 3"/>
<column name="CONTAINER" value="ProductGroupcode"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="688b91d3-3c5b-4704-9220-e11b4532c05c"/>
- <column name="KEYID" value="dc511fd4-bda8-40b5-8602-4bea554576e6"/>
+ <column name="KEYID" value="PRODUCTDISCOUNT"/>
<column name="TITLE" value="Discount"/>
<column name="CONTAINER" value="ProductGroupcode"/>
<column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="5f5a0927-5827-4948-bfe7-32e83d8cf3aa"/>
- <column name="KEYID" value="d878701c-8b69-4687-b677-f564ae1a2ec1"/>
+ <column name="KEYID" value="PRODUCTSPARE"/>
<column name="TITLE" value="Spare parts"/>
<column name="CONTAINER" value="ProductGroupcode"/>
<column name="SORTING" valueNumeric="4"/>
@@ -48,7 +48,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="611cd178-c0fc-4d2a-a9ba-af747d571755"/>
- <column name="KEYID" value="5b8b8e5f-2df8-4119-aae6-e224fb360d4e"/>
+ <column name="KEYID" value="PRODUCTSERVICE"/>
<column name="TITLE" value="Service"/>
<column name="CONTAINER" value="ProductGroupcode"/>
<column name="SORTING" valueNumeric="5"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
index df02982b63eca4bf9d53f84311a05df810f7fd65..06b84f44d0c5c600fc36e740cb072f1fe61a4594 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ProductPricelist.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d0f5c21d-14ff-414b-9d51-2a2c5f49b50d"/>
- <column name="KEYID" value="02553fc7-4611-4914-8ff5-0b7c4e7531c9"/>
+ <column name="KEYID" value="PRICELISTDEFAULT"/>
<column name="TITLE" value="${PRICELIST_DEFAULT}"/>
<column name="CONTAINER" value="ProductPricelist"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="a581bf7c-1cb7-4821-96f5-6eed9a0de58c"/>
- <column name="KEYID" value="40564efc-ce12-456c-a461-3bb3c9c269be"/>
+ <column name="KEYID" value="PRICELISTKEY"/>
<column name="TITLE" value="Key account"/>
<column name="CONTAINER" value="ProductPricelist"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b47478a1-1fac-4e74-921f-b47c146e034d"/>
- <column name="KEYID" value="58ec6146-087d-4664-8887-b44a9f46a3e1"/>
+ <column name="KEYID" value="PRICELISTSPECIAL"/>
<column name="TITLE" value="Special price list1"/>
<column name="CONTAINER" value="ProductPricelist"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="932057b5-a2e1-4f0b-83be-28692d9e9e44"/>
- <column name="KEYID" value="8dc9e27e-4fc3-43e2-b5cb-3b553df64990"/>
+ <column name="KEYID" value="PRICELISTSERVICE"/>
<column name="TITLE" value="${PRICELIST_SERVICE}"/>
<column name="CONTAINER" value="ProductPricelist"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
index 95225d336c6991ca6ce9443c042d8bb862769f83..d4994e0f0490ff34c2e1227ef5f506a3308ab947 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_QuantityUnit.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="392ee66d-f777-43ab-b8d5-344fd75e5454"/>
- <column name="KEYID" value="548ffe3b-466b-4c8f-97d6-e3ad23e33344"/>
+ <column name="KEYID" value="QUANTITYPIECES"/>
<column name="TITLE" value="Pieces"/>
<column name="CONTAINER" value="QuantityUnit"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="a58987b7-a5f9-4f4a-8c1f-2553ff7bad60"/>
- <column name="KEYID" value="fc4cee8f-b3ad-4b1e-ba87-df4a19a47e54"/>
+ <column name="KEYID" value="QUANTITYKGS"/>
<column name="TITLE" value="Kgs"/>
<column name="CONTAINER" value="QuantityUnit"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="74531aeb-7e01-4595-a5df-0ba3cad09071"/>
- <column name="KEYID" value="f26f799d-9fcc-4b9e-a52f-78c1030bc9f1"/>
+ <column name="KEYID" value="QUANTITYLITER"/>
<column name="TITLE" value="Liter"/>
<column name="CONTAINER" value="QuantityUnit"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="a47f5661-6b71-43a5-a14f-42aff04fe8e4"/>
- <column name="KEYID" value="ea832694-f07d-42e7-9f1c-7bd4e51f7ba2"/>
+ <column name="KEYID" value="QUANTITYHOUR"/>
<column name="TITLE" value="Hours"/>
<column name="CONTAINER" value="QuantityUnit"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
index 53e8f7814b1fbc1580d0a31d8a2c06fbd72fa995..aa4b1cefa0a2f842b39aa9b0792e80bd09d1c69a 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesorderState.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8d9b0416-fee2-44d0-9334-1864ff78a824"/>
- <column name="KEYID" value="cf358b96-ee86-46aa-ac5d-65bc1b380948"/>
+ <column name="KEYID" value="SALORDERSTATCHECK"/>
<column name="TITLE" value="Checked"/>
<column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6f5c01ad-f9d9-43b9-834b-139974a75115"/>
- <column name="KEYID" value="c932d455-360e-4378-8ada-b87ad1bab349"/>
+ <column name="KEYID" value="SALORDERSTATSENT"/>
<column name="TITLE" value="Sent"/>
<column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8bac5a6d-7810-469b-8fdb-0d3a0bf8e122"/>
- <column name="KEYID" value="fc0e9ec2-194f-426b-a304-de8cce85ab7c"/>
+ <column name="KEYID" value="SALORDERSTATWON"/>
<column name="TITLE" value="Won"/>
<column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f54b3c0b-bd80-4bc5-8a5c-55be2fd57017"/>
- <column name="KEYID" value="5527bf9b-2cf8-49ea-bd1e-91a36f4f78e1"/>
+ <column name="KEYID" value="SALORDERSTATLOST"/>
<column name="TITLE" value="Lost"/>
<column name="CONTAINER" value="SalesorderState"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
index 3ed1316c978dd5917f4823d27f18d21757c8aa8f..a4a5b3823abf2e186feef69fff075d112d232fb5 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectMemberRole.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9c421b0b-8529-4e07-9463-28d59fd027b6"/>
- <column name="KEYID" value="1d100fff-24ba-43fd-931d-cae24e10b41f"/>
+ <column name="KEYID" value="MEMROLEPROJMANAG"/>
<column name="TITLE" value="Project manager"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f78f229f-f809-4bd2-aca8-24e2f82fa220"/>
- <column name="KEYID" value="8fb09614-5dc4-4d68-ac66-bf7bbebcb3ad"/>
+ <column name="KEYID" value="MEMROLEPROJASSIST"/>
<column name="TITLE" value="Project assistant"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="8cb1b843-713a-4193-aa50-9f5ca06820f8"/>
- <column name="KEYID" value="28b9aaa2-325c-498f-8397-e20cffbfc215"/>
+ <column name="KEYID" value="MEMROLEADVISE"/>
<column name="TITLE" value="Adviser"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="039fd6ae-b4ad-431e-86bf-59ed2f4df0a9"/>
- <column name="KEYID" value="a8460c8e-24bd-4410-9704-e4865fdd57bf"/>
+ <column name="KEYID" value="MEMROLEEXSALEMANAG"/>
<column name="TITLE" value="External sales manager"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="4"/>
@@ -39,7 +39,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b72294cd-3a46-4f71-ab93-72824f63f7f4"/>
- <column name="KEYID" value="67baabb5-abd0-43bd-aea1-cf7e606814a6"/>
+ <column name="KEYID" value="MEMROLINSALEMANAG"/>
<column name="TITLE" value="Internal sales manager"/>
<column name="CONTAINER" value="MemberRole"/>
<column name="SORTING" valueNumeric="5"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
index d87bf321316e24712b24b2759910783b10b66796..a7bd7dbea673b0ce991222c7571689df606d9c66 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectPricePolitics.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="c899faa1-6b89-4616-8640-cd2c8011d123"/>
- <column name="KEYID" value="34cbd70d-f163-416b-9ec7-68797ba0dd55"/>
+ <column name="KEYID" value="SALPROJPOLABO"/>
<column name="TITLE" value="Abomodel"/>
<column name="CONTAINER" value="SalesprojectPricePolitics"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="4d97f540-79cc-41d7-8bf3-e45b3dfd3683"/>
- <column name="KEYID" value="85cf976b-7356-4513-b7fe-a009e629248c"/>
+ <column name="KEYID" value="SALPROJPOLHIGH"/>
<column name="TITLE" value="High price strategy"/>
<column name="CONTAINER" value="SalesprojectPricePolitics"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cbaeb1dc-493c-4811-b8bc-6654559c3ca6"/>
- <column name="KEYID" value="572cf973-ddf5-4081-af30-af6e10986a81"/>
+ <column name="KEYID" value="SALPROJPOLLOW"/>
<column name="TITLE" value="Low price strategy"/>
<column name="CONTAINER" value="SalesprojectPricePolitics"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
index a7a8e441bacbe747ab588f5ef7e726ea775fc327..7e65019260da433ee31ce735eb18fd1d113415e0 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectProbability.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="25ab05e0-51a9-4f6b-ae62-83d0583aef3b">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ab44bd2c-dffa-4731-8a24-fad31f069c46"/>
- <column name="KEYID" value="c5bfa55e-4e9b-4d57-88e1-e06dedb71764"/>
+ <column name="KEYID" value="SALPROJPROB0"/>
<column name="TITLE" value="0 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="e59169d3-c0d9-4718-b8b6-e315857948a0"/>
- <column name="KEYID" value="b981a107-7e20-42a6-baf4-3fc09a939cd7"/>
+ <column name="KEYID" value="SALPROJPROB25"/>
<column name="TITLE" value="25 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="415f1cf0-8c5b-4b6e-9900-0d0d6d72381c"/>
- <column name="KEYID" value="8ff82a56-af38-4f19-9dd7-21d8276bc8e4"/>
+ <column name="KEYID" value="SALPROJPROB50"/>
<column name="TITLE" value="50 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6182cc48-df2b-4ba9-893a-bcedfd0e1e4b"/>
- <column name="KEYID" value="67576cf1-29b3-4832-b8fe-9c7913e34ff4"/>
+ <column name="KEYID" value="SALPROJPROB75"/>
<column name="TITLE" value="75 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f5b601a5-451b-4ab6-9167-b95077e90c62"/>
- <column name="KEYID" value="ea30b4c3-1767-458a-98a4-2553c25fc5f9"/>
+ <column name="KEYID" value="SALPROJPROB100"/>
<column name="TITLE" value="100 %"/>
<column name="CONTAINER" value="SalesprojectProbability"/>
<column name="SORTING" valueNumeric="4"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
index 7f6b027ab266e2d838215a95688b6e38e74c15e1..31af17f5b3aa430859cec7790a22c50b211e4b1c 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectSource.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f83c96e3-47be-4ca1-bc47-4a3a2fce7fca"/>
- <column name="KEYID" value="67849bdb-f424-4c91-ad7d-48aa0aa9ee40"/>
+ <column name="KEYID" value="SALPROJSCOWNWEB"/>
<column name="TITLE" value="Own website"/>
<column name="CONTAINER" value="SalesprojectSource"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1a197ade-0c61-4643-8287-159719d519b4"/>
- <column name="KEYID" value="70f8bfe6-3b0c-4ac9-96ed-dd20684f391d"/>
+ <column name="KEYID" value="SALPROJSCRECOM"/>
<column name="TITLE" value="Customer recommendation"/>
<column name="CONTAINER" value="SalesprojectSource"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="f552b84a-b8e7-472a-9ce5-d64e7f14e74b"/>
- <column name="KEYID" value="fb73eece-bde3-4817-9c9c-bca6a398586a"/>
+ <column name="KEYID" value="SALPROJSCPURCHASE"/>
<column name="TITLE" value="Address purchase"/>
<column name="CONTAINER" value="SalesprojectSource"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7ea06933-94c9-4a05-ba7d-4266df9e4ab2"/>
- <column name="KEYID" value="21becd8a-b0d4-4e4d-873d-2743e4e4dda4"/>
+ <column name="KEYID" value="SALPROJSCFAIR"/>
<column name="TITLE" value="Fair"/>
<column name="CONTAINER" value="SalesprojectSource"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
index 2affd4fe66bcabc30dd28a204f0f175331887b1c..10692436f588338c207424d48718de4654fa3377 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectStrength.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7963d4ed-f7a7-4a9f-aa86-fea42167145f"/>
- <column name="KEYID" value="a30e5d5c-88e2-4674-98d3-8a88622a62a8"/>
+ <column name="KEYID" value="SALPROJSTPRICEPOL"/>
<column name="TITLE" value="Strength 1"/>
<column name="CONTAINER" value="SalesprojectStrength"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2cacfe09-7dcd-454a-b263-46aee796bc21"/>
- <column name="KEYID" value="b5def5d7-a843-4e5e-b56e-e18e26fd0bc1"/>
+ <column name="KEYID" value="SALPROJSTPERSAPP"/>
<column name="TITLE" value="Strength 2"/>
<column name="CONTAINER" value="SalesprojectStrength"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="919cffee-5943-4105-a5bc-a14bd33b9f67"/>
- <column name="KEYID" value="2eda4875-53e6-4359-b367-464d006cf9b3"/>
+ <column name="KEYID" value="SALPROJSTPROD"/>
<column name="TITLE" value="Strength 3"/>
<column name="CONTAINER" value="SalesprojectStrength"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
index 9ff5daf237f602b4bf8ec03c453eb304766850ce..3fb2031cb3a14c59cb2b5b9047612376a960a17e 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWeakness.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="fd012937-8fe7-418e-8e55-80b3b5db331c"/>
- <column name="KEYID" value="c85b5e9a-d27f-4ef4-b13c-3ab0a1fcc5dd"/>
+ <column name="KEYID" value="SALPROJWEAKKNOWHOW"/>
<column name="TITLE" value="Weakness 1"/>
<column name="CONTAINER" value="SalesprojectWeakness"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b62e1a05-af41-4d2d-978c-6c2950b202d8"/>
- <column name="KEYID" value="9e59dec2-3c72-4532-a9a9-8c979b610a49"/>
+ <column name="KEYID" value="SALPROJWEAKMARKET"/>
<column name="TITLE" value="Weakness 2"/>
<column name="CONTAINER" value="SalesprojectWeakness"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="294db00d-6237-4db8-b7b6-41c5dc79a1e4"/>
- <column name="KEYID" value="90a50e8e-afc0-4e96-9fcd-02f3032307d9"/>
+ <column name="KEYID" value="SALPROJWEAKLIQUIDITY"/>
<column name="TITLE" value="Weakness 3"/>
<column name="CONTAINER" value="SalesprojectWeakness"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
index fbfd60a74586914e3497d2959cb79b10b1224aa7..f52a3aa8ef8af7abcf433465f839debff64e7009 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_SalesprojectWonLost.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="84574d45-8227-42dd-aea0-de2203517a2c"/>
- <column name="KEYID" value="a9d71e3f-284a-4240-8cb4-77451105025a"/>
+ <column name="KEYID" value="SALPROJWLPROJVOL"/>
<column name="TITLE" value="Project_volume"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="018a3bb8-5536-461f-8400-25e91550e51f"/>
- <column name="KEYID" value="437ff0eb-4472-44e1-b019-e50404c4a253"/>
+ <column name="KEYID" value="SALPROJWLPROJDUR"/>
<column name="TITLE" value="Project_duration"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b4562d6b-9ff1-4884-8694-3339e760ddf1"/>
- <column name="KEYID" value="8955b130-63a3-43da-a34b-4a97e205434a"/>
+ <column name="KEYID" value="SALPROJWLPROJREF"/>
<column name="TITLE" value="Project_reference"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="cda9c073-25e4-4a90-b5b7-fe6514355d31"/>
- <column name="KEYID" value="5fee1f8b-19ee-4bbd-845f-da1b9504cdf2"/>
+ <column name="KEYID" value="SALPROJWLPROJTECH"/>
<column name="TITLE" value="Product_technic"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="3"/>
@@ -39,7 +39,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="e84b0059-2140-4911-bb3c-73e6f3875022"/>
- <column name="KEYID" value="874a18d8-5f06-4d07-aa8c-7c250f5df0b8"/>
+ <column name="KEYID" value="SALPROJWLPROJFLEX"/>
<column name="TITLE" value="Product_flexibility"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="4"/>
@@ -48,7 +48,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="b9216c02-7abd-43aa-a02e-89fa7d428e0c"/>
- <column name="KEYID" value="b45bd85c-b945-4740-9971-934edb1ebd26"/>
+ <column name="KEYID" value="SALPROJWLPROJGUI"/>
<column name="TITLE" value="Product_GUI"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="5"/>
@@ -57,7 +57,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6efbc578-4b80-463f-9c4f-16db99a8a9d6"/>
- <column name="KEYID" value="bf5bc111-f2eb-4daa-945d-028cc39aa0b3"/>
+ <column name="KEYID" value="SALPROJWLPROJFUNC"/>
<column name="TITLE" value="Product_functionality"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="6"/>
@@ -66,7 +66,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="ad252ede-1e46-46ad-8ce1-6788b9103c92"/>
- <column name="KEYID" value="c0455c55-ab02-4c54-8f02-73a2604d25f4"/>
+ <column name="KEYID" value="SALPROJWLPROJINDKOWHOW"/>
<column name="TITLE" value="Product_industry knowhow"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="7"/>
@@ -75,7 +75,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9fe99387-ea27-4f13-923c-f631486f7bcb"/>
- <column name="KEYID" value="e7683eaa-befb-44be-9fb9-8b16b805a061"/>
+ <column name="KEYID" value="SALPROJWLPROJMOBIL"/>
<column name="TITLE" value="Product_mobile use"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="8"/>
@@ -84,7 +84,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d1987d3a-fc7f-4882-8292-36e9699f6368"/>
- <column name="KEYID" value="2a7f092a-94c9-46ff-8818-b2835c3ff5a1"/>
+ <column name="KEYID" value="SALPROJWLPROJCOMPANYSIZE"/>
<column name="TITLE" value="Company_size"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="9"/>
@@ -93,7 +93,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d62db634-94ca-49e5-970a-67696d013ed6"/>
- <column name="KEYID" value="d49e1af6-b7c0-49c1-b2cc-5d4842122c10"/>
+ <column name="KEYID" value="SALPROJWLPROJCOMPANYINT"/>
<column name="TITLE" value="Company_internationality"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="10"/>
@@ -102,7 +102,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="148176ea-14ed-4a74-8290-e5dffcd71eaa"/>
- <column name="KEYID" value="2effb3eb-715e-4aea-9f22-1c93c89d785c"/>
+ <column name="KEYID" value="SALPROJWLPROJCOMPANYINDKNOW"/>
<column name="TITLE" value="Company_industry knowhow"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="11"/>
@@ -111,7 +111,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="d5827700-2ef1-43a1-a7f1-46a4de1ec6ec"/>
- <column name="KEYID" value="ffe690be-b345-4f25-b513-398b555600ba"/>
+ <column name="KEYID" value="SALPROJWLPROJOTHERCUSTOM"/>
<column name="TITLE" value="Other_existing Customer"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="12"/>
@@ -120,7 +120,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="1a0ae403-90c0-424c-a13a-8b1c4cfd314d"/>
- <column name="KEYID" value="562669db-cfb8-4e02-b69b-9fa64ab4b8f5"/>
+ <column name="KEYID" value="SALPROJWLPROJUNKNOWN"/>
<column name="TITLE" value="Other_unknown"/>
<column name="CONTAINER" value="SalesprojectWonLost"/>
<column name="SORTING" valueNumeric="13"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
index d66784db8352e5c9fb2ab02cffea0a698619de48..26d2b95a6c2a647fd1b80c4ff42dbf7849be4058 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_StockWarehouse.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="2613a00e-7c2d-4513-bb37-c375e3e26959"/>
- <column name="KEYID" value="7885caba-8d58-4fe5-9774-1872fbad1dbe"/>
+ <column name="KEYID" value="STWAREWAREHOUSE1"/>
<column name="TITLE" value="Warehouse 1"/>
<column name="CONTAINER" value="StockWarehouse"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="9f20dcb7-6068-43d5-8aac-a29dcbba8fb2"/>
- <column name="KEYID" value="6a2443cb-2d5c-42db-862c-a4e1a0bbdd72"/>
+ <column name="KEYID" value="STWAREWAREHOUSE2"/>
<column name="TITLE" value="Warehouse 2"/>
<column name="CONTAINER" value="StockWarehouse"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="4224ea44-ab84-4215-a1c3-6750ab07af03"/>
- <column name="KEYID" value="dd3d51bb-ef7c-49e4-b2d4-b58151b38a83"/>
+ <column name="KEYID" value="STWAREWAREHOUSE3"/>
<column name="TITLE" value="Warehouse 3"/>
<column name="CONTAINER" value="StockWarehouse"/>
<column name="SORTING" valueNumeric="2"/>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
index 1dfeec8913fa1e9d97b5e8a91c544a703da33752..7d84f43d23af5de1aa1ec77bcd0d253e4326e9af 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_TaskStatus.xml
@@ -3,7 +3,7 @@
<changeSet author="j.goderbauer" id="e7f911b2-7f89-41b1-b59e-4b359ccbf728">
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6ab0cc9e-021c-42ef-abfd-f9f7a58aa76c"/>
- <column name="KEYID" value="21bc4d20-1a87-4247-8f7c-8d3a09631850"/>
+ <column name="KEYID" value="NEW"/>
<column name="TITLE" value="new"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="0"/>
@@ -12,7 +12,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="6a479d71-2c05-4496-9c6c-c9aeef929bcf"/>
- <column name="KEYID" value="b1fd456f-f5d2-459e-b467-76e2914c8169"/>
+ <column name="KEYID" value="IN-PROGRESS"/>
<column name="TITLE" value="in process"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="1"/>
@@ -21,7 +21,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="34701d4d-7435-43bc-8b2f-ad2a70065a75"/>
- <column name="KEYID" value="00595a73-22e2-4c3b-a21c-06bdec262d20"/>
+ <column name="KEYID" value="WAITING"/>
<column name="TITLE" value="waiting"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="2"/>
@@ -30,7 +30,7 @@
</insert>
<insert tableName="AB_KEYWORD_ENTRY">
<column name="AB_KEYWORD_ENTRYID" value="7311d8c5-edf2-492e-be4d-6f0469334611"/>
- <column name="KEYID" value="7c9d6681-6cf5-4395-b276-3941b6fd0d57"/>
+ <column name="KEYID" value="ENDED"/>
<column name="TITLE" value="ended"/>
<column name="CONTAINER" value="TaskStatus"/>
<column name="SORTING" valueNumeric="3"/>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index b6e05b99b732346529969c0cff7d3f34d3fe9911..76148abdb97c4f986cae214bd9ebdf04ea5b69e7 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -2,4 +2,6 @@
<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">
<include relativeToChangelogFile="true" file="basic/init/init.xml"/>
<include relativeToChangelogFile="true" file="basic/2019.1.4/changelog.xml"/>
-</databaseChangeLog>
+
+ <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/addMailingAliases.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/addMailingAliases.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b33a7b7db8792223feb8ab090e83dd88f29d8e1e
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/addMailingAliases.xml
@@ -0,0 +1,29 @@
+<?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="667e73e0-cf8e-48c8-a75e-022689462cda">
+ <insert tableName="ASYS_ALIASCONFIG">
+ <column name="ALIASID" value="mailServerIMAP"/>
+ <column name="DATE_EDIT" valueDate="2019-06-25T01:14:32"/>
+ <column name="DATE_NEW" valueDate="2019-06-25T01:14:32"/>
+ <column name="ID" value="530a2f77-c1c3-4d93-b1fe-41ebe7410695"/>
+ <column name="KIND" valueNumeric="105"/>
+ <column name="NAME" value="mailServerIMAP_default"/>
+ <column name="SERVERID" value="default"/>
+ <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+ <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+ <column name="XMLDATA" valueBlobFile="defaultBlob/mailServerIMAP.xml"/>
+ </insert>
+ <insert tableName="ASYS_ALIASCONFIG">
+ <column name="ALIASID" value="defaultDbRepository"/>
+ <column name="DATE_EDIT" valueDate="2019-06-25T01:14:46"/>
+ <column name="DATE_NEW" valueDate="2019-06-25T01:14:35"/>
+ <column name="ID" value="b2ae3180-afd2-493c-a17b-16038e3a3860"/>
+ <column name="KIND" valueNumeric="105"/>
+ <column name="NAME" value="defaultDbRepository_default"/>
+ <column name="SERVERID" value="default"/>
+ <column name="USER_EDIT" value="_____DESIGNERANONYM"/>
+ <column name="USER_NEW" value="_____DESIGNERANONYM"/>
+ <column name="XMLDATA" valueBlobFile="defaultBlob/defaultDbRepository.xml"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/defaultDbRepository.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/defaultDbRepository.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d9ec835231a0d7562fb1129db111ad69d3e66a8f
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/defaultDbRepository.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasConfig 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/aliasConfig/1.1.1">
+ <name>defaultDbRepository_default</name>
+ <serverId>default</serverId>
+ <definitionName>defaultDbRepository</definitionName>
+ <aliasConfigSub>
+ <aliasSubMailrepDb>
+ <alias>_____SYSTEMALIAS</alias>
+ <table>ASYS_MAILREPOSIT</table>
+ </aliasSubMailrepDb>
+ </aliasConfigSub>
+</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/mailServerIMAP.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/mailServerIMAP.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bdab62bfe255b1403ed7330e7c1d86eb30421a65
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/aliasConfig/defaultBlob/mailServerIMAP.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<aliasConfig 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/aliasConfig/1.1.1">
+ <name>mailServerIMAP_default</name>
+ <serverId>default</serverId>
+ <definitionName>mailServerIMAP</definitionName>
+ <aliasConfigSub>
+ <aliasSubMailserverImap />
+ </aliasConfigSub>
+</aliasConfig>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/changelog.xml b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/changelog.xml
index bdcd0928c4a502920fda60fa49811fd1d5e3344e..b83ccbbf0d5007eec6f71e7428e9d28e25f0a2b8 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/2019.1.4/changelog.xml
@@ -6,4 +6,5 @@
<include relativeToChangelogFile="true" file="permission/create_asys_permissionset.xml"/>
<include relativeToChangelogFile="true" file="permission/create_asys_permissionaction.xml"/>
<include relativeToChangelogFile="true" file="aliasConfig/updateForDataCaching.xml"/>
+ <include relativeToChangelogFile="true" file="aliasConfig/addMailingAliases.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/changelog.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..33f1e8060b54747b543bf9ba36b58ff17b409abb
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/changelog.xml
@@ -0,0 +1,17 @@
+<?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">
+ <include relativeToChangelogFile="true" file="generatedData/ASYS_BINARIES.xml"/>
+
+ <include relativeToChangelogFile="true" file="example_asys_users/insert_asys_users-admin.xml"/>
+
+ <include relativeToChangelogFile="true" file="example_asys_users/Birgit_Leicht.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Birgit_Leicht_Image.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Harold_Smith.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Harold_Smith_Image.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Herbert_Obermeier.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Herbert_Obermeier_Image.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Lisa_Sommer.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Lisa_Sommer_Image.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Susanne_Lustig.xml"/>
+ <include relativeToChangelogFile="true" file="example_asys_users/Susanne_Lustig_Image.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Birgit_Leicht.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht_Image.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Birgit_Leicht_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Birgit_Leicht_Image.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Harold_Smith.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith_Image.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Harold_Smith_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Harold_Smith_Image.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Herbert_Obermeier.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier_Image.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Herbert_Obermeier_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Herbert_Obermeier_Image.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Lisa_Sommer.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer_Image.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Lisa_Sommer_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Lisa_Sommer_Image.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_users/Susanne_Lustig.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig_Image.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/Susanne_Lustig_Image.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/Susanne_Lustig_Image.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Birgit_Leicht.png
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht.png
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Birgit_Leicht.png
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Birgit_Leicht_preview.jpeg
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Birgit_Leicht_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Birgit_Leicht_preview.jpeg
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Harold_Smith.png
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith.png
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Harold_Smith.png
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Harold_Smith_preview.jpeg
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Harold_Smith_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Harold_Smith_preview.jpeg
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Herbert_Obermeier.png
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier.png
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Herbert_Obermeier.png
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Herbert_Obermeier_preview.jpeg
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Herbert_Obermeier_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Herbert_Obermeier_preview.jpeg
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Lisa_Sommer.png
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer.png
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Lisa_Sommer.png
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Lisa_Sommer_preview.jpeg
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Lisa_Sommer_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Lisa_Sommer_preview.jpeg
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Susanne_Lustig.png
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig.png
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Susanne_Lustig.png
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Susanne_Lustig_preview.jpeg
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/example_asys_binaries/blob/Susanne_Lustig_preview.jpeg
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/blob/Susanne_Lustig_preview.jpeg
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/insert_asys_users-admin.xml
similarity index 100%
rename from .liquibase/_____SYSTEMALIAS/basic/init/data/insert_asys_users-admin.xml
rename to .liquibase/_____SYSTEMALIAS/basic/_demoData/example_asys_users/insert_asys_users-admin.xml
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES.xml b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6684d9b49d104558d1f885116d800fb9de98c632
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES.xml
@@ -0,0 +1,149 @@
+<?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="bda8742c-d15c-4403-a330-e71a9989744e">
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/a80a1a73-df16-4bb0-8d73-5e734b3c6883"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="2820"/>
+ <column name="DATE_EDIT" valueDate="2019-03-21T09:23:21"/>
+ <column name="DATE_NEW" valueDate="2019-03-21T09:23:21"/>
+ <column name="FILENAME" value="20181002_Dokumentenmanagement.txt"/>
+ <column name="ID" value="d16ec3bc-07a1-4343-b0ee-439f5b418831"/>
+ <column name="MIMETYPE" value="text/plain"/>
+ <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/6a1e497a-9114-4e48-b0e4-110cefa6139b"/>
+ <column name="ROW_ID" value="1a67eaa7-21da-4a18-97ab-755ac5cb74f7"/>
+ <column name="TABLENAME" value="CONTACT"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/31855f76-01eb-435e-8bc7-869a9f53c139"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="46592"/>
+ <column name="DATE_EDIT" valueDate="2019-05-17T12:52:06"/>
+ <column name="DATE_NEW" valueDate="2019-05-17T12:52:06"/>
+ <column name="FILENAME" value="WG ADITO Agenda Workshop.msg"/>
+ <column name="ID" value="46d08998-5025-4e4d-8dc5-971215218605"/>
+ <column name="MIMETYPE" value="application/vnd.ms-outlook"/>
+ <column name="ROW_ID" value="a01f1cc6-e588-451d-b22a-6dfe314fda51"/>
+ <column name="TABLENAME" value="ACTIVITY"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/86ddbfd7-637f-478a-8184-033185da1331"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="1054110"/>
+ <column name="DATE_EDIT" valueDate="2019-05-23T11:26:01"/>
+ <column name="DATE_NEW" valueDate="2019-05-23T11:26:01"/>
+ <column name="FILENAME" value="AID017-DE - ADITO Technikbroschüre.pdf"/>
+ <column name="ID" value="48f0f57c-c60a-4714-83bb-3a31c999f766"/>
+ <column name="MIMETYPE" value="application/pdf"/>
+ <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/e5f89c96-1ce0-4b54-8e0b-2a257a99093c"/>
+ <column name="ROW_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
+ <column name="TABLENAME" value="CONTACT"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/75c54821-3c93-40e9-b73d-1a39b6782e61"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="6203"/>
+ <column name="DATE_EDIT" valueDate="2019-05-23T01:16:23"/>
+ <column name="DATE_NEW" valueDate="2019-05-23T01:16:23"/>
+ <column name="FILENAME" value="Kunden begeistern mit passgenauem Online-Marketing Teil 1 - Teilnehmerbericht.xlsx"/>
+ <column name="ID" value="c4f11f5c-0fbe-4a7c-894c-968f9d605bc0"/>
+ <column name="KEYWORD" value="MAINDOCUMENT"/>
+ <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"/>
+ <column name="ROW_ID" value="e3be48af-e679-4b3a-972f-ad17239e3bb4"/>
+ <column name="TABLENAME" value="ACTIVITY"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/f1cd8300-4aa9-48a2-93e6-898046f1ac75"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="254"/>
+ <column name="DATE_EDIT" valueDate="2019-05-24T10:58:17"/>
+ <column name="DATE_NEW" valueDate="2019-05-24T10:58:17"/>
+ <column name="FILENAME" value="Erstkontakt .html"/>
+ <column name="ID" value="30448337-aa66-4bfc-83a5-bfad9b0ed198"/>
+ <column name="MIMETYPE" value="text/plain"/>
+ <column name="PREVIEW" valueBlobFile="ASYS_BINARIES/PREVIEW/blobFiles/91867bc1-8df9-4f6e-81d3-259511841015"/>
+ <column name="ROW_ID" value="f032c593-f108-47dd-9fc2-357c14757a9d"/>
+ <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/38778ead-4ad6-429c-a876-998e03fdd6a1"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="158024"/>
+ <column name="DATE_EDIT" valueDate="2019-06-07T06:48:05"/>
+ <column name="DATE_NEW" valueDate="2019-05-29T06:27:12"/>
+ <column name="FILENAME" value="Rahmenvertrag.docx"/>
+ <column name="ID" value="08565dc0-2c8a-434d-a1c0-12e17aaf098b"/>
+ <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+ <column name="ROW_ID" value="1269c31d-4173-434f-b2db-9154fa651a25"/>
+ <column name="TABLENAME" value="DOCUMENTTEMPLATE"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/086771b1-75d0-4bfb-81e1-56ff0cc92413"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="158024"/>
+ <column name="DATE_EDIT" valueDate="2019-06-11T04:31:55"/>
+ <column name="DATE_NEW" valueDate="2019-06-11T04:31:55"/>
+ <column name="FILENAME" value="Rahmenvertrag.docx"/>
+ <column name="ID" value="a59687b0-7119-4a51-80ab-36892e25f4bb"/>
+ <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+ <column name="ROW_ID" value="81b4d02f-be0b-4437-b51d-d5c833adede4"/>
+ <column name="TABLENAME" value="ACTIVITY"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/230573fe-d93a-4b7b-9fff-922b66a3d595"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="162284"/>
+ <column name="DATE_EDIT" valueDate="2019-05-29T06:31:39"/>
+ <column name="DATE_NEW" valueDate="2019-05-29T06:31:39"/>
+ <column name="FILENAME" value="Rahmenvertrag.docx"/>
+ <column name="ID" value="3bf01e81-3d28-469b-b6d0-9e78e4e7dff0"/>
+ <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+ <column name="ROW_ID" value="af3dcbe7-c76f-47a2-8441-891fec6877b5"/>
+ <column name="TABLENAME" value="CONTRACT"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/4ccf87bc-6ff0-4eaf-b52a-a8ca24e9a3b9"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="162284"/>
+ <column name="DATE_EDIT" valueDate="2019-05-29T06:42:47"/>
+ <column name="DATE_NEW" valueDate="2019-05-29T06:42:47"/>
+ <column name="FILENAME" value="Rahmenvertrag.docx"/>
+ <column name="ID" value="f7d30418-7727-459c-8b6e-0ef41e16f3fd"/>
+ <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+ <column name="ROW_ID" value="b378876d-dba5-4e41-865f-9ac056bffa60"/>
+ <column name="TABLENAME" value="ACTIVITY"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="ASYS_BINARIES">
+ <column name="BINDATA" valueBlobFile="ASYS_BINARIES/BINDATA/blobFiles/2d624bdc-4d7e-4110-9f1c-34b6439c6610"/>
+ <column name="CONTAINERNAME" value="DOCUMENT"/>
+ <column name="DATASIZE" valueNumeric="158024"/>
+ <column name="DATE_EDIT" valueDate="2019-06-11T04:36:47"/>
+ <column name="DATE_NEW" valueDate="2019-06-11T04:36:47"/>
+ <column name="FILENAME" value="Rahmenvertrag.docx"/>
+ <column name="ID" value="b06ece8b-1b35-454a-9d67-74adc0e912dd"/>
+ <column name="MIMETYPE" value="application/vnd.openxmlformats-officedocument.wordprocessingml.document"/>
+ <column name="ROW_ID" value="b2c211a7-6dcf-450b-b420-9f04d790de7a"/>
+ <column name="TABLENAME" value="CONTRACT"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/086771b1-75d0-4bfb-81e1-56ff0cc92413 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/086771b1-75d0-4bfb-81e1-56ff0cc92413
new file mode 100644
index 0000000000000000000000000000000000000000..c8cf80dec1a0829ac6bf0658ccbacac0b5604412
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/086771b1-75d0-4bfb-81e1-56ff0cc92413 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/230573fe-d93a-4b7b-9fff-922b66a3d595 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/230573fe-d93a-4b7b-9fff-922b66a3d595
new file mode 100644
index 0000000000000000000000000000000000000000..4069a6bf705a8aea01729407fad2523a2efa4106
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/230573fe-d93a-4b7b-9fff-922b66a3d595 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/2d624bdc-4d7e-4110-9f1c-34b6439c6610 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/2d624bdc-4d7e-4110-9f1c-34b6439c6610
new file mode 100644
index 0000000000000000000000000000000000000000..c8cf80dec1a0829ac6bf0658ccbacac0b5604412
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/2d624bdc-4d7e-4110-9f1c-34b6439c6610 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/31855f76-01eb-435e-8bc7-869a9f53c139 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/31855f76-01eb-435e-8bc7-869a9f53c139
new file mode 100644
index 0000000000000000000000000000000000000000..60428a71e5e5b11aaa8b5c0e6446dd3db282a0a8
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/31855f76-01eb-435e-8bc7-869a9f53c139 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/38778ead-4ad6-429c-a876-998e03fdd6a1 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/38778ead-4ad6-429c-a876-998e03fdd6a1
new file mode 100644
index 0000000000000000000000000000000000000000..c8cf80dec1a0829ac6bf0658ccbacac0b5604412
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/38778ead-4ad6-429c-a876-998e03fdd6a1 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/4ccf87bc-6ff0-4eaf-b52a-a8ca24e9a3b9 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/4ccf87bc-6ff0-4eaf-b52a-a8ca24e9a3b9
new file mode 100644
index 0000000000000000000000000000000000000000..4069a6bf705a8aea01729407fad2523a2efa4106
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/4ccf87bc-6ff0-4eaf-b52a-a8ca24e9a3b9 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/75c54821-3c93-40e9-b73d-1a39b6782e61 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/75c54821-3c93-40e9-b73d-1a39b6782e61
new file mode 100644
index 0000000000000000000000000000000000000000..22a82deaec2672c6d5231b84124f733c0774a3f5
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/75c54821-3c93-40e9-b73d-1a39b6782e61 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/86ddbfd7-637f-478a-8184-033185da1331 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/86ddbfd7-637f-478a-8184-033185da1331
new file mode 100644
index 0000000000000000000000000000000000000000..dc4648559d93023988510956b99d13362da2e5ca
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/86ddbfd7-637f-478a-8184-033185da1331 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/a80a1a73-df16-4bb0-8d73-5e734b3c6883 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/a80a1a73-df16-4bb0-8d73-5e734b3c6883
new file mode 100644
index 0000000000000000000000000000000000000000..fd689afa1a4f60128f4c10e3dc7e064a65bdb2e3
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/a80a1a73-df16-4bb0-8d73-5e734b3c6883
@@ -0,0 +1,59 @@
+Dokumentenmanagement in ADITO basic (neon)
+
+Dokumentenablage:
+
+Entwicklung muss sich Gedanken machen, wo alle Dokumente abgelegt werden
+(Heinz)--> im Endeffekt egal, Dokumente können irgendwo abgelegt werden, für User ist es egal wenn er auf Dokument zugreifen kann, wo dieses abgelegt ist
+
+Vorschläge:
+Auslagern auf Festplatte nicht in Tabellen
+Ablage im Alias
+
+----------------------------------------------------------------------------------------------------------------------------------------------------------
+
+Änderungen in der neuen ADITO Version:
+
+- technisch ändert sich die Dokumentenmappe nicht
+- Reiter Dokumente für jeden Datensatz
+- Reiter Dokumente muss vom Design her angepasst werden
+
+?Dokumente ist ein Entity (2 Möglichkeiten):
+?- direkt ins Entity
+?- oder über dedizierte Prozesse (momentane Lösung)
+
+Anforderung an das Dokumentenmanagement:
+
+- Stukturierung --> geplant
+- Versionierung --> Versionen müssen einsehbar sein, damit man auch auf ältere Versionen zugreifen kann
+(Bei jeder Änderung wird ein neues Dokument erstellt und wird zu den anderen Versionen gelistet mit Datum (reicht GIT nicht zur Versionskontrolle? --> nein wegen Metadaten))
+
+--------------------------------------------------------------------------------------------------------------------------------------------------------
+
+Dokumenten-Kategorie:
+
+kann man diese zusammenfassen? --> verschiedene Ebenen (Ebene 0: Dokumente, html; Ebene 1: Email, Brief, Tabelle; Ebene2: Support-Email ....)
+--> Standards müssen erhalten bleiben
+Aus den Kategorien Entities machen --> bessere Bearbeitung
+
+Doku-Vorlage --> Download/Upload via Hilfsdienst merged Vorlage mit Änderungen
+Workflow: Download --> Bearbeitung --> Merge --> Upload
+Merge(server-seitig): ??
+
+Word-AddIn --> muss von jedem installiert
+
+Nur noch Brief, statt Serien- und Einzelbrief ?
+
+---------------------------------------------------------------------------------------------------------------------------------------------------------
+Export
+
+(Excel) --> Fachadmin legt die Schlüsselwörter fest, indem er Haken setzt (Schlüsselwörter für Export können nicht durch Fachadmin erweitert/gelöscht werden)
+Nur Entwicklung programmieren Schlüsselwörter und legen diese auch für Export fest, Fachadmin kann nur auswählen welche exportiert werden oder nicht
+
+Performance:Speed
+Konzept: verschiedene Quellen --> ?mischen in Library (Generel über JDITO von verschiedenen Quellen mischen)
+
+Exportfelder aus Client rausnehmen
+Exportvorlagen werden zuerst implementiert dann kann man diese auch für Word-Dokumente(z.b. Serienbriefe) verwenden
+Im Designer Möglichkeiten definieren und Benutzer im Client zur Verfügung stellen. (Import/Export)
+
+Berechtigung festlegen/definieren!
\ No newline at end of file
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/f1cd8300-4aa9-48a2-93e6-898046f1ac75 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/f1cd8300-4aa9-48a2-93e6-898046f1ac75
new file mode 100644
index 0000000000000000000000000000000000000000..4b8222310b62bea00576510bad772f252151e4e9
--- /dev/null
+++ b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/BINDATA/blobFiles/f1cd8300-4aa9-48a2-93e6-898046f1ac75
@@ -0,0 +1,5 @@
+<p>Sehr geehrte Damen und Herren, </p>
+
+<p>herzlichen Dank für Ihre Anfrage und Ihr Interesse an unseren Produkten. Gerne sende ich Ihnen schon einmal die wichtigsten Informationen zu. </p>
+
+<p>Mit freundlichen Grüßen </p>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/6a1e497a-9114-4e48-b0e4-110cefa6139b b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/6a1e497a-9114-4e48-b0e4-110cefa6139b
new file mode 100644
index 0000000000000000000000000000000000000000..2d527afcf2240286ee4749da624e15ad2cfe5193
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/6a1e497a-9114-4e48-b0e4-110cefa6139b differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/91867bc1-8df9-4f6e-81d3-259511841015 b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/91867bc1-8df9-4f6e-81d3-259511841015
new file mode 100644
index 0000000000000000000000000000000000000000..48427ca47840209c0ece382135da2c29a80d03ac
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/91867bc1-8df9-4f6e-81d3-259511841015 differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/e5f89c96-1ce0-4b54-8e0b-2a257a99093c b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/e5f89c96-1ce0-4b54-8e0b-2a257a99093c
new file mode 100644
index 0000000000000000000000000000000000000000..a3a26ab89ce33b052468b9c5396aa466f2a911da
Binary files /dev/null and b/.liquibase/_____SYSTEMALIAS/basic/_demoData/generatedData/ASYS_BINARIES/PREVIEW/blobFiles/e5f89c96-1ce0-4b54-8e0b-2a257a99093c differ
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
index d29b9203a5b0089545e87bd7641479f7fa4003e9..d5216569d1cc3f64a862b1636bd509a3710db2b1 100644
--- a/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
+++ b/.liquibase/_____SYSTEMALIAS/basic/init/init.xml
@@ -14,5 +14,4 @@
<include relativeToChangelogFile="true" file="data/insert_asys_aliasconfig.xml"/>
<include relativeToChangelogFile="true" file="data/insert_asys_system.xml"/>
- <include relativeToChangelogFile="true" file="data/insert_asys_users-admin.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml b/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
deleted file mode 100644
index 9471a52c15d6bcf528b3d86b509fba763553a793..0000000000000000000000000000000000000000
--- a/.liquibase/_____SYSTEMALIAS/basic/init/system_aliasTestdata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <include relativeToChangelogFile="true" file="data/example_asys_users/Birgit_Leicht.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_binaries/Birgit_Leicht_Image.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_users/Harold_Smith.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_binaries/Harold_Smith_Image.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_users/Herbert_Obermeier.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_binaries/Herbert_Obermeier_Image.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_users/Lisa_Sommer.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_binaries/Lisa_Sommer_Image.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_users/Susanne_Lustig.xml"/>
- <include relativeToChangelogFile="true" file="data/example_asys_binaries/Susanne_Lustig_Image.xml"/>
-</databaseChangeLog>
diff --git a/.liquibase/_____SYSTEMALIAS/changelog.xml b/.liquibase/_____SYSTEMALIAS/changelog.xml
index 9b39777f66188dcbbf8a1e95c93675a8a6f90775..f2886409da8d3d821dc7a3503d9d1b5324ceb206 100644
--- a/.liquibase/_____SYSTEMALIAS/changelog.xml
+++ b/.liquibase/_____SYSTEMALIAS/changelog.xml
@@ -1,6 +1,7 @@
<?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">
<include relativeToChangelogFile="true" file="basic/init/init.xml"/>
- <include relativeToChangelogFile="true" file="basic/init/system_aliasTestdata.xml"/>
<include relativeToChangelogFile="true" file="basic/2019.1.4/changelog.xml"/>
+
+ <include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
</databaseChangeLog>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index d7ecb2b576050dde5b56bac4278bd809334c5ec2..7ec1f603f9df7a2f2d78fad608c40854f97a9bc8 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1779,48 +1779,6 @@
</customStringProperty>
</customProperties>
</entityFieldDb>
- <entityFieldDb>
- <name>INFO</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>Description</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
- <entityFieldDb>
- <name>LANGUAGE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="1" />
- <size v="3" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title>Language</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
@@ -5095,27 +5053,6 @@
<title>Task Id</title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>CODE</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="true" />
- <documentation></documentation>
- <title>task number</title>
- <description></description>
- <customProperties>
- <customBooleanProperty>
- <name>log</name>
- <global v="false" />
- <property v="true" />
- </customBooleanProperty>
- </customProperties>
- </entityFieldDb>
<entityFieldDb>
<name>STATUS</name>
<dbName></dbName>
@@ -9866,6 +9803,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <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>
</entityFields>
</entityDb>
<entityDb>
@@ -9942,6 +9893,346 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>SENTDATE</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>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>TICKET</name>
+ <dbName></dbName>
+ <idColumn>TICKETID</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>CODE</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>TICKETID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TASK_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <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>TICKETTYPE</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>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>DESCRIPTIONTRANSLATION</name>
+ <dbName></dbName>
+ <idColumn>DESCRIPTIONTRANSLATIONID</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>OBJECT_ROWID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTIONTRANSLATIONID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTION</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>OBJECT_TYPE</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>
+ <entityFieldDb>
+ <name>LANG</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>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>AB_UNLINKEDMAIL</name>
+ <dbName></dbName>
+ <idColumn>AB_UNLINKEDMAILID</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>MAIL</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>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>SENDER</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="1000" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SUBJECT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="200" />
+ <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="29" />
+ <scale v="9" />
+ <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="50" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>AB_UNLINKEDMAILID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>RECIPIENTS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="4000" />
+ <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>SENTDATE</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>
</entityFields>
</entityDb>
</entities>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
index b3953edcbdba55a383ccbf7336ed9493f7c79617..2ffeb89a270aad2faa93e843109cfcd93defb5e9 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/salesorder/query.js
@@ -1,27 +1,27 @@
-import("system.SQLTYPES");
-import("system.result");
-import("system.vars");
-import("system.calendars");
-import("system.db");
-import("Sql_lib");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sqlQuery, sqlHelper, queryCondition, affectedIds;
-queryCondition = "";
-if (vars.exists("$local.idvalue")) {
- affectedIds = vars.get("$local.idvalue");
- queryCondition = "where OFFERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
- //TODO: refactor this for incremental indexer (injections?)
-}
-sqlHelper = new SqlMaskingUtils();
-sqlQuery = "select SALESORDERID, "
- + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ")
- + " as TITLECOLUMN, "
- + sqlHelper.concat(["ORGANISATION.NAME"], " | ")
- + " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE "
- + " from SALESORDER "
- + " join CONTACT on SALESORDER.CONTACT_ID = CONTACTID "
- + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
- + queryCondition + " order by SALESORDERCODE ";
+import("system.SQLTYPES");
+import("system.result");
+import("system.vars");
+import("system.calendars");
+import("system.db");
+import("Sql_lib");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sqlQuery, sqlHelper, queryCondition, affectedIds;
+queryCondition = "";
+if (vars.exists("$local.idvalue")) {
+ affectedIds = vars.get("$local.idvalue");
+ queryCondition = "where SALESORDERID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
+ //TODO: refactor this for incremental indexer (injections?) ----> use SqlCondition Lib
+}
+sqlHelper = new SqlMaskingUtils();
+sqlQuery = "select SALESORDERID, "
+ + sqlHelper.concat([sqlHelper.cast("SALESORDERCODE", SQLTYPES.CHAR, 10), KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.salesorderState(), "SALESORDER.STATUS")], " | ")
+ + " as TITLECOLUMN, "
+ + sqlHelper.concat(["ORGANISATION.NAME"], " | ")
+ + " as DESCCOLUMN, SALESORDERCODE, ORGANISATION.NAME, CUSTOMERCODE "
+ + " from SALESORDER "
+ + " join CONTACT on SALESORDER.CONTACT_ID = CONTACTID "
+ + " join ORGANISATION on ORGANISATIONID = CONTACT.ORGANISATION_ID "
+ + queryCondition + " order by SALESORDERCODE ";
result.string(sqlQuery);
\ No newline at end of file
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index ff26288134274da0fd7dde00077205673b9fa48b..9b4814c866cf917a235277407ab616918c483662 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -112,6 +112,10 @@
<kind v="10077" />
<title></title>
</entityNode>
+ <entityNode>
+ <name>DocumentTemplate</name>
+ <kind v="10077" />
+ </entityNode>
<entityNode>
<name>INTERNAL_ADMINISTRATOR</name>
<kind v="159" />
@@ -120,6 +124,30 @@
</entityNode>
</childNodes>
</entityNode>
+ <entityNode>
+ <name>Group</name>
+ <kind v="123" />
+ <title>Service</title>
+ <childNodes>
+ <entityNode>
+ <name>Group6</name>
+ <kind v="123" />
+ <title></title>
+ <childNodes>
+ <entityNode>
+ <name>SupportTicket</name>
+ <kind v="10077" />
+ <title></title>
+ </entityNode>
+ <entityNode>
+ <name>INTERNAL_ADMINISTRATOR</name>
+ <kind v="159" />
+ <title></title>
+ </entityNode>
+ </childNodes>
+ </entityNode>
+ </childNodes>
+ </entityNode>
<entityNode>
<name>ADMINISTRATION</name>
<kind v="123" />
@@ -132,40 +160,56 @@
<title></title>
<childNodes>
<entityNode>
- <name>Notification</name>
+ <name>Attribute</name>
<kind v="10077" />
</entityNode>
<entityNode>
- <name>Attribute</name>
+ <name>KeywordEntry</name>
<kind v="10077" />
</entityNode>
<entityNode>
- <name>DocumentTemplate</name>
+ <name>KeywordAttribute</name>
<kind v="10077" />
</entityNode>
<entityNode>
- <name>Employee</name>
+ <name>ObjectRelationType</name>
<kind v="10077" />
</entityNode>
<entityNode>
- <name>KeywordEntry</name>
+ <name>ClassificationAdmin</name>
<kind v="10077" />
</entityNode>
<entityNode>
- <name>KeywordAttribute</name>
+ <name>Salutation</name>
<kind v="10077" />
</entityNode>
<entityNode>
- <name>ObjectRelationType</name>
- <kind v="10077" />
+ <name>INTERNAL_ADMINISTRATOR</name>
+ <kind v="159" />
</entityNode>
+ </childNodes>
+ </entityNode>
+ </childNodes>
+ </entityNode>
+ <entityNode>
+ <name>Group5</name>
+ <kind v="123" />
+ <title>User Administration</title>
+ <icon>VAADIN:UNLINK</icon>
+ <childNodes>
+ <entityNode>
+ <name>Group7</name>
+ <kind v="123" />
+ <title></title>
+ <childNodes>
<entityNode>
- <name>ClassificationAdmin</name>
+ <name>Employee</name>
<kind v="10077" />
</entityNode>
<entityNode>
- <name>Salutation</name>
- <kind v="10077" />
+ <name>INTERNAL_ADMINISTRATOR</name>
+ <kind v="159" />
+ <title></title>
</entityNode>
<entityNode>
<name>Role</name>
@@ -177,10 +221,6 @@
<kind v="10077" />
<title></title>
</entityNode>
- <entityNode>
- <name>INTERNAL_ADMINISTRATOR</name>
- <kind v="159" />
- </entityNode>
</childNodes>
</entityNode>
</childNodes>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 3d70d6ee97d9fad9d50ae254009eee019596c633..584dc12334a37636f3b25a5676d6bd356616a600 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>360Degree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>360 Degree</title>
@@ -166,14 +166,26 @@
<isFilterable v="true" />
<isRequireContainerFiltering v="false" />
<contentProcess>%aditoprj%/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>TARGET_ID.value</element>
- <element>TARGET_CONTEXT.value</element>
- <element>TITLE.value</element>
- <element>DATE.value</element>
- <element>ACTIVE.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TARGET_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TARGET_CONTEXT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DATE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACTIVE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/360Degree_entity/entityfields/icon/valueProcess.js b/entity/360Degree_entity/entityfields/icon/valueProcess.js
index fd816d6a0266c5bc480b336ab9b06bb6b64a6fe2..2f66eb7c800ad17bdf10cfaeb872982bfa3480b7 100644
--- a/entity/360Degree_entity/entityfields/icon/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/icon/valueProcess.js
@@ -1,20 +1,13 @@
-import("system.vars");
-import("system.result");
-import("system.neon");
-
-var context = vars.getString("$field.TARGET_CONTEXT");
-switch (context)
-{
- case "Salesproject":
- result.string("VAADIN:BOOK_DOLLAR");
- break;
- case "Offer":
- result.string("VAADIN:CART");
- break;
- case "Contract":
- result.string("VAADIN:FILE_TEXT");
- break;
- case "Campaign":
- result.string("NEON:GROUP_APPOINTMENT");
- break;
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Context_lib");
+
+var context = vars.getString("$field.TARGET_CONTEXT");
+
+if (context)
+{
+ var contextIcon = ContextUtils.getIcon(context);
+ if (contextIcon)
+ result.string(contextIcon);
}
\ 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 2fd7cd5c9882122a55934ae57599384bedbeba61..357494dd61670f70bd6bc10c72650a47e22e4e92 100644
--- a/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/organisationobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.object(["Salesproject", "Offer", "Contract", "Campaign"]);
\ No newline at end of file
+import("system.vars");
+import("system.result");
+
+result.object(["Salesproject", "Offer", "Contract", "Campaign", "Order"]);
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
index 1af59e612029614a514ac91e1262b33b9850b423..51c40eed05ba103ae4347347277aea4e2bad20a3 100644
--- a/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
+++ b/entity/360Degree_entity/entityfields/personobjects/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.vars");
-import("system.result");
-
-result.object(["Offer", "Contract", "Campaign"]);
\ No newline at end of file
+import("system.vars");
+import("system.result");
+
+result.object(["Offer", "Contract", "Campaign", "Order", "SupportTicket"]);
\ No newline at end of file
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index 2cda119659f3a5c75680c3a4428e63f826dab37c..6d9fd655952dac6c48f48057ccad236704cee9d2 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,155 +1,155 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>ActivityLink_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Connection</title>
- <titlePlural>Connections</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityField>
- <name>ACTIVITYLINKID</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_TYPE</name>
- <title>{$OBJECTLINK_TYPE}</title>
- <consumer>Context</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_ROWID</name>
- <title>{$OBJECTLINK_OBJECT}</title>
- <consumer>Objects</consumer>
- <linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ACTIVITY_ID</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>Links</name>
- <targetContextField>OBJECT_TYPE</targetContextField>
- <targetIdField>OBJECT_ROWID</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>148c98ea-a24b-453a-afe9-975555486b2c</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ActivityId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Context</name>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>ActivityLinkable</fieldName>
- </dependency>
- </entityConsumer>
- <entityParameter>
- <name>ActivityId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>66f9eb3e-6f56-4731-a868-ffc9ffcce340</name>
- <tableName>ACTIVITYLINK</tableName>
- <primaryKey>ACTIVITYLINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ACTIVITY_ID.value</name>
- <recordfield>ACTIVITYLINK.ACTIVITY_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ACTIVITYLINKID.value</name>
- <recordfield>ACTIVITYLINK.ACTIVITYLINKID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.value</name>
- <recordfield>ACTIVITYLINK.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>ACTIVITYLINK.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.displayValue</name>
- <expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>ACTIVITYLINK.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>ACTIVITYLINK.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>ACTIVITYLINK.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>ActivityLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Connection</title>
+ <titlePlural>Connections</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>ACTIVITYLINKID</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activitylinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>{$OBJECTLINK_TYPE}</title>
+ <consumer>Context</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <title>{$OBJECTLINK_OBJECT}</title>
+ <consumer>Objects</consumer>
+ <linkedContextProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ACTIVITY_ID</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/activity_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>Links</name>
+ <targetContextField>OBJECT_TYPE</targetContextField>
+ <targetIdField>OBJECT_ROWID</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>148c98ea-a24b-453a-afe9-975555486b2c</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ActivityId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Context</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>ActivityLinkable</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityParameter>
+ <name>ActivityId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/ActivityLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>66f9eb3e-6f56-4731-a868-ffc9ffcce340</name>
+ <tableName>ACTIVITYLINK</tableName>
+ <primaryKey>ACTIVITYLINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ACTIVITY_ID.value</name>
+ <recordfield>ACTIVITYLINK.ACTIVITY_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ACTIVITYLINKID.value</name>
+ <recordfield>ACTIVITYLINK.ACTIVITYLINKID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ <recordfield>ACTIVITYLINK.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>ACTIVITYLINK.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.displayValue</name>
+ <expression>%aditoprj%/entity/ActivityLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>ACTIVITYLINK.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>ACTIVITYLINK.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>ACTIVITYLINK.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>ACTIVITYLINK.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index cc5fc88774f1e1efd760203fc800b83afdf5aec2..40b966dcea0559b9cd6e9e2ab6d84db718f9db5d 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Activity_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
@@ -439,6 +439,20 @@
<outputFormat>dd.MM.yyyy</outputFormat>
<inputFormat>dd.MM.yyyy</inputFormat>
</entityField>
+ <entityConsumer>
+ <name>LinkedAppointments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>LinkedAppointments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>LinkedObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index eb05561b5d5524327e3feb1431ac36f9dc709ebc..052339fd85274449a1ea51daf5c1115b9cfb4f89 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index 908e25519448062aecad76bc2ae932d29de350d4..14071d6da47fb0c8a577e31c7e6bf4cf590a2533 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
@@ -115,14 +115,6 @@
<name>STREET</name>
<title>Street</title>
</entityField>
- <entityField>
- <name>FROM_BN</name>
- <title>From buildingnumber</title>
- </entityField>
- <entityField>
- <name>TO_BN</name>
- <title>To buildingnumber</title>
- </entityField>
<entityField>
<name>LON</name>
</entityField>
@@ -132,30 +124,59 @@
<entityField>
<name>CITYEXT</name>
</entityField>
+ <entityField>
+ <name>BUILDINGNO</name>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
+ <jDitoRecordAlias></jDitoRecordAlias>
<isFilterable v="true" />
<isRequireContainerFiltering v="true" />
+ <isSortable v="true" />
<contentProcess>%aditoprj%/entity/AddressValidation_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>UID.displayValue</element>
- <element>ZIP.value</element>
- <element>CITY.value</element>
- <element>CITYEXT.value</element>
- <element>COUNTRY.value</element>
- <element>DISTRICT.value</element>
- <element>REGION.value</element>
- <element>STATE.value</element>
- <element>STREET.value</element>
- <element>FROM_BN.value</element>
- <element>TO_BN.value</element>
- <element>LON.value</element>
- <element>LAT.value</element>
- <element>VALUE.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>UID.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ZIP.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CITY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CITYEXT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>COUNTRY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DISTRICT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>REGION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>STATE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>STREET.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>BUILDINGNO.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LON.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LAT.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js
index 084f00d1815908c3c4241fc03c680834e03fc8d5..e8560045975cb9faf78db1adaa945d7db5a940fe 100644
--- a/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/cityvalidation/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("WsValidation_lib");
-import("system.result");
-
-result.string(WsValidationType.get().TYPE_CITY.key);
\ No newline at end of file
+import("WsValidation_lib");
+import("system.result");
+
+result.string(WsValidationType.get().TYPE_CITY_NOMINATIM.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
index 13cff9aeebc26164694f2247135dd422d22e34d9..07a8e649c2c8a47b00f727a51543e5e695d7a7f5 100644
--- a/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/cityvalidatior/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("WsValidation_lib");
-import("system.result");
-
-result.string(AddressValidationType.get().TYPE_CITY.key);
\ No newline at end of file
+import("WsValidation_lib");
+import("system.result");
+
+result.string(AddressValidationType.get().TYPE_CITY_NOMINATIM.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js
index a6cfed5664099791a5129bacf8e86b3949a9a2db..63960329edcef78fb8f957b89ac887484b3d71d2 100644
--- a/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/fulladdressvalidation/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
import("WsValidation_lib");
import("system.result");
-result.string(WsValidationType.get().TYPE_ADDRESS.key);
\ No newline at end of file
+result.string(WsValidationType.get().TYPE_ADDRESS_NOMINATIM.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js
index 93426dc98cda1bfc555d22dcbac1929ad4872919..6ab3539198339ca785870777ce0642f0c4e6ba9f 100644
--- a/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/zipvalidaton/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("WsValidation_lib");
-import("system.result");
-
-result.string(WsValidationType.get().TYPE_ZIP.key);
\ No newline at end of file
+import("WsValidation_lib");
+import("system.result");
+
+result.string(WsValidationType.get().TYPE_ZIP_NOMINATIM.key);
\ No newline at end of file
diff --git a/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js b/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
index 5f9b21b7b7fa32df271168911f5c488761ea22f4..fda16aa510156d5a9e059f1cb3a19ea1e72ef61e 100644
--- a/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
+++ b/entity/AddressValidation_entity/entityfields/zipvalidator/children/type_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("WsValidation_lib");
-import("system.result");
-
-result.string(AddressValidationType.get().TYPE_ZIP.key);
\ No newline at end of file
+import("WsValidation_lib");
+import("system.result");
+
+result.string(AddressValidationType.get().TYPE_ZIP_NOMINATIM.key);
\ No newline at end of file
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index d48f9a69ead5860fa04c54ef4a9ab23220c5214c..a792cd32d55c5494cce7b52f26f48e8002e28339 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,462 +1,462 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Address_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
- <title>Address</title>
- <contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
- <afterOperatingState>%aditoprj%/entity/Address_entity/afterOperatingState.js</afterOperatingState>
- <titlePlural>Addresses</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityField>
- <name>ADDRESS</name>
- <title>Street</title>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
- </entityField>
- <entityField>
- <name>ADDRESSADDITION</name>
- </entityField>
- <entityField>
- <name>ADDRESSID</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addressid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ADDRIDENTIFIER</name>
- <title>{$ADDRESS_IDENTIFIER}</title>
- </entityField>
- <entityField>
- <name>ADDR_TYPE</name>
- <documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
- <title>Addresstype</title>
- <consumer>KeywordAddressTypes</consumer>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>BUILDINGNO</name>
- <title>House number</title>
- </entityField>
- <entityField>
- <name>CITY</name>
- <title>City</title>
- <consumer>CityValidation</consumer>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
- <textInputAllowed v="true" />
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/city/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>COUNTRY</name>
- <title>Country</title>
- <consumer>Countries</consumer>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>DISTRICT</name>
- <title>District</title>
- </entityField>
- <entityField>
- <name>REGION</name>
- <title>Region</title>
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STATE</name>
- <title>${ADDRESS_STATE}</title>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/state/mandatoryProcess.js</mandatoryProcess>
- </entityField>
- <entityField>
- <name>ZIP</name>
- <title>Postcode</title>
- <consumer>ZipValidation</consumer>
- <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
- <textInputAllowed v="true" />
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Address_entity/entityfields/zip/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
- </entityField>
- <entityProvider>
- <name>OrganisationAddresses</name>
- <dependencies>
- <entityDependency>
- <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Addresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactType_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrganisationId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/contactid_param/documentation.adoc</documentation>
- </entityParameter>
- <entityProvider>
- <name>ContactAddresses</name>
- <dependencies>
- <entityDependency>
- <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
- <entityName>Person_entity</entityName>
- <fieldName>PersAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
- <entityName>Contact_entity</entityName>
- <fieldName>ContactAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactType_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrganisationId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityConsumer>
- <name>Countries</name>
- <dependency>
- <name>dependency</name>
- <entityName>Countries_Entity</entityName>
- <fieldName>ISO2Name</fieldName>
- </dependency>
- </entityConsumer>
- <entityProvider>
- <name>OrganisationAddressesByContact</name>
- <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
- <titlePlural>Company Addresses</titlePlural>
- <dependencies>
- <entityDependency>
- <name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
- <entityName>Person_entity</entityName>
- <fieldName>OrgAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactType_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>OrganisationId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>IS_STANDARD</name>
- <documentation>%aditoprj%/entity/Address_entity/entityfields/is_standard/documentation.adoc</documentation>
- <contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="false" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
- <description>provide a ADDRESSID-value of the standard address (of a CONTACT)</description>
- </entityParameter>
- <entityParameter>
- <name>ContactType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>OrganisationAndContactAddresses</name>
- <dependencies>
- <entityDependency>
- <name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
- <entityName>Person_entity</entityName>
- <fieldName>ContactAndOrganisationAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
- <entityName>Offer_entity</entityName>
- <fieldName>PossibleAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>DefaultAddressId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ContactType_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OrganisationId_param</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>OrganisationId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>KeywordAddressTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>AddressType_entity</entityName>
- <fieldName>ByCategory</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>UsageFilter_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>IS_STANDARD_ICON</name>
- <title>Standard</title>
- <contentType>IMAGE</contentType>
- <contentTypeProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js</contentTypeProcess>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>ZipValidation</name>
- <dependency>
- <name>dependency</name>
- <entityName>AddressValidation_entity</entityName>
- <fieldName>ZipValidaton</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Country_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>CurrentValue_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>CityValidation</name>
- <dependency>
- <name>dependency</name>
- <entityName>AddressValidation_entity</entityName>
- <fieldName>CityValidation</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>CurrentValue_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>Country_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>AddressSearch</name>
- <title>Search</title>
- <consumer>FullAddressValidation</consumer>
- <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Address_entity/entityfields/addresssearch/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- </entityField>
- <entityConsumer>
- <name>FullAddressValidation</name>
- <dependency>
- <name>dependency</name>
- <entityName>AddressValidation_entity</entityName>
- <fieldName>FullAddressValidation</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>CurrentValue_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>Country_param</name>
- <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <linkInformation>
- <linkInformation>
- <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ADDRESS.value</name>
- <recordfield>ADDRESS.ADDRESS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CITY.value</name>
- <recordfield>ADDRESS.CITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESSADDITION.value</name>
- <recordfield>ADDRESS.ADDRESSADDITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNTRY.value</name>
- <recordfield>ADDRESS.COUNTRY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESSID.value</name>
- <recordfield>ADDRESS.ADDRESSID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRIDENTIFIER.value</name>
- <recordfield>ADDRESS.ADDRIDENTIFIER</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDR_TYPE.value</name>
- <recordfield>ADDRESS.ADDR_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISTRICT.value</name>
- <recordfield>ADDRESS.DISTRICT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>BUILDINGNO.value</name>
- <recordfield>ADDRESS.BUILDINGNO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REGION.value</name>
- <recordfield>ADDRESS.REGION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>ADDRESS.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATE.value</name>
- <recordfield>ADDRESS.STATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ZIP.value</name>
- <recordfield>ADDRESS.ZIP</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDR_TYPE.displayValue</name>
- <expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>ADDRESS.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>ADDRESS.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>ADDRESS.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>ADDRESS.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Address_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
+ <title>Address</title>
+ <contentTitleProcess>%aditoprj%/entity/Address_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterOperatingState>%aditoprj%/entity/Address_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Addresses</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>ADDRESS</name>
+ <title>Street</title>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
+ </entityField>
+ <entityField>
+ <name>ADDRESSADDITION</name>
+ </entityField>
+ <entityField>
+ <name>ADDRESSID</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addressid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ADDRIDENTIFIER</name>
+ <title>{$ADDRESS_IDENTIFIER}</title>
+ </entityField>
+ <entityField>
+ <name>ADDR_TYPE</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
+ <title>Addresstype</title>
+ <consumer>KeywordAddressTypes</consumer>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addr_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>BUILDINGNO</name>
+ <title>House number</title>
+ </entityField>
+ <entityField>
+ <name>CITY</name>
+ <title>City</title>
+ <consumer>CityValidation</consumer>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
+ <textInputAllowed v="true" />
+ <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/city/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Address_entity/entityfields/city/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>COUNTRY</name>
+ <title>Country</title>
+ <consumer>Countries</consumer>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/country/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DISTRICT</name>
+ <title>District</title>
+ </entityField>
+ <entityField>
+ <name>REGION</name>
+ <title>Region</title>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STATE</name>
+ <title>${ADDRESS_STATE}</title>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/state/mandatoryProcess.js</mandatoryProcess>
+ </entityField>
+ <entityField>
+ <name>ZIP</name>
+ <title>Postcode</title>
+ <consumer>ZipValidation</consumer>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
+ <textInputAllowed v="true" />
+ <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/zip/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Address_entity/entityfields/zip/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
+ </entityField>
+ <entityProvider>
+ <name>OrganisationAddresses</name>
+ <dependencies>
+ <entityDependency>
+ <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Addresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/contactid_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityProvider>
+ <name>ContactAddresses</name>
+ <dependencies>
+ <entityDependency>
+ <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>PersAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>aecd30a8-b80e-42c5-be09-3042b75a3fa2</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>ContactAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityConsumer>
+ <name>Countries</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Countries_Entity</entityName>
+ <fieldName>ISO2Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityProvider>
+ <name>OrganisationAddressesByContact</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
+ <titlePlural>Company Addresses</titlePlural>
+ <dependencies>
+ <entityDependency>
+ <name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>OrgAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>IS_STANDARD</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/is_standard/documentation.adoc</documentation>
+ <contentType>BOOLEAN</contentType>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
+ <description>provide a ADDRESSID-value of the standard address (of a CONTACT)</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>OrganisationAndContactAddresses</name>
+ <dependencies>
+ <entityDependency>
+ <name>4d7e3b3a-abba-4429-9f1e-18e11788c0f2</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>ContactAndOrganisationAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>daa41953-8e95-46f2-b08a-6c843ab87985</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>PossibleAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrganisationId_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationandcontactaddresses/children/organisationid_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>OrganisationId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordAddressTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressType_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>UsageFilter_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstypes/children/usagefilter_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>IS_STANDARD_ICON</name>
+ <title>Standard</title>
+ <contentType>IMAGE</contentType>
+ <contentTypeProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/contentTypeProcess.js</contentTypeProcess>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard_icon/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ZipValidation</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressValidation_entity</entityName>
+ <fieldName>ZipValidaton</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Country_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/country_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>CurrentValue_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/zipvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CityValidation</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressValidation_entity</entityName>
+ <fieldName>CityValidation</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>CurrentValue_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Country_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/cityvalidation/children/country_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>AddressSearch</name>
+ <title>Search</title>
+ <consumer>FullAddressValidation</consumer>
+ <stateProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/addresssearch/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Address_entity/entityfields/addresssearch/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityConsumer>
+ <name>FullAddressValidation</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AddressValidation_entity</entityName>
+ <fieldName>FullAddressValidation</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>CurrentValue_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Country_param</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/fulladdressvalidation/children/country_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Address_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <linkInformation>
+ <linkInformation>
+ <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ADDRESS.value</name>
+ <recordfield>ADDRESS.ADDRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CITY.value</name>
+ <recordfield>ADDRESS.CITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESSADDITION.value</name>
+ <recordfield>ADDRESS.ADDRESSADDITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>COUNTRY.value</name>
+ <recordfield>ADDRESS.COUNTRY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESSID.value</name>
+ <recordfield>ADDRESS.ADDRESSID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRIDENTIFIER.value</name>
+ <recordfield>ADDRESS.ADDRIDENTIFIER</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDR_TYPE.value</name>
+ <recordfield>ADDRESS.ADDR_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT.value</name>
+ <recordfield>ADDRESS.DISTRICT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>BUILDINGNO.value</name>
+ <recordfield>ADDRESS.BUILDINGNO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REGION.value</name>
+ <recordfield>ADDRESS.REGION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>ADDRESS.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATE.value</name>
+ <recordfield>ADDRESS.STATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ZIP.value</name>
+ <recordfield>ADDRESS.ZIP</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDR_TYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>ADDRESS.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>ADDRESS.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>ADDRESS.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>ADDRESS.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Address_entity/entityfields/addresssearch/stateProcess.js b/entity/Address_entity/entityfields/addresssearch/stateProcess.js
index 37963a13acac33b31f4c3b966fe3bc2b68912dc3..6b661824b34c0f509494ed9f3ce8cd83e933cd16 100644
--- a/entity/Address_entity/entityfields/addresssearch/stateProcess.js
+++ b/entity/Address_entity/entityfields/addresssearch/stateProcess.js
@@ -3,7 +3,7 @@ import("system.neon");
import("system.result");
import("system.vars");
-if (WsValidationUtils.isWsEnabled(WsValidationType.get().TYPE_ADDRESS))
+if (WsValidationUtils.isWsEnabled(WsValidationType.get().TYPE_ADDRESS_NOMINATIM))
{
result.string(neon.COMPONENTSTATE_AUTO);
}
diff --git a/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js b/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js
index b51e1bdca25fd6259183417a6a823361750f2188..3312d2f2f01c895d6887c0cdc653a4246ba1f173 100644
--- a/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js
+++ b/entity/Address_entity/entityfields/fulladdressvalidation/children/currentvalue_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
- result.string(vars.get("$field.AddressSearch"));
\ No newline at end of file
+result.string(vars.get("$field.AddressSearch"));
\ No newline at end of file
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 6658661779bf92d385590e5425de5bb2e199a973..9fceab95b2942693fd36b49d8ddd3b04c3e078df 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Analyses_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GRID_BIG_O</icon>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index f6ffe950d2da051359423404827ca35c17915ede..90faf37d0fccbe3b57c34ff21701cc448cdceddf 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,248 +1,248 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>AnyContact_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Relations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Relations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
- <entityName>Order_entity</entityName>
- <fieldName>Relations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>336fdc6b-05f8-40bc-89ba-d4ab98bd6948</name>
- <entityName>CampaignParticipant_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b2895709-2ebf-46ec-a46d-6b2e9a4575a3</name>
- <entityName>BulkMailRecipient_entity</entityName>
- <fieldName>Contacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>ADDRESS_ID</name>
- <title>standard address</title>
- <searchable v="false" />
- <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>LANGUAGE</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ORGANISATION_ID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>PERSON_ID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CONTACTID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>STATUS</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>contactType</name>
- <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
-See ContactUtils.getRelationTypeByPersOrg for possible values</description>
- <contentType>NUMBER</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ORGANISATION_NAME</name>
- <title>Company</title>
- </entityField>
- <entityField>
- <name>PERSON_FIRSTNAME</name>
- <title>Firstname</title>
- </entityField>
- <entityField>
- <name>PERSON_LASTNAME</name>
- <title>Lastname</title>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STANDARD_EMAIL_COMMUNICATION</name>
- <title>standard email</title>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>STANDARD_PHONE_COMMUNICATION</name>
- <title>Phone</title>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>RELATIONSHIP</name>
- <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>PERSON_MIDDLENAME</name>
- </entityField>
- <entityField>
- <name>PERSON_TITLE</name>
- </entityField>
- <entityField>
- <name>PERSON_SALUTATION</name>
- </entityField>
- <entityField>
- <name>PERSON_FULL_NAME</name>
- <title>Person</title>
- <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityProvider>
- <name>OnlySameCompany</name>
- <dependencies>
- <entityDependency>
- <name>28b19d6b-237c-4268-b6c6-323df408c94a</name>
- <entityName>Offer_entity</entityName>
- <fieldName>AnyContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>6786a204-2cea-42ae-857d-4335bad6b5e4</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>d15ccb84-6928-4c44-b940-0f5d04826b55</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>b778622f-449a-4185-b7cb-9b373ba4024f</name>
- <tableName>ADDRESS</tableName>
- <primaryKey>ADDRESSID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ADDRESS_ID.value</name>
- <recordfield>CONTACT.ADDRESS_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <recordfield>CONTACT.LANGUAGE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORGANISATION_ID.value</name>
- <recordfield>CONTACT.ORGANISATION_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_ID.value</name>
- <recordfield>CONTACT.PERSON_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACTID.value</name>
- <recordfield>CONTACT.CONTACTID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATUS.value</name>
- <recordfield>CONTACT.STATUS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORGANISATION_NAME.value</name>
- <recordfield>ORGANISATION.NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_FIRSTNAME.value</name>
- <recordfield>PERSON.FIRSTNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_LASTNAME.value</name>
- <recordfield>PERSON.LASTNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STANDARD_EMAIL_COMMUNICATION.value</name>
- <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STANDARD_PHONE_COMMUNICATION.value</name>
- <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>RELATIONSHIP.value</name>
- <recordfield>CONTACT.RELATIONSHIP</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_MIDDLENAME.value</name>
- <recordfield>PERSON.MIDDLENAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_TITLE.value</name>
- <recordfield>PERSON.TITLE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_SALUTATION.value</name>
- <recordfield>PERSON.SALUTATION</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>AnyContact_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>5d8b421e-a234-4d03-bfec-ed01f464a54c</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>Relations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>94e4fa2c-7525-49f9-b933-353d200b829c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Relations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f1f7d959-ecb5-4438-9762-fc11f1bc5334</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Relations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>336fdc6b-05f8-40bc-89ba-d4ab98bd6948</name>
+ <entityName>CampaignParticipant_entity</entityName>
+ <fieldName>AnyContacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b2895709-2ebf-46ec-a46d-6b2e9a4575a3</name>
+ <entityName>BulkMailRecipient_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>ADDRESS_ID</name>
+ <title>standard address</title>
+ <searchable v="false" />
+ <displayValueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>LANGUAGE</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ORGANISATION_ID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>PERSON_ID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CONTACTID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>STATUS</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>contactType</name>
+ <description>Relation type. Value is based on the existance or non-existance of ORGANISATION_ID and PERSON_ID.
+See ContactUtils.getRelationTypeByPersOrg for possible values</description>
+ <contentType>NUMBER</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/contactType/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ORGANISATION_NAME</name>
+ <title>Company</title>
+ </entityField>
+ <entityField>
+ <name>PERSON_FIRSTNAME</name>
+ <title>Firstname</title>
+ </entityField>
+ <entityField>
+ <name>PERSON_LASTNAME</name>
+ <title>Lastname</title>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STANDARD_EMAIL_COMMUNICATION</name>
+ <title>standard email</title>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>STANDARD_PHONE_COMMUNICATION</name>
+ <title>Phone</title>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>RELATIONSHIP</name>
+ <description>TODO: Beziehung zu der Relation 1024846 (z.B. per Ampelsystem)</description>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>PERSON_MIDDLENAME</name>
+ </entityField>
+ <entityField>
+ <name>PERSON_TITLE</name>
+ </entityField>
+ <entityField>
+ <name>PERSON_SALUTATION</name>
+ </entityField>
+ <entityField>
+ <name>PERSON_FULL_NAME</name>
+ <title>Person</title>
+ <valueProcess>%aditoprj%/entity/AnyContact_entity/entityfields/person_full_name/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>OnlySameCompany</name>
+ <dependencies>
+ <entityDependency>
+ <name>28b19d6b-237c-4268-b6c6-323df408c94a</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>AnyContacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>7b3fa460-44a1-40f3-89e3-1625ce9c6bb3</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>6786a204-2cea-42ae-857d-4335bad6b5e4</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>d15ccb84-6928-4c44-b940-0f5d04826b55</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>b778622f-449a-4185-b7cb-9b373ba4024f</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ADDRESS_ID.value</name>
+ <recordfield>CONTACT.ADDRESS_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.value</name>
+ <recordfield>CONTACT.LANGUAGE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGANISATION_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACTID.value</name>
+ <recordfield>CONTACT.CONTACTID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.value</name>
+ <recordfield>CONTACT.STATUS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGANISATION_NAME.value</name>
+ <recordfield>ORGANISATION.NAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_FIRSTNAME.value</name>
+ <recordfield>PERSON.FIRSTNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_LASTNAME.value</name>
+ <recordfield>PERSON.LASTNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD_EMAIL_COMMUNICATION.value</name>
+ <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD_PHONE_COMMUNICATION.value</name>
+ <expression>%aditoprj%/entity/AnyContact_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RELATIONSHIP.value</name>
+ <recordfield>CONTACT.RELATIONSHIP</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_MIDDLENAME.value</name>
+ <recordfield>PERSON.MIDDLENAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_TITLE.value</name>
+ <recordfield>PERSON.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_SALUTATION.value</name>
+ <recordfield>PERSON.SALUTATION</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 86532162e2786907c86d685a3eda8684add23066..a304a53866177373e4f872c958f1c7ce0310ceeb 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>AppointmentLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>db</recordContainer>
@@ -85,8 +85,14 @@
</entityConsumer>
<entityActionField>
<name>opencontext</name>
- <onActionProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js</onActionProcess>
</entityActionField>
+ <entityParameter>
+ <name>LinkedObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/AppointmentLink_entity/entityfields/linkedobjectid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER
+</description>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 1856cdd9e54f11e6fa7868e6d91bd2e1f853bc58..02dc58c423fa9d0ce3eb05e66968bcce7f181f7c 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,9 +1,10 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Appointment_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
<title>Termin</title>
+ <siblings />
<afterUiInit>%aditoprj%/entity/Appointment_entity/afterUiInit.js</afterUiInit>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -28,11 +29,17 @@
</entityField>
<entityField>
<name>BEGIN</name>
+ <title>Begin</title>
+ <contentType>DATE</contentType>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<selectionMode>SINGLE</selectionMode>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/begin/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>END</name>
+ <title>End</title>
+ <contentType>DATE</contentType>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
<valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/end/valueProcess.js</valueProcess>
</entityField>
<entityFieldGroup>
@@ -50,6 +57,7 @@
</entityField>
<entityField>
<name>LOCATION</name>
+ <title>Location</title>
</entityField>
<entityField>
<name>REMINDER_CHECK</name>
@@ -176,41 +184,118 @@
<stateProcess>%aditoprj%/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js</stateProcess>
<tooltip>series delete action</tooltip>
</entityActionField>
+ <entityParameter>
+ <name>LinkedObjectId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>LinkedAppointments</name>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>74dea3cd-a528-4616-b468-cd27f3f1a795</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Appointments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>12b2a8cd-1b66-4123-b0a6-f1ca164bdfec</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Appointments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>17129bd7-1b1b-4090-9185-d6b3b83ffb40</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>LinkedAppointments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>LinkedAppointmentsFromDashlet_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
<name>jdito</name>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
<onInsert>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/Appointment_entity/recordcontainers/jdito/onDelete.js</onDelete>
<title>jdito</title>
<description></description>
- <recordFields>
- <element>UID.value</element>
- <element>ATTENDEESLENGTH.value</element>
- <element>BEGIN.value</element>
- <element>END.value</element>
- <element>SUMMARY.value</element>
- <element>ORGANIZER.value</element>
- <element>ATTENDEES.value</element>
- <element>STATUS.value</element>
- <element>LINKS.value</element>
- <element>DESCRIPTION.value</element>
- <element>LOCATION.value</element>
- <element>ICON.value</element>
- <element>CLASSIFICATION.value</element>
- <element>TRANSPARENCY.value</element>
- <element>CATEGORIES.value</element>
- <element>REMINDER.value</element>
- <element>REMINDER_CHECK.value</element>
- <element>RRULE.value</element>
- <element>RECURRENCEID.value</element>
- <element>SAFESCOPEFIELD.value</element>
- <element>MASTERBEGIN.value</element>
- <element>MASTEREND.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTENDEESLENGTH.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>BEGIN.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>END.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SUMMARY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ORGANIZER.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTENDEES.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>STATUS.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LINKS.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LOCATION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ICON.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TRANSPARENCY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CATEGORIES.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>REMINDER.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>REMINDER_CHECK.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>RRULE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>RECURRENCEID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SAFESCOPEFIELD.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>MASTERBEGIN.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>MASTEREND.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
index 624e6ab676bde0376df0cfdd60d90280cfd596aa..23649935d1dd90af87cbefa612a2733cafe75d63 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,7 @@
+import("system.tools");
+import("system.logging");
+import("system.db");
+import("Sql_lib");
import("system.result");
import("system.vars");
import("system.calendars");
@@ -5,10 +9,44 @@ import("system.datetime");
import("system.eMath");
import("system.util");
import("system.neon");
+import("system.entities")
-if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+
+var cond = SqlCondition.begin();
+
+if(vars.get("$local.idvalues") != null && vars.get("$local.idvalues") != "")
{
+ var selectedids = vars.get("$local.idvalues");
+ result.object([buildEntry(calendars.getEntry(selectedids, null, null), null)]);
+}
+
+else if(vars.getString("$param.LinkedAppointmentsFromDashlet_param"))
+{
+ var contactid = tools.getCurrentUser()["params"]["contactID"];
+
+ cond.andPrepareValue("AB_APPOINTMENTLINK.OBJECT_ROWID", contactid)
+ var idscond = db.translateCondition(cond.build("1 = 1"));
+
+ var appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
+ result.object(buildEntriesFromUids(appointmentUids));
+}
+/**
+ * Will be triggert if a module needs AppointmentFilter_view
+ */
+else if(vars.getString("$param.LinkedObjectId_param") != undefined)
+{
+ cond.andPrepareVars("AB_APPOINTMENTLINK.OBJECT_ROWID", "$param.LinkedObjectId_param")
+ var idscond = db.translateCondition(cond.build("1 = 1"));
+
+ var appointmentUids = db.table("select APPOINTMENT_ID from AB_APPOINTMENTLINK where " + idscond);
+ result.object(buildEntriesFromUids(appointmentUids));
+}
+/**
+ * Will be used, if the user is operating the calendar.
+ */
+else if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
+{
var entry = JSON.parse(vars.getString("$param.Entry_param"));
var masterEntry = null;
@@ -16,38 +54,55 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
masterEntry = JSON.parse(vars.getString("$param.MasterEntry_param"));
}
- var uid = entry[calendars.ID];
- var summary = entry[calendars.SUMMARY];
- var attendees = entry[calendars.AFFECTEDUSERS];
- var startdate = entry[calendars.DTSTART];
- var enddate = entry[calendars.DTEND];
- var links = entry[calendars.LINKS];
- var description = entry[calendars.DESCRIPTION];
- if(entry[calendars.ORGANIZER2] != undefined)
- var organizer = entry[calendars.ORGANIZER2]["paramvalue"];
- var status = entry[calendars.STATUS];
- var location = entry[calendars.LOCATION];
- var reminder = entry[calendars.REMINDER_DURATION];
- var remindercheck = entry[calendars.HASREMINDER]
- var classification = entry[calendars.CLASSIFICATION];
- var transparency = entry[calendars.TRANSPARENCY];
- var categories = entry[calendars.CATEGORIES];
+ //@TODO Icon
+ result.object([
+ buildEntry(entry, masterEntry)
+ ]);
+}
+
+function buildEntriesFromUids(appointmentUids)
+{
+ var entryArray = new Array(appointmentUids.length);
- var masterBegin = masterEntry != null ? masterEntry[calendars.DTSTART] : null
- var masterEnd = masterEntry != null ? masterEntry[calendars.DTEND] : null
+ for(var i = 0; i < appointmentUids.length; i++)
+ entryArray[i] = buildEntry(calendars.getEntry(appointmentUids[i], null, null), null);
+
+ return entryArray;
+}
+
+
+function buildEntry(pEntry, pMasterentry)
+{
+ var uid = pEntry[calendars.ID];
+ var summary = pEntry[calendars.SUMMARY];
+ var attendees = pEntry[calendars.AFFECTEDUSERS];
+ var startdate = pEntry[calendars.DTSTART];
+ var enddate = pEntry[calendars.DTEND];
+ var links = pEntry[calendars.LINKS];
+ var description = pEntry[calendars.DESCRIPTION];
+ if(pEntry[calendars.ORGANIZER2] != undefined)
+ var organizer = pEntry[calendars.ORGANIZER2]["paramvalue"];
+ var status = pEntry[calendars.STATUS];
+ var location = pEntry[calendars.LOCATION];
+ var reminder = pEntry[calendars.REMINDER_DURATION];
+ var remindercheck = pEntry[calendars.HASREMINDER]
+ var classification = pEntry[calendars.CLASSIFICATION];
+ var transparency = pEntry[calendars.TRANSPARENCY];
+ var categories = pEntry[calendars.CATEGORIES];
+
+ var masterBegin = pMasterentry != null ? pMasterentry[calendars.DTSTART] : null
+ var masterEnd = pMasterentry != null ? pMasterentry[calendars.DTEND] : null
// Recurrence
- var recurrenceID = entry[calendars.RECURRENCEID];
+ var recurrenceID = pEntry[calendars.RECURRENCEID];
var rrule = null;
- if (masterEntry != null) { // Entry is a recurrence exception, therefore get rrule from master
- rrule = masterEntry[calendars.RRULE] != null ? masterEntry[calendars.RRULE][0] : null;
+ if (pMasterentry != null) { // Entry is a recurrence exception, therefore get rrule from master
+ rrule = pMasterentry[calendars.RRULE] != null ? pMasterentry[calendars.RRULE][0] : null;
} else {
- rrule = entry[calendars.RRULE] != null ? entry[calendars.RRULE][0] : null;
+ rrule = pEntry[calendars.RRULE] != null ? pEntry[calendars.RRULE][0] : null;
}
-
- //@TODO Icon
- result.object([
- [
+
+ return [
uid,
attendees.length,
startdate,
@@ -70,6 +125,5 @@ if(vars.exists("$param.Entry_param") && vars.get("$param.Entry_param"))
null,
masterBegin,
masterEnd
- ]
- ]);
+ ];
}
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
index 80fb7869b5f59190558797549e7717b73da53db4..7abca1e85cd72262cbcde93854d041f1a6956211 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
@@ -1,6 +1,8 @@
+import("Sql_lib");
import("system.neon");
import("system.calendars");
import("system.vars");
+import("system.db");
if (vars.exists("$param.Entry_param"))
@@ -10,4 +12,14 @@ if (vars.exists("$param.Entry_param"))
if (reccurenceid == undefined)
reccurenceid = null;
calendars.removeEntryByUID(calendars.VEVENT, vars.get("$sys.user"), entry[calendars.ID], reccurenceid)
+
+
+ /**
+ * Deletes ApointmentLinks referring to the deleted Appointment.
+ */
+ var cond = SqlCondition.begin();
+ cond.andPrepareValue("AB_APPOINTMENTLINK.APPOINTMENT_ID", entry[calendars.ID])
+ var idscond = db.translateCondition(cond.build("1 = 2"));
+
+ db.deleteData("AB_APPOINTMENTLINK", idscond);
}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index 06ec9d444efb53b893261d5d9ff39fb422d88805..2d21271d661117341030274948568617105f5acb 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,9 +1,8 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>AttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Attribute</title>
- <onValidation>%aditoprj%/entity/AttributeRelation_entity/onValidation.js</onValidation>
<titlePlural>Attributes</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
@@ -85,14 +84,6 @@
<valueProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/treeprovider/children/gettree_param/valueProcess.js</valueProcess>
<expose v="false" />
</entityParameter>
- <entityParameter>
- <name>AttributeId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>IsNew_param</name>
- <expose v="false" />
- </entityParameter>
</children>
</entityProvider>
<entityField>
@@ -144,17 +135,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionGroup>
- <name>alter</name>
- <children>
- <entityActionField>
- <name>edit</name>
- <onActionProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
- <iconId>NEON:PENCIL</iconId>
- <stateProcess>%aditoprj%/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityParameter>
<name>GetTree_param</name>
<expose v="true" />
@@ -229,22 +209,12 @@
<fieldName>AttributeConditions</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>fc4a1e51-6bdb-46dd-9ffc-a45480051d28</name>
- <entityName>Task_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
</dependencies>
<children>
<entityParameter>
<name>GetTree_param</name>
<expose v="false" />
</entityParameter>
- <entityParameter>
- <name>AttributeId_param</name>
- <expose v="false" />
- </entityParameter>
</children>
</entityProvider>
<entityField>
@@ -278,14 +248,6 @@
<expose v="true" />
<documentation>%aditoprj%/entity/AttributeRelation_entity/entityfields/showempty_param/documentation.adoc</documentation>
</entityParameter>
- <entityParameter>
- <name>AttributeId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>IsNew_param</name>
- <expose v="true" />
- </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -295,14 +257,26 @@
<onInsert>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT_ID.value</element>
- <element>VALUE.value</element>
- <element>VALUE.displayValue</element>
- <element>AB_ATTRIBUTE_ID.value</element>
- <element>AB_ATTRIBUTE_ID.displayValue</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>VALUE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>VALUE.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>AB_ATTRIBUTE_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>AB_ATTRIBUTE_ID.displayValue</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
deleted file mode 100644
index aa6e8903ba7a47e108b893ef2da692305e44624e..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/onActionProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("ObjectRelation_lib");
-import("system.neon");
-import("system.vars");
-
-if (vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows").length > 0)
-{
- var row = vars.get("$sys.selectionRows")[0];
- var params = {
- "ObjectType_param" : vars.get("$param.ObjectType_param"),
- "ObjectRowId_param" : vars.get("$param.ObjectRowId_param"),
- "AttributeId_param" : row.AB_ATTRIBUTE_ID,
- "DisplaySimpleName_param" : vars.get("$param.DisplaySimpleName_param"),
- "FilteredAttributeIds_param" : vars.get("$param.FilteredAttributeIds_param"),
- "IsNew_param" : row.UID[0] == "," // if first char is "," it is a newly generated UUID
- };
- var operatingState = row.VALUE ? neon.OPERATINGSTATE_EDIT : neon.OPERATINGSTATE_NEW; // V--- remove "," if it exists
- neon.openContext("AttributeRelation", "AttributeRelationTreeEdit_view", [row.UID[0] == "," ? row.UID.substr(1) : row.UID], operatingState, params);
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js b/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
deleted file mode 100644
index b8964feb97367ccf63fcc2b86696cf8009e08e4f..0000000000000000000000000000000000000000
--- a/entity/AttributeRelation_entity/entityfields/alter/children/edit/stateProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.neon");
-import("Attribute_lib");
-
-var state = neon.COMPONENTSTATE_DISABLED;
-if (vars.exists("$sys.selectionRows") && vars.get("$sys.selectionRows").length > 0)
-{
- var row = vars.get("$sys.selectionRows")[0];
- if (row.AB_ATTRIBUTE_ID)
- state = neon.COMPONENTSTATE_EDITABLE;
-}
-result.string(state);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/onValidation.js b/entity/AttributeRelation_entity/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
index ee07cda9232f4fff58025e8aa26a421605609461..82afab12a9f65c35207a6cbb1352a38c984cd0b8 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/contentProcess.js
@@ -17,46 +17,35 @@ var getTree = vars.exists("$param.GetTree_param") && vars.getString("$param.GetT
var showEmpty = vars.exists("$param.ShowEmpty_param") && vars.getString("$param.ShowEmpty_param") == "true";
var displaySimpleName = vars.exists("$param.DisplaySimpleName_param") && vars.get("$param.DisplaySimpleName_param");
-var sqlSelect = "select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, '', '', '', ATTRIBUTE_NAME from AB_ATTRIBUTE";
-var attributeRelationJoin = "join AB_ATTRIBUTERELATION on AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID";
var sqlCondition = new SqlCondition();
var subCondition = new SqlCondition();
if (vars.exists("$local.idvalues") && vars.get("$local.idvalues"))
{
let idVals = vars.get("$local.idvalues");
- let idCond = new SqlCondition();
- idVals.forEach(function (id)
+ let attrId = idVals.length === 1 && idVals[0].split(",")[1];
+ if (!attrId)
+ showEmpty = false;
+
+ if (showEmpty)
+ sqlCondition.andPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", attrId);
+ else
{
- this.orPrepare("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", id);
- }, subCondition);
- sqlCondition.andSqlCondition(subCondition);
+ sqlCondition.andIn("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", idVals);
+ rowId = null;
+ }
getTree = false;
}
else if (showEmpty || rowId)
{
+
if (showEmpty)
{
- let idCond = new SqlCondition();
- let possibleAttributes = AttributeUtil.getPossibleAttributes(objectType);
- possibleAttributes.forEach(function (attributeId)
- {
- this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", attributeId);
- }, idCond);
- sqlCondition.andSqlCondition(idCond);
+ let filtered = vars.exists("$param.FilteredAttributeIds_param") && vars.getString("$param.FilteredAttributeIds_param");
- attributeRelationJoin = "left " + attributeRelationJoin;
- }
- if (rowId)
- {
- subCondition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
- if (objectType != null)
- subCondition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
- if (subCondition.isSet())
- attributeRelationJoin += " and " + db.translateCondition(subCondition.build("1=1"));
- // add condition to match all returned by joins (override default 1=2 of build)
- sqlCondition.and("1=1");
+ let possibleAttributes = AttributeUtil.getPossibleAttributes(objectType);
+ sqlCondition.andIn("AB_ATTRIBUTE.AB_ATTRIBUTEID", possibleAttributes);
}
if (vars.exists("$param.FilteredAttributeIds_param") && vars.getString("$param.FilteredAttributeIds_param"))
{
@@ -64,18 +53,26 @@ else if (showEmpty || rowId)
subCondition.clear();
let filteredIdChildren = AttributeUtil.getAllChildren(filteredIds);
-
- filteredIds.concat(filteredIdChildren).forEach(function(id)
- {
- this.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
- }, subCondition);
+
+ subCondition.andIn("AB_ATTRIBUTE.AB_ATTRIBUTEID", filteredIdChildren);
+ subCondition.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?")
// return nothing if filteredAttributeIds is an empty array. (--> and 1=2)
sqlCondition.andSqlCondition(subCondition, "1=2");
}
}
+var joinCondition = "";
+if (rowId)
+{
+ subCondition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_ROWID", rowId);
+ if (objectType != null)
+ subCondition.andPrepare("AB_ATTRIBUTERELATION.OBJECT_TYPE", objectType);
+ if (subCondition.isSet())
+ joinCondition = " and " + db.translateCondition(subCondition.build("1=1"));
+ // add condition to match all returned by joins (override default 1=2 of build)
+ sqlCondition.and("1=1");
+}
-//these fields are always required
var defaultFields = [
"AB_ATTRIBUTERELATIONID",
"AB_ATTRIBUTE.AB_ATTRIBUTEID",
@@ -89,30 +86,31 @@ var defaultFields = [
var valueFields = AttributeTypeUtil.getAllDatabaseFields();
var attributeSql = sqlCondition.buildSql("select " + defaultFields.join(", ") + ", " + valueFields.join(", ")
+ " from AB_ATTRIBUTE "
- + attributeRelationJoin
+ + (showEmpty ? "left " : "") + "join AB_ATTRIBUTERELATION on AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID = AB_ATTRIBUTE.AB_ATTRIBUTEID " + joinCondition
+ " left join AB_ATTRIBUTE COMBOVAL on " + $AttributeTypes.COMBO.databaseField + " = COMBOVAL.AB_ATTRIBUTEID" //for the view value of combobox attributes
, "1=2"
);
var attributeValues = db.table(attributeSql).map(function (row)
{
- let attributeId = row[1];
- let attributeName = translate.text(row[4]);
+ var attributeId = row[1];
+ var attributeName = translate.text(row[4]);
+ var type = row[3].trim();
if (!getTree && !displaySimpleName && row[2])
{
let parentName = AttributeUtil.getFullAttributeName(row[2]);
attributeName = (parentName ? parentName + " / " : "") + attributeName;
}
- let value = row[AttributeTypeUtil.getTypeColumnIndex(row[3]) + defaultFields.length];
- let viewValue;
- if (row[3].trim() == $AttributeTypes.COMBO)
+ var value = row[AttributeTypeUtil.getTypeColumnIndex(row[3]) + defaultFields.length];
+ var viewValue;
+ if (type == $AttributeTypes.COMBO)
viewValue = translate.text(row[6]);
else
- viewValue = AttributeTypeUtil.getAttributeViewValue(row[3].trim(), value, row[5]);
+ viewValue = AttributeTypeUtil.getAttributeViewValue(type, value, row[5]);
//TODO: what should be the uid if showEmpty is true?
// V-- set "," to mark this as new generated UUID
- return [row[0] || "," + util.getNewUUID(), row[2], value, viewValue, attributeId, attributeName];
+ return [row[0] || util.getNewUUID() + "," + attributeId, row[2], value, viewValue, attributeId, attributeName];
});
@@ -137,7 +135,7 @@ function _fetchAttributes (pAttributeIds)
if (!(id in this))
sqlCondition.orPrepare("AB_ATTRIBUTE.AB_ATTRIBUTEID", id);
}, attributeObj);
- db.table(sqlCondition.buildSql(sqlSelect, "1=2"))
+ db.table(sqlCondition.buildSql("select AB_ATTRIBUTEID, ATTRIBUTE_PARENT_ID, ATTRIBUTE_NAME from AB_ATTRIBUTE", "1=2"))
.forEach(function (row)
{
this[row[0]] = true; //make entry in attributeObj to avoid duplicates
@@ -145,9 +143,10 @@ function _fetchAttributes (pAttributeIds)
nextIds.push(row[1]);
else
row[1] = null;
- row[5] = translate.text(row[5]); //translate attribute name
- parentAttributes.push(row);
+ row[2] = translate.text(row[2]); //translate attribute name
+ parentAttributes.push([row[0], row[1], "", "", "", row[2]]);
}, attributeObj);
+
if (nextIds.length)
_fetchAttributes(nextIds);
}
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
index 63578d8119921d9ac69a4a465ba9816654e5a2f2..5323125f94e32ab1cc275eeb69922f0c574265c6 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onDelete.js
@@ -3,8 +3,9 @@ import("system.vars");
import("Sql_lib");
import("system.db");
-if (vars.get("$field.AB_ATTRIBUTE_ID") && vars.get("$field.VALUE"))
+var rowData = vars.get("$local.rowdata");
+if (rowData["AB_ATTRIBUTE_ID.value"] && rowData["VALUE.value"])
{
- db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$field.UID"), "1=2"));
+ db.deleteData("AB_ATTRIBUTERELATION", SqlCondition.equals("AB_ATTRIBUTERELATION.AB_ATTRIBUTERELATIONID", vars.get("$local.uid"), "1=2"));
}
neon.refresh();
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
index 134286f939f016ce74d4a051c7ce3911b233db6b..b42dfc4e2e48fd4623b503b00021f993bfdab90d 100644
--- a/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/AttributeRelation_entity/recordcontainers/jdito/onUpdate.js
@@ -6,9 +6,10 @@ import("Attribute_lib");
var type = AttributeUtil.getAttributeType(vars.get("$field.AB_ATTRIBUTE_ID"));
var columns, values;
+var uid = vars.get("$local.uid").split(",");
// if first char is "," it is a newly generated UUID
-if (vars.get("$field.UID")[0] != "," && !(vars.exists("$param.IsNew_param") && vars.getString("$param.IsNew_param") == "true"))
+if (uid.length === 1)
{
columns = [
"AB_ATTRIBUTE_ID",
@@ -43,9 +44,8 @@ else
"USER_NEW"
];
- var uid = vars.get("$field.UID");
values = [
- uid[0] == "," ? uid.substr(1) : uid, // if first char is "," it is a newly generated UUID
+ uid[0], // if first char is "," it is a newly generated UUID
vars.get("$field.AB_ATTRIBUTE_ID"),
vars.get("$param.ObjectRowId_param"),
vars.get("$param.ObjectType_param"),
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index 1953c6177098139e7b86bac661646f63c46293ff..662efb9736c50b4cc22f354b991cf9f36f447502 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,145 +1,145 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>AttributeUsage_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
- <title>Usage</title>
- <onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>OBJECT_TYPE</name>
- <title>Module</title>
- <consumer>Context</consumer>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>AB_ATTRIBUTEUSAGEID</name>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attributeusageid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>AB_ATTRIBUTE_ID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>SpecificAttribute</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>AttributeUsages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>AttributeId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>MIN_COUNT</name>
- <title>Minimal Count</title>
- <contentType>NUMBER</contentType>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>MAX_COUNT</name>
- <title>Maximal Count</title>
- <contentType>NUMBER</contentType>
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
- </entityField>
- <entityConsumer>
- <name>Context</name>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>GetAllContexts_param</name>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>UseExclusives_param</name>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/useexclusives_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ExclusiveContexts_param</name>
- <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>SingleSelection_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>DisableMinCount_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBInsert>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
- <tableName>AB_ATTRIBUTEUSAGE</tableName>
- <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTE_ID.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_ATTRIBUTEUSAGEID.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MAX_COUNT.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.MAX_COUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MIN_COUNT.value</name>
- <recordfield>AB_ATTRIBUTEUSAGE.MIN_COUNT</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>AttributeUsage_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
+ <title>Usage</title>
+ <onValidation>%aditoprj%/entity/AttributeUsage_entity/onValidation.js</onValidation>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>Module</title>
+ <consumer>Context</consumer>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>AB_ATTRIBUTEUSAGEID</name>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attributeusageid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>AB_ATTRIBUTE_ID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/ab_attribute_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>SpecificAttribute</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>47ac9f95-8879-43fd-92a9-86079e735e58</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>AttributeUsages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>AttributeId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>MIN_COUNT</name>
+ <title>Minimal Count</title>
+ <contentType>NUMBER</contentType>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/min_count/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>MAX_COUNT</name>
+ <title>Maximal Count</title>
+ <contentType>NUMBER</contentType>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/AttributeUsage_entity/entityfields/max_count/onValidation.js</onValidation>
+ </entityField>
+ <entityConsumer>
+ <name>Context</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>GetAllContexts_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/getallcontexts_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>UseExclusives_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/useexclusives_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ExclusiveContexts_param</name>
+ <valueProcess>%aditoprj%/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>SingleSelection_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>DisableMinCount_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBInsert>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/AttributeUsage_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>c30f5670-580e-4621-95dd-0fec4a99190f</name>
+ <tableName>AB_ATTRIBUTEUSAGE</tableName>
+ <primaryKey>AB_ATTRIBUTEUSAGEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>AB_ATTRIBUTE_ID.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_ATTRIBUTEUSAGEID.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.AB_ATTRIBUTEUSAGEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MAX_COUNT.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.MAX_COUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MIN_COUNT.value</name>
+ <recordfield>AB_ATTRIBUTEUSAGE.MIN_COUNT</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js b/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
index 75a6896220cdbe2bc6e61acee13bd616e8493252..a304ae418593bf3e837ae999f81e3507125c0e16 100644
--- a/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
+++ b/entity/AttributeUsage_entity/entityfields/context/children/exclusivecontexts_param/valueProcess.js
@@ -12,5 +12,5 @@ result.object([
"Salesproject",
"Campaign",
"DocumentTemplate",
- "Task"
+ "SupportTicket"
]);
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index bcd8cef75319f0b382a3003fb81240b984fb2e13..8d5f1d9867c8c6421aa53602bcc874b865298fb1 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Attribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
@@ -215,7 +215,7 @@
</entityProvider>
<entityField>
<name>FULL_ATTRIBUTE_NAME</name>
- <title>Name</title>
+ <title>Title</title>
<searchable v="false" />
<state>READONLY</state>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/full_attribute_name/valueProcess.js</valueProcess>
@@ -317,6 +317,18 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
+ <entityFieldGroup>
+ <name>attributeName</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributename/valueProcess.js</valueProcess>
+ <title>Name</title>
+ <fields>
+ <element>ATTRIBUTE_NAME</element>
+ </fields>
+ </entityFieldGroup>
+ <entityField>
+ <name>expanded</name>
+ <valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/expanded/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -328,19 +340,41 @@
<onInsert>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ATTRIBUTE_PARENT_ID.value</element>
- <element>ATTRIBUTE_ACTIVE.value</element>
- <element>DROPDOWNDEFINITION.value</element>
- <element>SORTING.value</element>
- <element>ATTRIBUTE_TYPE.value</element>
- <element>ATTRIBUTE_TYPE.displayValue</element>
- <element>USAGELIST.value</element>
- <element>ATTRIBUTE_NAME.value</element>
- <element>ATTRIBUTE_PARENT_ID.displayValue</element>
- <element>FULL_ATTRIBUTE_NAME.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTRIBUTE_PARENT_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTRIBUTE_ACTIVE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DROPDOWNDEFINITION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SORTING.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTRIBUTE_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTRIBUTE_TYPE.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>USAGELIST.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTRIBUTE_NAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ATTRIBUTE_PARENT_ID.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>FULL_ATTRIBUTE_NAME.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Attribute_entity/afterUiInit.js b/entity/Attribute_entity/afterUiInit.js
index 9c97441ea2bb023f4b3961ac89c89185e9f9954c..6a175be075c7416b21489b44bdcfbbae03fde52d 100644
--- a/entity/Attribute_entity/afterUiInit.js
+++ b/entity/Attribute_entity/afterUiInit.js
@@ -1,27 +1,28 @@
-import("system.util");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-import("Attribute_lib");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
- && vars.get("$field.ATTRIBUTE_TYPE").trim() != $AttributeTypes.COMBOVALUE
- && vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param"))
-{
- var parentId = vars.get("$param.AttrParentId_param");
- var attributeId = vars.get("$field.UID");
-
- var usageSql = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
- .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE", "1=0");
- var usages = db.array(db.COLUMN, usageSql);
-
- //preset the usages with the ones from the parent
- usages.forEach(function (usage)
- {
- neon.addRecord("AttributeUsages", {
- "OBJECT_TYPE" : usage
- });
- });
+import("Sql_lib");
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+import("Attribute_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.get("$field.ATTRIBUTE_TYPE").trim() != $AttributeTypes.COMBOVALUE
+ && vars.exists("$param.AttrParentId_param") && vars.get("$param.AttrParentId_param"))
+{
+ var parentId = vars.get("$param.AttrParentId_param");
+ var attributeId = vars.get("$field.UID");
+
+ var usageSql = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
+ .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE", "1=0");
+ var usages = db.array(db.COLUMN, usageSql);
+
+ //preset the usages with the ones from the parent
+ usages.forEach(function (usage)
+ {
+ neon.addRecord("AttributeUsages", {
+ "OBJECT_TYPE" : usage
+ });
+ });
}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attributename/valueProcess.js b/entity/Attribute_entity/entityfields/attributename/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e55588aa4fb9dea4ee26b065951ab47b1ad43256
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attributename/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.FULL_ATTRIBUTE_NAME"));
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/expanded/valueProcess.js b/entity/Attribute_entity/entityfields/expanded/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcb435b5f5508a654ce8c39f81aa6dd9c74fb323
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/expanded/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object(false);
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/icon/colorProcess.js b/entity/Attribute_entity/entityfields/icon/colorProcess.js
index 16a333ea2d60fe6b0abe35d82d40928889b5e3d3..b73702d761bbbd93f6aecd43c3ceaddea285a2d0 100644
--- a/entity/Attribute_entity/entityfields/icon/colorProcess.js
+++ b/entity/Attribute_entity/entityfields/icon/colorProcess.js
@@ -3,4 +3,4 @@ import("system.result");
import("system.neon");
if (vars.getString("$field.ATTRIBUTE_ACTIVE") != "1")
- result.string(neon.PRIORITY_LOW_COLOR);
+ result.string(neon.READONLY_COLOR);
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4ce25bf1b78e723d677cfcdd0677f9a351f4f960
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -0,0 +1,47 @@
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>BulkMailAddRecipients_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>recipientCountMessage</name>
+ </entityField>
+ <entityField>
+ <name>BULKMAIL_ID</name>
+ <title>Bulk mail</title>
+ <consumer>BulkMails</consumer>
+ <linkedContext>BulkMail</linkedContext>
+ </entityField>
+ <entityConsumer>
+ <name>BulkMails</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>BulkMail_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityParameter>
+ <name>ContactIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <onInsert>%aditoprj%/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js b/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..527bf07cc5f786bc9dbf18cd0747408362473f04
--- /dev/null
+++ b/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,31 @@
+import("KeywordRegistry_basic");
+import("system.util");
+import("system.db");
+import("Sql_lib");
+import("system.vars");
+
+
+//TODO: put this into a function and use only contacts without advertising ban
+var contactIds = JSON.parse(vars.getString("$param.ContactIds_param"));
+var bulkMailId = vars.get("$field.BULKMAIL_ID");
+
+var existsQuery = "not exists(select BULKMAILRECIPIENTID from BULKMAILRECIPIENT where BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID and # = ?)";
+var query = SqlCondition.begin()
+ .andIn("CONTACT.CONTACTID", contactIds)
+ .andPrepare("BULKMAILRECIPIENT.BULKMAIL_ID", bulkMailId, existsQuery)
+ .buildSql("select CONTACTID from CONTACT");
+
+contactIds = db.array(db.COLUMN, query); //only add contacts that aren't already recipients
+
+var columns = [
+ "BULKMAILRECIPIENTID",
+ "BULKMAIL_ID",
+ "CONTACT_ID",
+ "STATUS"
+];
+var inserts = [];
+for (let i = 0, l = contactIds.length; i < l; i++)
+{
+ inserts.push(["BULKMAILRECIPIENT", columns, null, [util.getNewUUID(), bulkMailId, contactIds[i], $KeywordRegistry.bulkMailRecipientStatus$pending()]]);
+}
+db.inserts(inserts);
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 275d1404149ca2db7d5715bd346fee0355cb986c..14ec8a459047d055534c8138b13812ec31da3a26 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>BulkMailRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Recipient</title>
@@ -19,7 +19,7 @@
<consumer>Contacts</consumer>
<linkedContextProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/contact_id/onValidation.js</onValidation>
</entityField>
<entityField>
<name>STATUS</name>
@@ -87,6 +87,13 @@
<entityField>
<name>ORGANISATION_ID</name>
</entityField>
+ <entityField>
+ <name>SENTDATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -147,6 +154,14 @@
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SENTDATE.value</name>
+ <recordfield>BULKMAILRECIPIENT.SENTDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/BulkMailRecipient_entity/entityfields/contact_id/displayValueProcess.js b/entity/BulkMailRecipient_entity/entityfields/contact_id/displayValueProcess.js
deleted file mode 100644
index 85822946ab4fe0ba7730ca93fd6fca69250a5b33..0000000000000000000000000000000000000000
--- a/entity/BulkMailRecipient_entity/entityfields/contact_id/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Contact_lib");
-import("system.neon");
-
-result.string(ContactUtils.getFullTitleByContactId(vars.getString("$field.CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/contact_id/onValidation.js b/entity/BulkMailRecipient_entity/entityfields/contact_id/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..5f8c80384957e3e8e8eb5d034ad6d2e9871ecddc
--- /dev/null
+++ b/entity/BulkMailRecipient_entity/entityfields/contact_id/onValidation.js
@@ -0,0 +1,18 @@
+import("system.translate");
+import("system.result");
+import("system.datetime");
+import("KeywordRegistry_basic");
+import("Sql_lib");
+import("Entity_lib");
+import("Bulkmail_lib");
+import("system.db");
+
+var query = SqlCondition.begin()
+ .andPrepare("CONTACT.CONTACTID", ProcessHandlingUtils.getOnValidationValue())
+ .andSqlCondition(BulkMailUtils.getCommRestrictionCondition(true))
+ .buildSql("select count(*) = 0 from CONTACT", "1=2");
+
+var noMails = db.cell(query) != "true";
+
+if (noMails)
+ result.string(translate.text("The contact has an advertising ban for emails!"));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/entityfields/status/valueProcess.js b/entity/BulkMailRecipient_entity/entityfields/status/valueProcess.js
index e506dbc464cb9b87a8b18c2a4f0bf4e1f3fad21a..4f0cac524313cb538a4b1d1b6104f07b2a222518 100644
--- a/entity/BulkMailRecipient_entity/entityfields/status/valueProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/status/valueProcess.js
@@ -4,4 +4,4 @@ import("system.result");
import("KeywordRegistry_basic");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string($KeywordRegistry.bulkMailSentStatus$pending());
\ No newline at end of file
+ result.string($KeywordRegistry.bulkMailRecipientStatus$pending());
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js b/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..545d54ae3e25bb165a6f3ddb70d4d9a7ef7d2b9b
--- /dev/null
+++ b/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("Contact_lib");
+import("system.result");
+
+result.string(ContactUtils.getResolvingDisplaySubSql("BULKMAILRECIPIENT.CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 80fc4d9e397480c63c23e050fe4e2e3a97cc56c7..92fb534f8ba741d4dacd9e69cfb9273085d8c684 100644
--- a/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
+++ b/entity/BulkMailRecipient_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.bulkMailSentStatus(), "BULKMAILRECIPIENT.STATUS");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.bulkMailRecipientStatus(), "BULKMAILRECIPIENT.STATUS");
result.string(sql);
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index d452b364deef2ac3468a4eed08c50a876aa04dcc..155528efdd22eeae5cab9feabc58605d01316dec 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -1,16 +1,26 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>BulkMail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:ENVELOPES</icon>
<title>Bulk mail</title>
+ <contentTitleProcess>%aditoprj%/entity/BulkMail_entity/contentTitleProcess.js</contentTitleProcess>
<recordContainer>db</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>88f8ded7-fe8f-41ef-8e01-030bae0867ee</name>
+ <entityName>BulkMailAddRecipients_entity</entityName>
+ <fieldName>BulkMails</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
</entityProvider>
<entityField>
<name>BULKMAILID</name>
+ <searchable v="false" />
</entityField>
<entityField>
<name>NAME</name>
@@ -29,7 +39,8 @@
<name>DOCUMENTTEMPLATE_ID</name>
<title>Document Template</title>
<consumer>Templates</consumer>
- <mandatory v="true" />
+ <mandatory v="false" />
+ <onValueChange>%aditoprj%/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
<name>Recipients</name>
@@ -52,9 +63,23 @@
<entityName>DocumentTemplate_entity</entityName>
<fieldName>DocumentTemplateProvider</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DocumentTemplateTypeClassification_param</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityField>
<name>STATUS</name>
+ <title>Status</title>
+ <consumer>StatusKeyword</consumer>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>SENDER</name>
@@ -66,18 +91,55 @@
<title>Send</title>
<onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:PAPERPLANE</iconId>
+ <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess>
</entityActionField>
<entityField>
<name>ICON</name>
<contentType>IMAGE</contentType>
+ <searchable v="false" />
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/icon/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>preview</name>
+ <contentType>HTML</contentType>
+ <searchable v="false" />
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/preview/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>StatusKeyword</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/statuskeyword/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>BINDATA</name>
+ <contentType>FILE</contentType>
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bindata/stateProcess.js</stateProcess>
+ </entityField>
+ <entityFieldGroup>
+ <name>subjectPreview</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/subjectpreview/valueProcess.js</valueProcess>
+ <fields>
+ <element>SUBJECT</element>
+ </fields>
+ </entityFieldGroup>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<alias>Data_alias</alias>
<fromClauseProcess>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <onDBDelete>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
<name>6444866d-42ee-4b7b-8536-6dc8f6437c45</name>
@@ -123,6 +185,14 @@
<name>DOCUMENTTEMPLATE_ID.displayValue</name>
<recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.value</name>
+ <recordfield>BULKMAIL.STATUS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.displayValue</name>
+ <expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/BulkMail_entity/contentTitleProcess.js b/entity/BulkMail_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..28fd67de270b497ba718dd4e91766bd22936f67e
--- /dev/null
+++ b/entity/BulkMail_entity/contentTitleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.NAME"));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/bindata/stateProcess.js b/entity/BulkMail_entity/entityfields/bindata/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6dfc93b8846e0309f402d154d1e550f10f9b3a0d
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/bindata/stateProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_EDITABLE;
+if (vars.getString("$field.DOCUMENTTEMPLATE_ID") != "")
+ state = neon.COMPONENTSTATE_READONLY;
+result.string(state);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js b/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..6d1fe433a0ad7b27289c152edd86ce47b2c096f7
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/documenttemplate_id/onValueChange.js
@@ -0,0 +1,17 @@
+import("system.vars");
+import("system.neon");
+import("system.util");
+import("system.mail");
+import("DocumentTemplate_lib");
+import("Entity_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var templateId = ProcessHandlingUtils.getOnValidationValue();
+ var template = DocumentTemplate.loadTemplate(templateId);
+ if (template.type == DocumentTemplate.types.EML)
+ {
+ let subject = mail.parseRFC(util.decodeBase64String(template.content))[mail.MAIL_SUBJECT];
+ neon.setFieldValue("$field.SUBJECT", subject);
+ }
+}
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/icon/valueProcess.js b/entity/BulkMail_entity/entityfields/icon/valueProcess.js
index 020c60c60455d5fc6321066f0a947538b70b09d8..3d5da8ba5f5c8e4be29ccdcb3295de9fd2ecf8b8 100644
--- a/entity/BulkMail_entity/entityfields/icon/valueProcess.js
+++ b/entity/BulkMail_entity/entityfields/icon/valueProcess.js
@@ -4,8 +4,7 @@ import("system.neon");
import("Keyword_lib");
import("KeywordRegistry_basic");
-//var type = vars.getString("$field.ATTRIBUTE_TYPE");
-//var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(type, $KeywordRegistry.attributeType())
-//var icon = keywordAttributes.defaultAvatarRepresentation;
+var type = vars.getString("$field.STATUS");
+var keywordAttributes = KeywordUtils.getAttributeRelationsByKey(type, $KeywordRegistry.bulkMailStatus())
-result.string("VAADIN:ENVELOPE_OPEN");
\ No newline at end of file
+result.string(keywordAttributes.bulkMailIcon);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/preview/displayValueProcess.js b/entity/BulkMail_entity/entityfields/preview/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce4dcb7c1a11f15a189a7201e9feb1bf3fbf7d35
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/preview/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("Employee_lib");
+import("system.vars");
+import("system.result");
+import("DocumentTemplate_lib");
+
+var preview = DocumentTemplate.loadTemplate(vars.get("$field.DOCUMENTTEMPLATE_ID"))
+ .getReplacedContentByContactId(EmployeeUtils.getCurrentContactId());
+
+result.string(preview);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js b/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js
index 007be856cd42401f9157798b5b0118440bc303c1..84cc2e975ffd32302521043c2342a774b0a927cf 100644
--- a/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js
+++ b/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js
@@ -1,4 +1,11 @@
+import("Sql_lib");
+import("system.neon");
import("system.vars");
import("Bulkmail_lib");
+import("system.db");
+import("KeywordRegistry_basic");
-BulkMailUtils.sendBulkMail(vars.get("$field.BULKMAILID"));
\ No newline at end of file
+db.updateData("BULKMAIL", ["STATUS"], null, [$KeywordRegistry.bulkMailStatus$beingSent()],
+ SqlCondition.equals("BULKMAIL.BULKMAILID", vars.get("$field.BULKMAILID"), "1=2"));
+neon.refreshAll();
+BulkMailUtils.sendBulkMailOnServer(vars.get("$field.BULKMAILID"));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js b/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8fb06b7a1c02b912611222575069463cec2c368e
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.neon");
+
+var state = neon.COMPONENTSTATE_EDITABLE;
+if (vars.get("$field.STATUS") == $KeywordRegistry.bulkMailStatus$beingSent())
+ state = neon.COMPONENTSTATE_DISABLED;
+result.string(state);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type/displayValueProcess.js b/entity/BulkMail_entity/entityfields/status/displayValueProcess.js
similarity index 50%
rename from entity/Task_entity/entityfields/type/displayValueProcess.js
rename to entity/BulkMail_entity/entityfields/status/displayValueProcess.js
index b8b8e7a4a31d73bf7c97f1cac68caaaa6da9093f..0dd6bd59e0bb7db1bba471167d20ae5a41cb8423 100644
--- a/entity/Task_entity/entityfields/type/displayValueProcess.js
+++ b/entity/BulkMail_entity/entityfields/status/displayValueProcess.js
@@ -1,6 +1,6 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.taskType(), vars.get("$field.TYPE")));
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.bulkMailStatus(), vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/status/valueProcess.js b/entity/BulkMail_entity/entityfields/status/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2c4fb811282cee3c1fc37c168d8f70f528497570
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/status/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+import("KeywordRegistry_basic");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string($KeywordRegistry.bulkMailStatus$notSent());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js b/entity/BulkMail_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4a018c9980ab872dd7b397a32f74e96875738525
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.bulkMailStatus());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/subjectpreview/valueProcess.js b/entity/BulkMail_entity/entityfields/subjectpreview/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6db9b03be72afa3472c7ea1c868f7b2b0005d3a2
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/subjectpreview/valueProcess.js
@@ -0,0 +1,9 @@
+import("Employee_lib");
+import("system.vars");
+import("system.result");
+import("DocumentTemplate_lib");
+
+var template = new DocumentTemplate(vars.get("$field.SUBJECT"), DocumentTemplate.types.PLAIN);
+var subject = template.getReplacedContentByContactId(EmployeeUtils.getCurrentContactId());
+
+result.string(subject);
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetype_param/valueProcess.js b/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..193d92392110a0ad0ccbd9b533e2226c4060dae0
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.documentTemplateType$mail());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetypeclassification_param/valueProcess.js b/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetypeclassification_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d817901f1b2467cec7d38865f9cc054ddadd2dcd
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/templates/children/documenttemplatetypeclassification_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string($KeywordRegistry.documentTemplateTypeCategory$serial());
\ No newline at end of file
diff --git a/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js b/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..0ff74f9c6b2f007c25a9ec2b6e6364c075896980
--- /dev/null
+++ b/entity/BulkMail_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Sql_lib");
+import("system.db");
+
+db.deleteData("BULKMAILRECIPIENT", SqlCondition.equals("BULKMAILRECIPIENT.BULKMAIL_ID", vars.get("$local.uid"), "1=2"));
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
similarity index 81%
rename from entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
rename to entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
index 8f9ef6854e6d5c7f94f11bd1eec4865d67074b17..3c0e56dba1c4f80d2feac92dcac3937ea6010123 100644
--- a/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js
+++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskType(), "TASK.TYPE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.bulkMailStatus(), "BULKMAIL.STATUS");
result.string(sql);
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index fee661d3cb7f4aad87fef6fca2661846055e740a..63b22ddb2f51715171723bb74150bbf96e476d4c 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignAddParticipants_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Add participants to Campaign</title>
@@ -95,16 +95,6 @@
<entityName>CampaignAnalysis_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>campaignParticipants_param</name>
- <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>campaignStepId_param</name>
- <valueProcess>%aditoprj%/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityConsumer>
<entityField>
<name>campaignStepCurrentParticipantCount</name>
@@ -138,9 +128,11 @@
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<onInsert>%aditoprj%/entity/CampaignAddParticipants_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <recordFields>
- <element>UID.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js
deleted file mode 100644
index 15cd7f0e5db1eb1c0ac68bde896c552d9fd7ff01..0000000000000000000000000000000000000000
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignparticipants_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$param.campaignParticipants_param"));
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js b/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js
deleted file mode 100644
index c082bd783cf9b494980ed91f842fc666d31c0e9c..0000000000000000000000000000000000000000
--- a/entity/CampaignAddParticipants_entity/entityfields/campaignanalyses/children/campaignstepid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CAMPAIGNSTEP_ID"));
\ No newline at end of file
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index cc4d4945a0e16e6cf6eff716e00a1b6ba203bc7b..e4baa6b8470fcc6fe4e4b9810650b32a2ed115fe 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignAnalysis_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
@@ -105,9 +105,11 @@
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/CampaignAnalysis_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 92567d30062a64f848555f0337b777da43d74958..2e53c1bc71540cdea248723c6d9c9cf8bb428ce8 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignCostChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
@@ -46,13 +46,23 @@
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/CampaignCostChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT.value</element>
- <element>X.value</element>
- <element>X.displayValue</element>
- <element>Y.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>X.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>X.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Y.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
index 1bace191a21df6819ecf6e85dd26e426793faf89..21ee34366ada71acb960cc4c41fdf883b33f25d2 100644
--- a/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
+++ b/entity/CampaignCost_entitiy/CampaignCost_entitiy.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignCost_entitiy</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<afterOperatingState>%aditoprj%/entity/CampaignCost_entitiy/afterOperatingState.js</afterOperatingState>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index ab83da1ad00fb247f8c09d25aba122936c928304..e6b9baa9342738f86c488a745e687b6fcbed7aaa 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignCost_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index bdf9f42fea1814b4fc877f6cfa23cb8c2528ac1b..a9bbef20979d2a943c3613cc9d8d94321deb0338 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -1,61 +1,73 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>CampaignParticipantChart_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <siblings>
- <element>CampaignParticipant_entity</element>
- <element>CampaignStep_entity</element>
- <element>CampaignAddParticipants_entity</element>
- </siblings>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityProvider>
- <name>ParticipantChart</name>
- <dependencies>
- <entityDependency>
- <name>59e7c7ff-a649-4efe-89dd-8fdb7967261b</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>CampaignParticipantsChart</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>X</name>
- <title>Step</title>
- </entityField>
- <entityField>
- <name>Y</name>
- </entityField>
- <entityField>
- <name>CATEGORY</name>
- </entityField>
- <entityParameter>
- <name>CampaignId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>CATEGORY.value</element>
- <element>CATEGORY.displayValue</element>
- <element>X.value</element>
- <element>X.displayValue</element>
- <element>Y.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>CampaignParticipantChart_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <siblings>
+ <element>CampaignParticipant_entity</element>
+ <element>CampaignStep_entity</element>
+ <element>CampaignAddParticipants_entity</element>
+ </siblings>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>ParticipantChart</name>
+ <dependencies>
+ <entityDependency>
+ <name>59e7c7ff-a649-4efe-89dd-8fdb7967261b</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>CampaignParticipantsChart</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>X</name>
+ <title>Step</title>
+ </entityField>
+ <entityField>
+ <name>Y</name>
+ </entityField>
+ <entityField>
+ <name>CATEGORY</name>
+ </entityField>
+ <entityParameter>
+ <name>CampaignId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/CampaignParticipantChart_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CATEGORY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CATEGORY.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>X.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>X.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Y.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 311b171cc9178dc8d6e363e1ff9a99c77adcd5fc..1d20c0877f43174e64a3d1fb3ec1de4efc994263 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignParticipant_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Participant</title>
@@ -194,12 +194,6 @@
<entityName>CommRestriction_Entity</entityName>
<fieldName>PersonsCommRestriction</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/participantscommrestiction/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
</entityConsumer>
<entityConsumer>
<name>CommRestrictionIcon</name>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index 5ac18577c7654e60734f15e98e20b5f272489dce..e492212bd9a2e1a9b32e60fb852a1be527a08ad2 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CampaignStep_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>NEON:GROUP_APPOINTMENT</icon>
@@ -63,7 +63,6 @@
<inputFormat>dd.MM.yyyy</inputFormat>
<mandatory v="true" />
<valueProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>DATE_END</name>
diff --git a/entity/CampaignStep_entity/entityfields/date_end/onValidation.js b/entity/CampaignStep_entity/entityfields/date_end/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/CampaignStep_entity/entityfields/date_start/onValidation.js b/entity/CampaignStep_entity/entityfields/date_start/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js b/entity/CampaignStep_entity/entityfields/date_start/onValueChange.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index c4b80061c6532d48d0c6c824a61d970937e0d1aa..562889587aaa52565ad4c4122fc71fa54df8b6f0 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Campaign_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GROUP</icon>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 1516814ecd0ca42abda6d9ec05ccb9e441a93e9e..326346715cc5967f7a68b33e831ec57b126b9603 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -1,162 +1,182 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>ClassificationAdmin_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:LIST_OL</icon>
- <title>Classification</title>
- <grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
- <contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
- <titlePlural>Classifications</titlePlural>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <title>Usage</title>
- <consumer>KeywordClassificationTypes</consumer>
- <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CLASSIFICATIONID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CLASSIFICATIONSCORE_ID</name>
- <title>Selection</title>
- <consumer>ClassificationScores</consumer>
- <searchable v="false" />
- <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
- <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>ClassificationType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>CLASSIFICATIONTYPEID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CLASSIFICATIONGROUP</name>
- <contentType>TEXT</contentType>
- <groupable v="true" />
- <mandatoryProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
- <dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js</dropDownProcess>
- <textInputAllowed v="true" />
- <searchable v="false" />
- <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
- <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>CLASSIFICATIONTYPE_ID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_ROWID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_TYPE</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>KeywordClassificationTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ClassificationScores</name>
- <state>EDITABLE</state>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationScore_entity</entityName>
- <fieldName>ClassificationScores</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ClassificationGroup_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClassificationTypeId_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClassificationType_param</name>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>CLASSIFICATIONTYPE</name>
- <title>Usage</title>
- <consumer>KeywordClassificationTypes</consumer>
- <groupable v="true" />
- <mandatory v="true" />
- <searchable v="true" />
- <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>SCORETYPE</name>
- <title>Scoretype</title>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <isFilterable v="true" />
- <isRequireContainerFiltering v="true" />
- <contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>CLASSIFICATIONID.value</element>
- <element>CLASSIFICATIONGROUP.value</element>
- <element>CLASSIFICATIONSCORE_ID.value</element>
- <element>CLASSIFICATIONTYPEID.value</element>
- <element>CLASSIFICATIONTYPE_ID.value</element>
- <element>OBJECT_TYPE.value</element>
- <element>OBJECT_ROWID.value</element>
- <element>SCORETYPE.value</element>
- <element>CLASSIFICATIONTYPE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>ClassificationAdmin_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:LIST_OL</icon>
+ <title>Classification</title>
+ <grantDeleteProcess>%aditoprj%/entity/ClassificationAdmin_entity/grantDeleteProcess.js</grantDeleteProcess>
+ <contentTitleProcess>%aditoprj%/entity/ClassificationAdmin_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Classifications</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <title>Usage</title>
+ <consumer>KeywordClassificationTypes</consumer>
+ <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/uid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONSCORE_ID</name>
+ <title>Selection</title>
+ <consumer>ClassificationScores</consumer>
+ <searchable v="false" />
+ <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>CLASSIFICATIONTYPEID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONGROUP</name>
+ <contentType>TEXT</contentType>
+ <groupable v="true" />
+ <mandatoryProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
+ <dropDownProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
+ <searchable v="false" />
+ <titleProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationgroup/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONTYPE_ID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordClassificationTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ClassificationScores</name>
+ <state>EDITABLE</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ClassificationGroup_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>CLASSIFICATIONTYPE</name>
+ <title>Usage</title>
+ <consumer>KeywordClassificationTypes</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <searchable v="true" />
+ <stateProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>SCORETYPE</name>
+ <title>Scoretype</title>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ClassificationAdmin_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <isFilterable v="true" />
+ <isRequireContainerFiltering v="true" />
+ <contentProcess>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/ClassificationAdmin_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONGROUP.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONSCORE_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONTYPEID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONTYPE_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SCORETYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONTYPE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js b/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js
index c4b352e1b6d58a78c7d1d9a1d8c6cc20df770045..70cf0982fcbe50bb94b9b063b5d02e70acf43c3d 100644
--- a/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js
+++ b/entity/ClassificationAdmin_entity/entityfields/classificationscore_id/displayValueProcess.js
@@ -1,9 +1,13 @@
+import("system.vars");
import("system.translate");
import("Sql_lib");
import("system.db");
import("system.result");
-// TODO: loadEntity / #Title
-result.string(translate.text(db.cell(SqlCondition.begin()
- .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
- .buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
\ No newline at end of file
+if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
+{
+ // TODO: loadEntity / #Title
+ result.string(translate.text(db.cell(SqlCondition.begin()
+ .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
+ .buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
+}
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0330196cf9add7b4919be04dfcf755c8b5117554
--- /dev/null
+++ b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
@@ -0,0 +1,71 @@
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>ClassificationGroupAnalyses_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>GroupAnalyses</name>
+ <dependencies>
+ <entityDependency>
+ <name>c20a7d8b-00ab-4edf-adf5-89fc94385e65</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>ClassificationGroupChart</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>SCORE</name>
+ </entityField>
+ <entityField>
+ <name>GROUP</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>GROUP.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>GROUP.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SCORE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js b/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce766e6646d01313ec7914dd4c9a2d110db92ef1
--- /dev/null
+++ b/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js
@@ -0,0 +1,3 @@
+import("system.vars");
+import("system.result");
+result.string(vars.get("$field.UID"))
\ No newline at end of file
diff --git a/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js b/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a700eb1a2e5ce3f02ff141471af827a4e8fe2a43
--- /dev/null
+++ b/entity/ClassificationGroupAnalyses_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,15 @@
+import("system.result");
+import("system.vars");
+import("Classification_lib");
+
+var scores = ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param"));
+var data = [];
+
+for (group in scores)
+{
+ logging.log(group);
+
+ data.push([group, group, group, scores[group]]);
+}
+
+result.object(data);
\ No newline at end of file
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index be9d978d0b8ac277faca76a002d004a667e58b6f..1b996284bf944955cf5c8e468904e7accb178afa 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -1,125 +1,125 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>ClassificationScore_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Possible Value</title>
- <contentTitleProcess>%aditoprj%/entity/ClassificationScore_entity/contentTitleProcess.js</contentTitleProcess>
- <titlePlural>Possible Values</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>CLASSIFICATIONSCOREID</name>
- <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TITLE</name>
- <title>Title</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>CLASSIFICATIONTYPE_ID</name>
- <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>SORT</name>
- <title>Sorting</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>SCORE</name>
- <title>Score</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <mandatory v="true" />
- <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
- </entityField>
- <entityProvider>
- <name>ClassificationScores</name>
- <children>
- <entityParameter>
- <name>ClassificationGroup_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ClassificationTypeId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ClassificationType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ClassificationTypeId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>MaxValue</name>
- <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ClassificationGroup_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ClassificationType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBDelete>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
- <tableName>CLASSIFICATIONSCORE</tableName>
- <primaryKey>CLASSIFICATIONSCOREID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CLASSIFICATIONSCOREID.value</name>
- <recordfield>CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SCORE.value</name>
- <recordfield>CLASSIFICATIONSCORE.SCORE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SORT.value</name>
- <recordfield>CLASSIFICATIONSCORE.SORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TITLE.value</name>
- <recordfield>CLASSIFICATIONSCORE.TITLE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CLASSIFICATIONTYPE_ID.value</name>
- <recordfield>CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CLASSIFICATIONTYPE_ID.displayValue</name>
- <expression>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>ClassificationScore_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Possible Value</title>
+ <contentTitleProcess>%aditoprj%/entity/ClassificationScore_entity/contentTitleProcess.js</contentTitleProcess>
+ <titlePlural>Possible Values</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONSCOREID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationscoreid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Title</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONTYPE_ID</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/classificationtype_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>SORT</name>
+ <title>Sorting</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>SCORE</name>
+ <title>Score</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <mandatory v="true" />
+ <onValidation>%aditoprj%/entity/ClassificationScore_entity/entityfields/score/onValidation.js</onValidation>
+ </entityField>
+ <entityProvider>
+ <name>ClassificationScores</name>
+ <children>
+ <entityParameter>
+ <name>ClassificationGroup_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>MaxValue</name>
+ <valueProcess>%aditoprj%/entity/ClassificationScore_entity/entityfields/maxvalue/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ClassificationGroup_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBDelete>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>e2fecaf8-bc95-4a4d-bd96-88731568b1a4</name>
+ <tableName>CLASSIFICATIONSCORE</tableName>
+ <primaryKey>CLASSIFICATIONSCOREID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONSCOREID.value</name>
+ <recordfield>CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SCORE.value</name>
+ <recordfield>CLASSIFICATIONSCORE.SCORE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SORT.value</name>
+ <recordfield>CLASSIFICATIONSCORE.SORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>CLASSIFICATIONSCORE.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONTYPE_ID.value</name>
+ <recordfield>CLASSIFICATIONSCORE.CLASSIFICATIONTYPE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONTYPE_ID.displayValue</name>
+ <expression>%aditoprj%/entity/ClassificationScore_entity/recordcontainers/db/recordfieldmappings/classificationtype_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index 709a5f6c23edc95af52f3b7c2cbe2c3cc04ec661..814bc382af73e23d1528386c2993f3371d9a2dd5 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -1,48 +1,48 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>ClassificationType_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>CLASSIFICATIONTYPEID</name>
- </entityField>
- <entityField>
- <name>TYPE</name>
- </entityField>
- <entityField>
- <name>CLASS</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <linkInformation>
- <linkInformation>
- <name>0a0944fd-a72f-4c95-8c42-b1e7d3e17721</name>
- <tableName>CLASSIFICATIONTYPE</tableName>
- <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CLASSIFICATIONTYPEID.value</name>
- <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CLASS.value</name>
- <recordfield>CLASSIFICATIONTYPE.CLASS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.value</name>
- <recordfield>CLASSIFICATIONTYPE.TYPE</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>ClassificationType_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONTYPEID</name>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ </entityField>
+ <entityField>
+ <name>CLASS</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <linkInformation>
+ <linkInformation>
+ <name>0a0944fd-a72f-4c95-8c42-b1e7d3e17721</name>
+ <tableName>CLASSIFICATIONTYPE</tableName>
+ <primaryKey>CLASSIFICATIONTYPEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATIONTYPEID.value</name>
+ <recordfield>CLASSIFICATIONTYPE.CLASSIFICATIONTYPEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASS.value</name>
+ <recordfield>CLASSIFICATIONTYPE.CLASS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <recordfield>CLASSIFICATIONTYPE.TYPE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index adabefdf45eb803de412c6ada06e7022590da840..c491ad8e7c2359cafb7f3edd36b5614b19a7e1e2 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -1,182 +1,204 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Classification_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Classification</title>
- <grantDelete v="false" />
- <afterOperatingState>%aditoprj%/entity/Classification_entity/afterOperatingState.js</afterOperatingState>
- <titlePlural>Classifications</titlePlural>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>CLASSIFICATIONID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CLASSIFICATIONSCORE_ID</name>
- <title>Selection</title>
- <consumer>ClassificationScores</consumer>
- <searchable v="false" />
- <titleProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
- <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>ClassificationType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Classifications</name>
- <dependencies>
- <entityDependency>
- <name>6274acfa-3dbf-4a9b-8926-2a2d1ff80d6d</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Classifications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CLASSIFICATIONTYPEID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CLASSIFICATIONGROUP</name>
- <title>Group name</title>
- <contentType>TEXT</contentType>
- <groupable v="true" />
- <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
- <textInputAllowed v="true" />
- <searchable v="false" />
- <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CLASSIFICATIONTYPE_ID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_ROWID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_TYPE</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_type/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>UID</name>
- <searchable v="false" />
- </entityField>
- <entityConsumer>
- <name>ClassificationScores</name>
- <dependency>
- <name>dependency</name>
- <entityName>ClassificationScore_entity</entityName>
- <fieldName>ClassificationScores</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ClassificationGroup_param</name>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClassificationTypeId_param</name>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClassificationType_param</name>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>CLASSIFICATIONTYPE</name>
- <title>Usage</title>
- <consumer>KeywordClassificationTypes</consumer>
- <groupable v="true" />
- <mandatory v="true" />
- <searchable v="true" />
- <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>Info</name>
- <title>Rating</title>
- <contentType>HTML</contentType>
- <searchable v="false" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/info/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SCORE_RESULTS</name>
- <searchable v="false" />
- </entityField>
- <entityConsumer>
- <name>KeywordClassificationTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>SCORETYPE</name>
- <title>Scoretype</title>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>GroupScore</name>
- <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/groupscore/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <isFilterable v="true" />
- <isRequireContainerFiltering v="true" />
- <contentProcess>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onUpdate>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <recordFields>
- <element>UID.value</element>
- <element>CLASSIFICATIONID.value</element>
- <element>CLASSIFICATIONGROUP.value</element>
- <element>CLASSIFICATIONSCORE_ID.value</element>
- <element>CLASSIFICATIONTYPEID.value</element>
- <element>CLASSIFICATIONTYPE_ID.value</element>
- <element>OBJECT_ROWID.value</element>
- <element>OBJECT_TYPE.value</element>
- <element>SCORETYPE.value</element>
- <element>CLASSIFICATIONTYPE.value</element>
- <element>SCORE_RESULTS.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Classification_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Classification</title>
+ <grantDelete v="false" />
+ <afterOperatingState>%aditoprj%/entity/Classification_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Classifications</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONSCORE_ID</name>
+ <title>Selection</title>
+ <consumer>ClassificationScores</consumer>
+ <searchable v="false" />
+ <titleProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Classifications</name>
+ <dependencies>
+ <entityDependency>
+ <name>6274acfa-3dbf-4a9b-8926-2a2d1ff80d6d</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Classifications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CLASSIFICATIONTYPEID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtypeid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONGROUP</name>
+ <title>Group name</title>
+ <contentType>TEXT</contentType>
+ <groupable v="true" />
+ <mandatoryProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/mandatoryProcess.js</mandatoryProcess>
+ <textInputAllowed v="true" />
+ <searchable v="false" />
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationgroup/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATIONTYPE_ID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityConsumer>
+ <name>ClassificationScores</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ClassificationScore_entity</entityName>
+ <fieldName>ClassificationScores</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ClassificationGroup_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationgroup_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationTypeId_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationtypeid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ClassificationType_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationscores/children/classificationtype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>CLASSIFICATIONTYPE</name>
+ <title>Usage</title>
+ <consumer>KeywordClassificationTypes</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <searchable v="true" />
+ <stateProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/classificationtype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>Info</name>
+ <title>Rating</title>
+ <contentType>HTML</contentType>
+ <searchable v="false" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/info/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SCORE_RESULTS</name>
+ <searchable v="false" />
+ </entityField>
+ <entityConsumer>
+ <name>KeywordClassificationTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/keywordclassificationtypes/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>SCORETYPE</name>
+ <title>Scoretype</title>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Classification_entity/entityfields/scoretype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>GroupScore</name>
+ <valueProcess>%aditoprj%/entity/Classification_entity/entityfields/groupscore/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <isFilterable v="true" />
+ <isRequireContainerFiltering v="true" />
+ <contentProcess>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onUpdate>%aditoprj%/entity/Classification_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONGROUP.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONSCORE_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONTYPEID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONTYPE_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SCORETYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CLASSIFICATIONTYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SCORE_RESULTS.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js b/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js
index c4b352e1b6d58a78c7d1d9a1d8c6cc20df770045..1b0f11a548cc9dc03e46f49851ba078681916eef 100644
--- a/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js
+++ b/entity/Classification_entity/entityfields/classificationscore_id/displayValueProcess.js
@@ -1,9 +1,18 @@
+import("system.vars");
import("system.translate");
import("Sql_lib");
import("system.db");
import("system.result");
-// TODO: loadEntity / #Title
-result.string(translate.text(db.cell(SqlCondition.begin()
- .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
- .buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
\ No newline at end of file
+// no need to load, if no classificationscore exists
+if (vars.get("$field.CLASSIFICATIONSCORE_ID"))
+{
+ // TODO: loadEntity / #Title
+ result.string(translate.text(db.cell(SqlCondition.begin()
+ .andPrepareVars("CLASSIFICATIONSCORE.CLASSIFICATIONSCOREID", "$field.CLASSIFICATIONSCORE_ID")
+ .buildSql("select TITLE from CLASSIFICATIONSCORE", "1=2"))));
+}
+else
+{
+ result.string("");
+}
diff --git a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
index 1229456ff30baa01cc756147427c85d4d04aecfd..1fc228180126c76ef7ffa696dd0323d8995d87e9 100644
--- a/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Classification_entity/recordcontainers/jdito/contentProcess.js
@@ -7,8 +7,6 @@ import("system.result");
var scores = JSON.stringify(ClassificationUtils.getScore(vars.get("$param.ClassificationType_param"), vars.get("$param.ObjectType_param"), vars.get("$param.ObjectRowid_param")));
-
-
var classificationId;
var classificationTypeId;
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index add6c9e7b970354b80feeb281fdfb4a5181a7efe..1a8b84f38b1c98856bf5350b722ce205e1e4ec60 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>CommRestriction_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Advertising ban</title>
@@ -19,7 +19,6 @@
<title>Advertising ban</title>
<consumer>CommRestrictionMedium</consumer>
<mandatory v="true" />
- <valueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/medium/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/CommRestriction_Entity/entityfields/medium/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
diff --git a/entity/CommRestriction_Entity/entityfields/medium/valueProcess.js b/entity/CommRestriction_Entity/entityfields/medium/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index d43ae1b7879416f243ab001f22e8decd4b7935ea..c982f10eed1e31afadb2e2221a9554e9f65cd2d8 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,282 +1,282 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Communication_entity</name>
- <description>former Comm</description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Communication</title>
- <contentTitleProcess>%aditoprj%/entity/Communication_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityField>
- <name>ADDR</name>
- <title>${COMM_ADDRESS}</title>
- <contentTypeProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Communication_entity/entityfields/addr/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- <onValidation>%aditoprj%/entity/Communication_entity/entityfields/addr/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>COMMUNICATIONID</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/communicationid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>MEDIUM_ID</name>
- <title>Medium</title>
- <consumer>KeywordMediums</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contact_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STANDARD</name>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/standard/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
- </entityParameter>
- <entityField>
- <name>IS_STANDARD</name>
- <contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/is_standard/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityParameter>
- <name>ContactsMainCountry_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js</valueProcess>
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>AllCommunications</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>22dd8c4d-2081-4547-adbd-929868f23069</name>
- <entityName>Person_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a22c32e2-6d76-4e79-8c71-251ee381b22e</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Communications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>CommCategory_param</name>
- <expose v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>PhoneCommunications</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0eed17a6-443e-4469-a53b-3ce81440d7d0</name>
- <entityName>Person_entity</entityName>
- <fieldName>PhoneCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>CommCategory_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>EmailCommunications</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f8cc4865-ab08-4540-bd02-2b2c92946c84</name>
- <entityName>Person_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b5ebddec-002b-40a5-a760-cedb78e94cfb</name>
- <entityName>Email_entity</entityName>
- <fieldName>EmailAddresses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>CommCategory_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
-Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>CommCategory_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>CommMediumIds_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js</valueProcess>
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>KeywordMediums</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <linkInformation>
- <linkInformation>
- <name>5f6cd42e-34d5-4a1c-b9f0-8c87bf914f22</name>
- <tableName>COMMUNICATION</tableName>
- <primaryKey>COMMUNICATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>fd493a1b-3ff1-4e7e-8d21-0f9f28824e9e</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ADDR.value</name>
- <recordfield>COMMUNICATION.ADDR</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MEDIUM_ID.value</name>
- <recordfield>COMMUNICATION.MEDIUM_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COMMUNICATIONID.value</name>
- <recordfield>COMMUNICATION.COMMUNICATIONID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>COMMUNICATION.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STANDARD.value</name>
- <recordfield>COMMUNICATION.STANDARD</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MEDIUM_ID.displayValue</name>
- <expression>%aditoprj%/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>COMMUNICATION.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>COMMUNICATION.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>COMMUNICATION.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>COMMUNICATION.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Communication_entity</name>
+ <description>former Comm</description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Communication</title>
+ <contentTitleProcess>%aditoprj%/entity/Communication_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>ADDR</name>
+ <title>${COMM_ADDRESS}</title>
+ <contentTypeProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/contentTypeProcess.js</contentTypeProcess>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/addr/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Communication_entity/entityfields/addr/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Communication_entity/entityfields/addr/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>COMMUNICATIONID</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/communicationid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>MEDIUM_ID</name>
+ <title>Medium</title>
+ <consumer>KeywordMediums</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Communication_entity/entityfields/medium_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STANDARD</name>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/standard/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ </entityParameter>
+ <entityField>
+ <name>IS_STANDARD</name>
+ <contentType>BOOLEAN</contentType>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityParameter>
+ <name>ContactsMainCountry_param</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/contactsmaincountry_param/valueProcess.js</valueProcess>
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>AllCommunications</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>070b2457-3766-4c8a-b43f-a2bf7c9ef638</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Communications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>22dd8c4d-2081-4547-adbd-929868f23069</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Communications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a22c32e2-6d76-4e79-8c71-251ee381b22e</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Communications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>CommCategory_param</name>
+ <expose v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>PhoneCommunications</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7382242a-aa18-4a31-ab77-69a79f2b97b8</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>PhoneCommunications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>0eed17a6-443e-4469-a53b-3ce81440d7d0</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>PhoneCommunications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>CommCategory_param</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/phonecommunications/children/commcategory_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>EmailCommunications</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>ecfbf518-fe92-4661-8ebe-e2d3c8d259e1</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f8cc4865-ab08-4540-bd02-2b2c92946c84</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b5ebddec-002b-40a5-a760-cedb78e94cfb</name>
+ <entityName>Email_entity</entityName>
+ <fieldName>EmailAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>CommCategory_param</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/emailcommunications/children/commcategory_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>CommCategory_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>CommMediumIds_param</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/commmediumids_param/valueProcess.js</valueProcess>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordMediums</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/keywordmediums/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Communication_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Communication_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Communication_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <linkInformation>
+ <linkInformation>
+ <name>5f6cd42e-34d5-4a1c-b9f0-8c87bf914f22</name>
+ <tableName>COMMUNICATION</tableName>
+ <primaryKey>COMMUNICATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>fd493a1b-3ff1-4e7e-8d21-0f9f28824e9e</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ADDR.value</name>
+ <recordfield>COMMUNICATION.ADDR</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MEDIUM_ID.value</name>
+ <recordfield>COMMUNICATION.MEDIUM_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>COMMUNICATIONID.value</name>
+ <recordfield>COMMUNICATION.COMMUNICATIONID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>COMMUNICATION.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STANDARD.value</name>
+ <recordfield>COMMUNICATION.STANDARD</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MEDIUM_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Communication_entity/recordcontainers/db/recordfieldmappings/medium_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>COMMUNICATION.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>COMMUNICATION.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>COMMUNICATION.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>COMMUNICATION.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index 58e9516bafc743b2d69d9f504e41b5f947ce8456..4a14c5559c34fba10b5815ac0d73956fe4c2d5c1 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Competition_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Competition</title>
@@ -74,12 +74,6 @@
<entityName>Organisation_entity</entityName>
<fieldName>WithPersonIdFilter</fieldName>
</dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
</entityConsumer>
<entityConsumer>
<name>Organisations</name>
@@ -225,10 +219,6 @@
<name>DisplaySimpleName_param</name>
<valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
</entityParameter>
- <entityParameter>
- <name>FilteredAttributes_param</name>
- <valueProcess>%aditoprj%/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js</valueProcess>
- </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Competition_entity/conditionProcess.js b/entity/Competition_entity/conditionProcess.js
deleted file mode 100644
index 06351bcd091229f24464069f37205e1f35a7c5ee..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/conditionProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = new SqlCondition();
-cond.andPrepareVars("COMPETITION.OBJECT_ROWID", "$param.ObjectRowId_param");
-
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js b/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
deleted file mode 100644
index 4c3c4db34af5e5049ddd9303f9fb7d53a835809b..0000000000000000000000000000000000000000
--- a/entity/Competition_entity/entityfields/attributes/children/filteredattributes_param/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-
-result.object([
- '8af37871-d407-4414-98ad-e64dbaa5794a', // Price politics
- '558419b2-6113-4060-b88d-cc6324754765', // Strength
- '71226196-2812-4d70-b90f-c3e2c14fd4d1' // Weakness
-]);
\ No newline at end of file
diff --git a/entity/Competition_entity/fromClauseProcess.js b/entity/Competition_entity/fromClauseProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index bca4ad2a30749ccefe180b086a85d20ddb229195..b35fefad6f321819237e8732e75d8c8a3e8dfbc2 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,299 +1,299 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Contact_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
- <title>Contact</title>
- <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
- <iconId>VAADIN:USERS</iconId>
- <titlePlural>Contacts</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>ccbf2270-c30c-458e-8a99-bf0cdcc89689</name>
- <entityName>Object_entity</entityName>
- <fieldName>Persons</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CONTACTID</name>
- </entityField>
- <entityField>
- <name>ORGANISATION_ID</name>
- <title>Company</title>
- <consumer>Organisations</consumer>
- <mandatory v="false" />
- <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>PERSON_ID</name>
- <title>Contact</title>
- <mandatory v="true" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DEPARTMENT</name>
- <title>Department</title>
- <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
- <textInputAllowed v="true" />
- </entityField>
- <entityField>
- <name>POSITION</name>
- <title>Position</title>
- <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
- <textInputAllowed v="true" />
- </entityField>
- <entityField>
- <name>CONTACTROLE</name>
- <title>Contactrole</title>
- <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
- <textInputAllowed v="true" />
- </entityField>
- <entityConsumer>
- <name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>WithPersonIdFilter</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ExcludeOrganisationsByPersonId</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>PersonId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>PersonRelated</name>
- <children>
- <entityParameter>
- <name>OwnContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>ADDRESS_ID</name>
- <title>standard address</title>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PERSON_TITLE</name>
- <title>Person</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_title/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>Communications</name>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>AllCommunications</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ContactAddresses</name>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>ContactAddresses</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>LANGUAGE</name>
- <title>Language</title>
- <consumer>Languages</consumer>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
- <entityProvider>
- <name>PersonsContactsExceptOwn</name>
- <targetContextField>targetContext</targetContextField>
- <targetIdField>CONTACTID</targetIdField>
- <titlePlural>Other Contactroles</titlePlural>
- <dependencies>
- <entityDependency>
- <name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
- <entityName>Person_entity</entityName>
- <fieldName>OtherContacts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>PersonId_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>OwnContactId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>targetContext</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STATUS</name>
- <title>Status</title>
- <consumer>KeywordContactStates</consumer>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>KeywordContactStates</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>LanguageKey_param</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>31dbd8d8-b10c-4621-ab45-b735216f078f</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>31948bfb-2fe9-4345-a65c-14ad49ffbc0e</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CONTACTID.value</name>
- <recordfield>CONTACT.CONTACTID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORGANISATION_ID.value</name>
- <recordfield>CONTACT.ORGANISATION_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_ID.value</name>
- <recordfield>CONTACT.PERSON_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DEPARTMENT.value</name>
- <recordfield>CONTACT.DEPARTMENT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>POSITION.value</name>
- <recordfield>CONTACT.POSITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACTROLE.value</name>
- <recordfield>CONTACT.CONTACTROLE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESS_ID.value</name>
- <recordfield>CONTACT.ADDRESS_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <recordfield>CONTACT.LANGUAGE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATUS.value</name>
- <recordfield>CONTACT.STATUS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>CONTACT.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>CONTACT.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>CONTACT.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>CONTACT.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORGANISATION_ID.displayValue</name>
- <recordfield>ORGANISATION.NAME</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Contact_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
+ <title>Contact</title>
+ <onValidation>%aditoprj%/entity/Contact_entity/onValidation.js</onValidation>
+ <iconId>VAADIN:USERS</iconId>
+ <titlePlural>Contacts</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>ccbf2270-c30c-458e-8a99-bf0cdcc89689</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Persons</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CONTACTID</name>
+ </entityField>
+ <entityField>
+ <name>ORGANISATION_ID</name>
+ <title>Company</title>
+ <consumer>Organisations</consumer>
+ <mandatory v="false" />
+ <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>PERSON_ID</name>
+ <title>Contact</title>
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DEPARTMENT</name>
+ <title>Department</title>
+ <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/department/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
+ </entityField>
+ <entityField>
+ <name>POSITION</name>
+ <title>Position</title>
+ <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/position/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
+ </entityField>
+ <entityField>
+ <name>CONTACTROLE</name>
+ <title>Contactrole</title>
+ <dropDownProcess>%aditoprj%/entity/Contact_entity/entityfields/contactrole/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
+ </entityField>
+ <entityConsumer>
+ <name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>WithPersonIdFilter</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludeOrganisationsByPersonId</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisations/children/excludeorganisationsbypersonid/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>PersonId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>PersonRelated</name>
+ <children>
+ <entityParameter>
+ <name>OwnContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>ADDRESS_ID</name>
+ <title>standard address</title>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PERSON_TITLE</name>
+ <title>Person</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/person_title/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Communications</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>AllCommunications</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContactAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>ContactAddresses</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/contactaddresses/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>LANGUAGE</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityProvider>
+ <name>PersonsContactsExceptOwn</name>
+ <targetContextField>targetContext</targetContextField>
+ <targetIdField>CONTACTID</targetIdField>
+ <titlePlural>Other Contactroles</titlePlural>
+ <dependencies>
+ <entityDependency>
+ <name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>OtherContacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>PersonId_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/personscontactsexceptown/children/personid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>OwnContactId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>targetContext</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STATUS</name>
+ <title>Status</title>
+ <consumer>KeywordContactStates</consumer>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordContactStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/keywordcontactstates/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>LanguageKey_param</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/languagekey_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Contact_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>31dbd8d8-b10c-4621-ab45-b735216f078f</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>31948bfb-2fe9-4345-a65c-14ad49ffbc0e</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CONTACTID.value</name>
+ <recordfield>CONTACT.CONTACTID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGANISATION_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DEPARTMENT.value</name>
+ <recordfield>CONTACT.DEPARTMENT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>POSITION.value</name>
+ <recordfield>CONTACT.POSITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACTROLE.value</name>
+ <recordfield>CONTACT.CONTACTROLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS_ID.value</name>
+ <recordfield>CONTACT.ADDRESS_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.value</name>
+ <recordfield>CONTACT.LANGUAGE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.value</name>
+ <recordfield>CONTACT.STATUS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>CONTACT.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>CONTACT.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>CONTACT.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>CONTACT.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORGANISATION_ID.displayValue</name>
+ <recordfield>ORGANISATION.NAME</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index b523e417f1ad47d6ae0a1506897827d012f7b1cf..b7ac9888dcecf6a52d77d0f9c5aa99f852faead9 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,144 +1,150 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Context_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
- <contentTitleProcess>%aditoprj%/entity/Context_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f1eebe8c-93d2-4977-b619-b6315f843f7a</name>
- <entityName>AttributeUsage_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <title>Context id</title>
- </entityField>
- <entityField>
- <name>CONTEXT_NAME</name>
- <title>Context name</title>
- </entityField>
- <entityProvider>
- <name>Context</name>
- <dependencies>
- <entityDependency>
- <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
- <entityName>ObjectRelationType_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>209539e0-15ad-47eb-9175-a3aaa5af13fc</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8183e19e-c8cc-45d8-9763-417eaeffb940</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4543a0ae-7bd2-4c70-8eaf-d4f32e014173</name>
- <entityName>Member_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>420468aa-c237-4e29-a24f-8851e56343b9</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ExclusiveContexts_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ExclusiveContexts_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>ActivityLinkable</name>
- <dependencies>
- <entityDependency>
- <name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
- <entityName>ActivityLink_entity</entityName>
- <fieldName>Context</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ExclusiveContexts_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>TaskLinkable</name>
- <dependencies>
- <entityDependency>
- <name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Contexts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ExclusiveContexts_param</name>
- <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>GetAllContexts_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>UseExclusives_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Whitelist</name>
- <expose v="true" />
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Context_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>UID.displayValue</element>
- <element>CONTEXT_NAME.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Context_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
+ <contentTitleProcess>%aditoprj%/entity/Context_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>37559258-24f1-4c8c-b462-23ddf8de4e1e</name>
+ <entityName>AppointmentLink_entity</entityName>
+ <fieldName>Context</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f1eebe8c-93d2-4977-b619-b6315f843f7a</name>
+ <entityName>AttributeUsage_entity</entityName>
+ <fieldName>Context</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <title>Context id</title>
+ </entityField>
+ <entityField>
+ <name>CONTEXT_NAME</name>
+ <title>Context name</title>
+ </entityField>
+ <entityProvider>
+ <name>Context</name>
+ <dependencies>
+ <entityDependency>
+ <name>dab09827-2eeb-403d-a070-ba805d2640ee</name>
+ <entityName>ObjectRelationType_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>209539e0-15ad-47eb-9175-a3aaa5af13fc</name>
+ <entityName>Forecast_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8183e19e-c8cc-45d8-9763-417eaeffb940</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4543a0ae-7bd2-4c70-8eaf-d4f32e014173</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>420468aa-c237-4e29-a24f-8851e56343b9</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExclusiveContexts_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ExclusiveContexts_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>ActivityLinkable</name>
+ <dependencies>
+ <entityDependency>
+ <name>de50f67e-5ed0-46aa-b007-8c086cf5fea5</name>
+ <entityName>ActivityLink_entity</entityName>
+ <fieldName>Context</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExclusiveContexts_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/activitylinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>TaskLinkable</name>
+ <dependencies>
+ <entityDependency>
+ <name>ff8925da-b69a-46dd-8fe2-d6707da8808e</name>
+ <entityName>TaskLink_entity</entityName>
+ <fieldName>Contexts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExclusiveContexts_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/tasklinkable/children/exclusivecontexts_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>GetAllContexts_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>UseExclusives_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Whitelist</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Context_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>UID.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONTEXT_NAME.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 9515d485577a81225e7b0520c50b21819d278aec..2426e1820b9599084c69a69860e07f3db940cb20 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,486 +1,485 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Contract_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
- <title>Contract</title>
- <contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
- <afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
- <onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
- <iconId>VAADIN:FILE_TEXT</iconId>
- <titlePlural>Contracts</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityField>
- <name>CONTRACTCODE</name>
- <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/documentation.adoc</documentation>
- <title>Contract number</title>
- <mandatory v="true" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>CONTRACTDUE</name>
- <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/documentation.adoc</documentation>
- <title>Next due date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- </entityField>
- <entityField>
- <name>CONTRACTEND</name>
- <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractend/documentation.adoc</documentation>
- <title>Contract expiry date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractend/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>CONTRACTID</name>
- <title>CONTRACTID (UID)</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CONTRACTSTART</name>
- <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/documentation.adoc</documentation>
- <title>Contract start date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstart/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>CONTRACTSTATUS</name>
- <title>${CONTRACT_STATUS}</title>
- <consumer>ContractStates</consumer>
- <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CONTRACTTYPE</name>
- <title>Type of contract</title>
- <consumer>ContractTypes</consumer>
- <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>PAYMENT</name>
- <title>Payment method</title>
- <consumer>ContractPayments</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <documentation>%aditoprj%/entity/Contract_entity/entityfields/contact_id/documentation.adoc</documentation>
- <title>Contact</title>
- <consumer>AnyContacts</consumer>
- <linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>REMARK</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityProvider>
- <name>Contracts</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Contracts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3698fe59-fd02-427b-8c95-a90c7d8036e5</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contracts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityFieldGroup>
- <name>CONTRACTCODE_DISPLAY_fieldGroup</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js</valueProcess>
- <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/documentation.adoc</documentation>
- <description>FIELDGROUP</description>
- <fields>
- <element>CONTRACTTYPE</element>
- <element>CONTRACTCODE</element>
- </fields>
- </entityFieldGroup>
- <entityConsumer>
- <name>Activities</name>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RowId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>PresetLinks_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>AnyContacts</name>
- <dependency>
- <name>dependency</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7d8f586a-3ee0-47e8-b328-3b624cf4abfa</name>
- <entityName>Object_entity</entityName>
- <fieldName>Contracts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CONTACT_ORG_ID</name>
- <title>Company</title>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CONTACT_PERSON_ID</name>
- <title>Person</title>
- <searchable v="false" />
- </entityField>
- <entityConsumer>
- <name>Documents</name>
- <selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentName_param</name>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ContractPayments</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ContractStates</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>ContractTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>newActivity</name>
- <title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:HOURGLASS_END</iconId>
- <tooltip>New activity</tooltip>
- <tooltipProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityConsumer>
- <name>Attributes</name>
- <onValidation>%aditoprj%/entity/Contract_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>AttributeTree</name>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>TreeProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Tasks</name>
- <stateProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>RowId_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>PresetLinks_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>newTask</name>
- <title>New task</title>
- <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TASKS</iconId>
- </entityActionField>
- <entityConsumer>
- <name>LogHistoryConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>tablenames_param</name>
- <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <fromClauseProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>78925203-f1c5-4e7e-9424-1a23500c655d</name>
- <tableName>CONTRACT</tableName>
- <primaryKey>CONTRACTID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>0637150d-c535-41ce-85f3-e9a6b980d195</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>9ba7de4b-999c-44cc-95ee-0dbdcc35bf0f</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>748d1280-6dd2-4ada-837e-b331166e78d3</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CONTRACTCODE.value</name>
- <recordfield>CONTRACT.CONTRACTCODE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTDUE.value</name>
- <recordfield>CONTRACT.CONTRACTDUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTEND.value</name>
- <recordfield>CONTRACT.CONTRACTEND</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTID.value</name>
- <recordfield>CONTRACT.CONTRACTID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTSTART.value</name>
- <recordfield>CONTRACT.CONTRACTSTART</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTSTATUS.value</name>
- <recordfield>CONTRACT.CONTRACTSTATUS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTTYPE.value</name>
- <recordfield>CONTRACT.CONTRACTTYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PAYMENT.value</name>
- <recordfield>CONTRACT.PAYMENT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REMARK.value</name>
- <recordfield>CONTRACT.REMARK</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>CONTRACT.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ORG_ID.value</name>
- <recordfield>CONTACT.ORGANISATION_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_PERSON_ID.value</name>
- <recordfield>CONTACT.PERSON_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_FIRSTNAME.value</name>
- <recordfield>PERSON.FIRSTNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PERSON_LASTNAME.value</name>
- <recordfield>PERSON.LASTNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PAYMENT.displayValue</name>
- <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTSTATUS.displayValue</name>
- <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTRACTTYPE.displayValue</name>
- <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ORG_ID.displayValue</name>
- <recordfield>ORGANISATION.NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_PERSON_ID.displayValue</name>
- <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contact_person_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Contract_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
+ <title>Contract</title>
+ <contentTitleProcess>%aditoprj%/entity/Contract_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterUiInit>%aditoprj%/entity/Contract_entity/afterUiInit.js</afterUiInit>
+ <onValidation>%aditoprj%/entity/Contract_entity/onValidation.js</onValidation>
+ <iconId>VAADIN:FILE_TEXT</iconId>
+ <titlePlural>Contracts</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>CONTRACTCODE</name>
+ <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/documentation.adoc</documentation>
+ <title>Contract number</title>
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Contract_entity/entityfields/contractcode/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>CONTRACTDUE</name>
+ <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractdue/documentation.adoc</documentation>
+ <title>Next due date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ </entityField>
+ <entityField>
+ <name>CONTRACTEND</name>
+ <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractend/documentation.adoc</documentation>
+ <title>Contract expiry date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractend/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>CONTRACTID</name>
+ <title>CONTRACTID (UID)</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CONTRACTSTART</name>
+ <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractstart/documentation.adoc</documentation>
+ <title>Contract start date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstart/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Contract_entity/entityfields/contractstart/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>CONTRACTSTATUS</name>
+ <title>${CONTRACT_STATUS}</title>
+ <consumer>ContractStates</consumer>
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstatus/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CONTRACTTYPE</name>
+ <title>Type of contract</title>
+ <consumer>ContractTypes</consumer>
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>PAYMENT</name>
+ <title>Payment method</title>
+ <consumer>ContractPayments</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/payment/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <documentation>%aditoprj%/entity/Contract_entity/entityfields/contact_id/documentation.adoc</documentation>
+ <title>Contact</title>
+ <consumer>AnyContacts</consumer>
+ <linkedContextProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Contract_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>REMARK</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityProvider>
+ <name>Contracts</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>6d7c7166-84b4-4da2-9a48-cc1e390ac987</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Contracts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3698fe59-fd02-427b-8c95-a90c7d8036e5</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Contracts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityFieldGroup>
+ <name>CONTRACTCODE_DISPLAY_fieldGroup</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/Contract_entity/entityfields/contractcode_display_fieldgroup/documentation.adoc</documentation>
+ <description>FIELDGROUP</description>
+ <fields>
+ <element>CONTRACTTYPE</element>
+ <element>CONTRACTCODE</element>
+ </fields>
+ </entityFieldGroup>
+ <entityConsumer>
+ <name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AnyContacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7d8f586a-3ee0-47e8-b328-3b624cf4abfa</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Contracts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CONTACT_ORG_ID</name>
+ <title>Company</title>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CONTACT_PERSON_ID</name>
+ <title>Person</title>
+ <searchable v="false" />
+ </entityField>
+ <entityConsumer>
+ <name>Documents</name>
+ <selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContractPayments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractpayments/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContractStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contractstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContractTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/contracttypes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:HOURGLASS_END</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Contract_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityConsumer>
+ <name>Attributes</name>
+ <onValidation>%aditoprj%/entity/Contract_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>AttributeTree</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>TreeProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/attributetree/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
+ <stateProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newTask</name>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/Contract_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <fromClauseProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Contract_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>78925203-f1c5-4e7e-9424-1a23500c655d</name>
+ <tableName>CONTRACT</tableName>
+ <primaryKey>CONTRACTID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>0637150d-c535-41ce-85f3-e9a6b980d195</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>9ba7de4b-999c-44cc-95ee-0dbdcc35bf0f</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>748d1280-6dd2-4ada-837e-b331166e78d3</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CONTRACTCODE.value</name>
+ <recordfield>CONTRACT.CONTRACTCODE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTDUE.value</name>
+ <recordfield>CONTRACT.CONTRACTDUE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTEND.value</name>
+ <recordfield>CONTRACT.CONTRACTEND</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTID.value</name>
+ <recordfield>CONTRACT.CONTRACTID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTSTART.value</name>
+ <recordfield>CONTRACT.CONTRACTSTART</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTSTATUS.value</name>
+ <recordfield>CONTRACT.CONTRACTSTATUS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTTYPE.value</name>
+ <recordfield>CONTRACT.CONTRACTTYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENT.value</name>
+ <recordfield>CONTRACT.PAYMENT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REMARK.value</name>
+ <recordfield>CONTRACT.REMARK</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>CONTRACT.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ORG_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_FIRSTNAME.value</name>
+ <recordfield>PERSON.FIRSTNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PERSON_LASTNAME.value</name>
+ <recordfield>PERSON.LASTNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENT.displayValue</name>
+ <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/payment.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTSTATUS.displayValue</name>
+ <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contractstatus.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTRACTTYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contracttype.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ORG_ID.displayValue</name>
+ <recordfield>ORGANISATION.NAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_PERSON_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Contract_entity/recordcontainers/db/recordfieldmappings/contact_person_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Contract_entity/entityfields/contractend/valueProcess.js b/entity/Contract_entity/entityfields/contractend/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index 7cbd641605677ca8707a023c051692d56bee461a..dc86698dd70aab037843ed798192a6372f9c9b37 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,156 +1,156 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Countries_Entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
- <title>Countries</title>
- <contentTitleProcess>%aditoprj%/entity/Countries_Entity/contentTitleProcess.js</contentTitleProcess>
- <iconId>VAADIN:FLAG</iconId>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityProvider>
- <name>ISO2Name</name>
- <dependencies>
- <entityDependency>
- <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
- <entityName>Address_entity</entityName>
- <fieldName>Countries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Countries</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>Key_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>Value_param</name>
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>Key_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Value_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>ISO2</name>
- <title>ISO 3166-1 alpha-2</title>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ISO3</name>
- <title>ISO 3166-1 alpha-3</title>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ADDR_FORMAT</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ZIP_REGEX</name>
- <documentation>%aditoprj%/entity/Countries_Entity/entityfields/zip_regex/documentation.adoc</documentation>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>NAME</name>
- <searchable v="true" />
- </entityField>
- <entityField>
- <name>REQUIRED_FIELDS</name>
- <documentation>%aditoprj%/entity/Countries_Entity/entityfields/required_fields/documentation.adoc</documentation>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>NAME_TRANSLATED</name>
- <title>Latin Name</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/name_translated/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>FLAG</name>
- <contentType>IMAGE</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/flag/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>FLAG_RAW</name>
- <description>//todo: move flags to binaries (asys_binaries)</description>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>NAME_ORIGIN</name>
- <title>Native Name</title>
- <searchable v="false" />
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <isPageable v="false" />
- <orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
- <tableName>AB_COUNTRYINFO</tableName>
- <primaryKey>ISO2</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ADDR_FORMAT.value</name>
- <recordfield>AB_COUNTRYINFO.ADDR_FORMAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NAME_ORIGIN.value</name>
- <recordfield>AB_COUNTRYINFO.NAME_NATIVE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISO2.value</name>
- <recordfield>AB_COUNTRYINFO.ISO2</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REQUIRED_FIELDS.value</name>
- <recordfield>AB_COUNTRYINFO.REQUIRED_FIELDS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISO3.value</name>
- <recordfield>AB_COUNTRYINFO.ISO3</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ZIP_REGEX.value</name>
- <recordfield>AB_COUNTRYINFO.ZIP_REGEX</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NAME.value</name>
- <recordfield>AB_COUNTRYINFO.NAME_LATIN</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>FLAG_RAW.value</name>
- <recordfield>AB_COUNTRYINFO.FLAG</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Countries_Entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
+ <title>Countries</title>
+ <contentTitleProcess>%aditoprj%/entity/Countries_Entity/contentTitleProcess.js</contentTitleProcess>
+ <iconId>VAADIN:FLAG</iconId>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityProvider>
+ <name>ISO2Name</name>
+ <dependencies>
+ <entityDependency>
+ <name>83e8a2e6-aa80-4b35-a0ad-8dad483ed428</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>Countries</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8e8d1ace-3cbb-4ed7-b029-f486805605ef</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Countries</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>Key_param</name>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/key_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>Value_param</name>
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/iso2name/children/value_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Key_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Value_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ISO2</name>
+ <title>ISO 3166-1 alpha-2</title>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ISO3</name>
+ <title>ISO 3166-1 alpha-3</title>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ADDR_FORMAT</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ZIP_REGEX</name>
+ <documentation>%aditoprj%/entity/Countries_Entity/entityfields/zip_regex/documentation.adoc</documentation>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>NAME</name>
+ <searchable v="true" />
+ </entityField>
+ <entityField>
+ <name>REQUIRED_FIELDS</name>
+ <documentation>%aditoprj%/entity/Countries_Entity/entityfields/required_fields/documentation.adoc</documentation>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>NAME_TRANSLATED</name>
+ <title>Latin Name</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/name_translated/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>FLAG</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Countries_Entity/entityfields/flag/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>FLAG_RAW</name>
+ <description>//todo: move flags to binaries (asys_binaries)</description>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>NAME_ORIGIN</name>
+ <title>Native Name</title>
+ <searchable v="false" />
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <orderClauseProcess>%aditoprj%/entity/Countries_Entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>cc219004-43fd-4a3f-bee0-be5e732c61f1</name>
+ <tableName>AB_COUNTRYINFO</tableName>
+ <primaryKey>ISO2</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ADDR_FORMAT.value</name>
+ <recordfield>AB_COUNTRYINFO.ADDR_FORMAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME_ORIGIN.value</name>
+ <recordfield>AB_COUNTRYINFO.NAME_NATIVE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISO2.value</name>
+ <recordfield>AB_COUNTRYINFO.ISO2</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REQUIRED_FIELDS.value</name>
+ <recordfield>AB_COUNTRYINFO.REQUIRED_FIELDS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISO3.value</name>
+ <recordfield>AB_COUNTRYINFO.ISO3</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ZIP_REGEX.value</name>
+ <recordfield>AB_COUNTRYINFO.ZIP_REGEX</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME.value</name>
+ <recordfield>AB_COUNTRYINFO.NAME_LATIN</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>FLAG_RAW.value</name>
+ <recordfield>AB_COUNTRYINFO.FLAG</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d34d158451225500cc054f5b91f2f3b8caafe41b
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -0,0 +1,119 @@
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>DescriptionTranslation_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Description</title>
+ <titlePlural>Descriptions</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DESCRIPTIONTRANSLATIONID</name>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>Type</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <title>Object</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LANG</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ <mandatory v="true" />
+ </entityField>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3NameFiltered</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedIds_param</name>
+ <valueProcess>%aditoprj%/entity/DescriptionTranslation_entity/entityfields/languages/children/excludedids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>DescriptionTranslations</name>
+ <dependencies>
+ <entityDependency>
+ <name>72298519-6028-4d4b-9ef6-3227fb065bb8</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>DescriptionTranslations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>b12c4b68-b868-45fe-9f72-aa914a19382a</name>
+ <tableName>DESCRIPTIONTRANSLATION</tableName>
+ <primaryKey>DESCRIPTIONTRANSLATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ <recordfield>DESCRIPTIONTRANSLATION.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTIONTRANSLATIONID.value</name>
+ <recordfield>DESCRIPTIONTRANSLATION.DESCRIPTIONTRANSLATIONID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ <recordfield>DESCRIPTIONTRANSLATION.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>DESCRIPTIONTRANSLATION.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANG.value</name>
+ <recordfield>DESCRIPTIONTRANSLATION.LANG</recordfield>
+ <expression>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANG.displayValue</name>
+ <expression>%aditoprj%/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Product_entity/entityfields/language/displayValueProcess.js b/entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js
similarity index 79%
rename from entity/Product_entity/entityfields/language/displayValueProcess.js
rename to entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js
index de5246774faf8a3f68bea969823cf3fe462d1504..ac0f29fc259baae6d6042a83e588737d6c76fd31 100644
--- a/entity/Product_entity/entityfields/language/displayValueProcess.js
+++ b/entity/DescriptionTranslation_entity/entityfields/lang/displayValueProcess.js
@@ -6,5 +6,5 @@ import("KeywordRegistry_basic");
import("Keyword_lib");
import("Sql_lib");
-result.string(translate.text(db.cell(SqlCondition.begin().andPrepareVars("AB_LANGUAGE.ISO3", "$field.LANGUAGE")
- .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=2"))));
+result.string(translate.text(db.cell(SqlCondition.begin().andPrepareVars("AB_LANGUAGE.ISO3", "$this.value")
+ .buildSql("select NAME_LATIN from AB_LANGUAGE", "1=2"))));
\ No newline at end of file
diff --git a/entity/DescriptionTranslation_entity/entityfields/languages/children/excludedids_param/valueProcess.js b/entity/DescriptionTranslation_entity/entityfields/languages/children/excludedids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..15bf867229fbf60954c4f5da8528c73dfd8ba5da
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/entityfields/languages/children/excludedids_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("Sql_lib");
+import("system.db");
+import("system.result");
+import("system.neon");
+
+result.object(db.array(db.COLUMN, SqlCondition.begin()
+ .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_TYPE", "$param.ObjectType_param")
+ .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_ROWID", "$param.ObjectRowid_param")
+ .buildSql("select LANG from DESCRIPTIONTRANSLATION", "1=2")));
\ No newline at end of file
diff --git a/entity/DescriptionTranslation_entity/entityfields/object_rowid/valueProcess.js b/entity/DescriptionTranslation_entity/entityfields/object_rowid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..753abe3b0853ce610cfe25e8b2632e84fa865617
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/entityfields/object_rowid/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("$param.ObjectRowid_param"));
+}
\ No newline at end of file
diff --git a/entity/DescriptionTranslation_entity/entityfields/object_type/valueProcess.js b/entity/DescriptionTranslation_entity/entityfields/object_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..55877cba6b885eb12a5f2be9928a7cd5acaa287d
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/entityfields/object_type/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("$param.ObjectType_param"));
+}
\ No newline at end of file
diff --git a/entity/DescriptionTranslation_entity/recordcontainers/db/conditionProcess.js b/entity/DescriptionTranslation_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..59b16d3684e1267b5ac40e6cb6bc9e926ffca60c
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,9 @@
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = SqlCondition.begin()
+ .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_TYPE", "$param.ObjectType_param")
+ .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_ROWID", "$param.ObjectRowid_param");
+
+result.string(db.translateCondition(cond.build("1 = 2")))
\ No newline at end of file
diff --git a/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js b/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..c0156ae28d7ef04c0c79d5678f96cf52ed668f83
--- /dev/null
+++ b/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("DESCRIPTIONTRANSLATION.LANG");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js b/entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.value/expression.js
similarity index 100%
rename from entity/AppointmentLink_entity/entityfields/opencontext/onActionProcess.js
rename to entity/DescriptionTranslation_entity/recordcontainers/db/recordfieldmappings/lang.value/expression.js
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index 5f8250cbb833f36e714fa8554ac40baefaed9130..6a491c23091c4c4b4e83b255fe85fb0479cd9ac3 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,159 +1,159 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>DocumentTemplateLink_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Attachment</title>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>DATE_EDIT</name>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DOCUMENTTEMPLATE_ID_PARENT</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DOCUMENTTEMPLATELINKID</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DOCUMENTTEMPLATE_ID_CHILD</name>
- <consumer>Attachments</consumer>
- <linkedContext>DocumentTemplate</linkedContext>
- <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>DocumentId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Attachments</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Attachments</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>Links</name>
- <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>DocumentId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Type_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>Type_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityActionField>
- <name>OpenDocument</name>
- <onActionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:DOWNLOAD</iconId>
- </entityActionField>
- <entityField>
- <name>ICON</name>
- <contentType>TEXT</contentType>
- <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
- <tableName>DOCUMENTTEMPLATELINK</tableName>
- <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
- <tableName>DOCUMENTTEMPLATE</tableName>
- <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATE_ID_CHILD.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_CHILD</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATE_ID_PARENT.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATELINKID.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATELINKID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>DocumentTemplateLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Attachment</title>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_ID_PARENT</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_parent/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATELINKID</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplatelinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_ID_CHILD</name>
+ <consumer>Attachments</consumer>
+ <linkedContext>DocumentTemplate</linkedContext>
+ <stateProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Attachments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Attachments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/attachments/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Links</name>
+ <targetIdField>DOCUMENTTEMPLATE_ID_CHILD</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>db3b7e04-ca3b-4205-a1d3-5e5e5cb13073</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Type_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Type_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityActionField>
+ <name>OpenDocument</name>
+ <onActionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:DOWNLOAD</iconId>
+ </entityActionField>
+ <entityField>
+ <name>ICON</name>
+ <contentType>TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/DocumentTemplateLink_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplateLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>05d25e85-1cd8-4897-be48-ecf699322b1f</name>
+ <tableName>DOCUMENTTEMPLATELINK</tableName>
+ <primaryKey>DOCUMENTTEMPLATELINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>34ca9c71-3de5-48ce-ade2-fa203360ebbd</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATE_ID_CHILD.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_CHILD</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATE_ID_PARENT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATE_ID_PARENT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATELINKID.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.DOCUMENTTEMPLATELINKID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATELINK.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js
index c39c4f940d57a66abfcb5fe424361ee10bd55469..fd9bb084f534e9423351506c9ddc2f185cc27162 100644
--- a/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js
+++ b/entity/DocumentTemplateLink_entity/entityfields/documenttemplate_id_child/displayValueProcess.js
@@ -1,13 +1,14 @@
-import("system.result");
-import("system.db");
-import("system.vars");
-import("Contact_lib");
-
-var documenttemplatename = "";
-var documenttemplateId = vars.get("$field.DOCUMENTTEMPLATE_ID_CHILD");
-
-documenttemplatename = db.cell(SqlCondition.begin()
- .andPrepare("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", documenttemplateId)
- .buildSql("select DOCUMENTTEMPLATE.NAME from DOCUMENTTEMPLATE"));
-
+import("Sql_lib");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("Contact_lib");
+
+var documenttemplatename = "";
+var documenttemplateId = vars.get("$field.DOCUMENTTEMPLATE_ID_CHILD");
+
+documenttemplatename = db.cell(SqlCondition.begin()
+ .andPrepare("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", documenttemplateId)
+ .buildSql("select DOCUMENTTEMPLATE.NAME from DOCUMENTTEMPLATE"));
+
result.string(documenttemplatename);
\ No newline at end of file
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 5a1012bc089e0d8c510ceda68416d60c908ab471..a576a623618aa0a2f4243e4fb106b4ca76105fd9 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,74 +1,74 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>DocumentTemplateTypeCategory_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityParameter>
- <name>usageFilter_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>AB_KEYWORD_ENTRYID</name>
- </entityField>
- <entityField>
- <name>KEYID</name>
- </entityField>
- <entityField>
- <name>TITLE</name>
- </entityField>
- <entityProvider>
- <name>ByCategory</name>
- <lookupIdfield>KEYID</lookupIdfield>
- <dependencies>
- <entityDependency>
- <name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateTypeCategory</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>usageFilter_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>6cfa2424-b81b-4750-ae43-e3b1126eab0a</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_KEYWORD_ENTRYID.value</name>
- <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>KEYID.value</name>
- <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TITLE.value</name>
- <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>DocumentTemplateTypeCategory_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>AB_KEYWORD_ENTRYID</name>
+ </entityField>
+ <entityField>
+ <name>KEYID</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
+ <entityProvider>
+ <name>ByCategory</name>
+ <lookupIdfield>KEYID</lookupIdfield>
+ <dependencies>
+ <entityDependency>
+ <name>5eb6b17c-8c13-48df-84d5-a949b7d21cf3</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateTypeCategory</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>6cfa2424-b81b-4750-ae43-e3b1126eab0a</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ENTRYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>KEYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 100c64cded47f60f9a02b3790174c800d4ed46bc..3bf1f40c2ac5c981506510e5b1f1ee853bae8ed1 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,320 +1,320 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>DocumentTemplate_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:FILE_FONT</icon>
- <title>Document Template</title>
- <contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
- <afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>5cc2e566-309c-4b47-84f3-52376e919b9b</name>
- <entityName>Email_entity</entityName>
- <fieldName>DocumentTemplates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>DATE_EDIT</name>
- <title>Date edit</title>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityField>
- <name>DOCUMENTTEMPLATEID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <title>Date new</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TYPE</name>
- <title>Type</title>
- <consumer>KeywordDocumentTemplateType</consumer>
- <groupable v="true" />
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>NAME</name>
- <title>Name</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>LANGUAGE</name>
- <title>Language</title>
- <consumer>Languages</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>BINDATA</name>
- <contentType>FILE</contentType>
- <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js</onValueChange>
- </entityField>
- <entityConsumer>
- <name>Documents</name>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDocumentTemplateType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Attributes</name>
- <onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>texText</name>
- <title>Text</title>
- <contentType>LONG_TEXT</contentType>
- <state>INVISIBLE</state>
- <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CLASSIFICATION</name>
- <title>Classification</title>
- <consumer>DocumentTemplateTypeCategory</consumer>
- <groupable v="true" />
- <state>DISABLED</state>
- <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>DocumentTemplateTypeCategory</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateTypeCategory_entity</entityName>
- <fieldName>ByCategory</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>usageFilter_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>Attachments</name>
- <targetContextField>TARGET_CONTEXT</targetContextField>
- <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
- <targetConsumerProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js</targetConsumerProcess>
- <titlePlural>Attachments</titlePlural>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>856e3435-a173-4cf5-8e81-3f884f8238d3</name>
- <entityName>DocumentTemplateLink_entity</entityName>
- <fieldName>Attachments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityConsumer>
- <name>Links</name>
- <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplateLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentId_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>DocumentTemplateTypeClassification_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>DocumentTemplateProvider</name>
- <dependencies>
- <entityDependency>
- <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
- <entityName>Offer_entity</entityName>
- <fieldName>DocumentTemplateText</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>DocumentTemplateTexHeader</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>67f64ed9-bc92-41ba-a040-671a12b7a5f3</name>
- <entityName>Offer_entity</entityName>
- <fieldName>DocumentTemplateTexFooter</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>57f408e3-aeb7-4006-a20d-287dae1f0922</name>
- <entityName>Letter_entity</entityName>
- <fieldName>DocumentTemplates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>233d356c-c81b-41e6-8489-440ca8c81dfa</name>
- <entityName>BulkMail_entity</entityName>
- <fieldName>Templates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>TARGET_CONTEXT</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <onDBInsert>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>982325b6-d12e-43f9-8ac2-c4b9f013aafd</name>
- <tableName>DOCUMENTTEMPLATE</tableName>
- <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>DOCUMENTTEMPLATE.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>DOCUMENTTEMPLATE.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DESCRIPTION.value</name>
- <recordfield>DOCUMENTTEMPLATE.DESCRIPTION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <recordfield>DOCUMENTTEMPLATE.LANGUAGE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NAME.value</name>
- <recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.value</name>
- <recordfield>DOCUMENTTEMPLATE.TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>DOCUMENTTEMPLATE.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>DOCUMENTTEMPLATE.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DOCUMENTTEMPLATEID.value</name>
- <recordfield>DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CLASSIFICATION.value</name>
- <recordfield>DOCUMENTTEMPLATE.CLASSIFICATION</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>DocumentTemplate_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_FONT</icon>
+ <title>Document Template</title>
+ <contentTitleProcess>%aditoprj%/entity/DocumentTemplate_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterUiInit>%aditoprj%/entity/DocumentTemplate_entity/afterUiInit.js</afterUiInit>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>5cc2e566-309c-4b47-84f3-52376e919b9b</name>
+ <entityName>Email_entity</entityName>
+ <fieldName>DocumentTemplates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <title>Date edit</title>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATEID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>Date new</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ <title>Type</title>
+ <consumer>KeywordDocumentTemplateType</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/type/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>NAME</name>
+ <title>Name</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>LANGUAGE</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>BINDATA</name>
+ <contentType>FILE</contentType>
+ <onValueChange>%aditoprj%/entity/DocumentTemplate_entity/entityfields/bindata/onValueChange.js</onValueChange>
+ </entityField>
+ <entityConsumer>
+ <name>Documents</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDocumentTemplateType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/keyworddocumenttemplatetype/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <onValidation>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>texText</name>
+ <title>Text</title>
+ <contentType>LONG_TEXT</contentType>
+ <state>INVISIBLE</state>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/textext/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CLASSIFICATION</name>
+ <title>Classification</title>
+ <consumer>DocumentTemplateTypeCategory</consumer>
+ <groupable v="true" />
+ <state>DISABLED</state>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/classification/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>DocumentTemplateTypeCategory</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateTypeCategory_entity</entityName>
+ <fieldName>ByCategory</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>usageFilter_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplatetypecategory/children/usagefilter_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Attachments</name>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>DOCUMENTTEMPLATEID</targetIdField>
+ <targetConsumerProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/attachments/targetConsumerProcess.js</targetConsumerProcess>
+ <titlePlural>Attachments</titlePlural>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>856e3435-a173-4cf5-8e81-3f884f8238d3</name>
+ <entityName>DocumentTemplateLink_entity</entityName>
+ <fieldName>Attachments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityConsumer>
+ <name>Links</name>
+ <stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplateLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentId_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/documentid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/links/children/type_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>DocumentTemplateTypeClassification_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>DocumentTemplateProvider</name>
+ <dependencies>
+ <entityDependency>
+ <name>e1c555c3-9e53-4ccf-962c-4bdd3c14bb16</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>DocumentTemplateText</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>9c10883d-eb73-4587-b758-693a66367a4c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>DocumentTemplateTexHeader</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>67f64ed9-bc92-41ba-a040-671a12b7a5f3</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>DocumentTemplateTexFooter</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>57f408e3-aeb7-4006-a20d-287dae1f0922</name>
+ <entityName>Letter_entity</entityName>
+ <fieldName>DocumentTemplates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>233d356c-c81b-41e6-8489-440ca8c81dfa</name>
+ <entityName>BulkMail_entity</entityName>
+ <fieldName>Templates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TARGET_CONTEXT</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/target_context/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <onDBInsert>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>982325b6-d12e-43f9-8ac2-c4b9f013aafd</name>
+ <tableName>DOCUMENTTEMPLATE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.value</name>
+ <recordfield>DOCUMENTTEMPLATE.LANGUAGE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME.value</name>
+ <recordfield>DOCUMENTTEMPLATE.NAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <recordfield>DOCUMENTTEMPLATE.TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>DOCUMENTTEMPLATE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>DOCUMENTTEMPLATE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATEID.value</name>
+ <recordfield>DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CLASSIFICATION.value</name>
+ <recordfield>DOCUMENTTEMPLATE.CLASSIFICATION</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 43c33d28e52aec61c21531c4bb8ba60e19472f93..077b4c5f163f836e2c73402d2ee1f48ea69531ca 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,309 +1,325 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Document_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Document</title>
- <iconId>VAADIN:FILE</iconId>
- <titlePlural>Documents</titlePlural>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>6bbed1fb-7f22-420d-988e-7f9413c0b294</name>
- <entityName>Task_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>NAME</name>
- <title>Filename</title>
- <mandatory v="true" />
- <state>AUTO</state>
- </entityField>
- <entityField>
- <name>TYPE</name>
- <title>Filetype</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>SIZE</name>
- <title>Filesize</title>
- <contentType>FILESIZE</contentType>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>MINUTE</resolution>
- <outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
- <inputFormat>dd.MM.yyyy HH:mm:ss</inputFormat>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>PREVIEW_IMAGE</name>
- <title>Vorschau</title>
- <contentType>IMAGE</contentType>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>BINDATA_UPLOAD</name>
- <title>File</title>
- <contentType>FILE</contentType>
- <onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityActionGroup>
- <name>Document_actions</name>
- <children>
- <entityActionField>
- <name>downloadFilesAction</name>
- <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <isSelectionAction v="true" />
- <iconId>VAADIN:DOWNLOAD</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AssignmentName_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>UID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/uid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>KEYWORD</name>
- <title>Keyword</title>
- </entityField>
- <entityField>
- <name>ICON</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/icon/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>IS_MAIN_DOCUMENT</name>
- <title>Main document</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityParameter>
- <name>Keyword_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityActionField>
- <name>downloadSingleFileAction</name>
- <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:DOWNLOAD</iconId>
- </entityActionField>
- <entityProvider>
- <name>Documents</name>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>1eae1907-53ea-4d6f-bcf1-772052365020</name>
- <entityName>Activity_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e4f23cab-a238-4123-8f96-1e09b9da3cb7</name>
- <entityName>Contract_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8867e012-ed4e-4c34-9c1f-402acf910190</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>af4d109a-9265-4119-926e-b1fef4b3a2b3</name>
- <entityName>Order_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>92765669-c236-44c1-bacf-6d1aef7c1433</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0d8ec167-6db1-4a8b-b1d5-8cba3f050bca</name>
- <entityName>Person_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>31a82406-7a61-49d9-b75b-731040614ecb</name>
- <entityName>Product_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>35ebe1f6-b2a2-4659-8b50-afdbe37269de</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>abd400df-a5a4-4750-b3a4-0476b2721161</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e326d4f9-40fd-42c8-88d6-0c5cefc6fa71</name>
- <entityName>Task_entity</entityName>
- <fieldName>Documents</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Keyword_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>MainDocuments</name>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>87d738a5-5d5e-425e-b013-007371475a38</name>
- <entityName>Activity_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>457fd01e-4197-4fca-8079-e2025295f89c</name>
- <entityName>Contract_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ff2d676c-7dd0-47ad-b7f2-ce35b0546e9f</name>
- <entityName>Offer_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>75c1875c-5cb6-4cae-8bc7-82c45a2934e5</name>
- <entityName>Order_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8366d11d-4c46-4410-b255-6d196229a534</name>
- <entityName>Product_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>dfd2ed28-212f-4135-8f0c-7772f17b6ee6</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>Keyword_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="true" />
- <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
- </entityParameter>
- <entityParameter>
- <name>AssignmentName_param</name>
- <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
- </entityParameter>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Document_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>NAME.value</element>
- <element>SIZE.value</element>
- <element>DATE_EDIT.value</element>
- <element>PREVIEW_IMAGE.value</element>
- <element>TYPE.value</element>
- <element>DESCRIPTION.value</element>
- <element>KEYWORD.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Document_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Document</title>
+ <iconId>VAADIN:FILE</iconId>
+ <titlePlural>Documents</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>6bbed1fb-7f22-420d-988e-7f9413c0b294</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>NAME</name>
+ <title>Filename</title>
+ <mandatory v="true" />
+ <state>AUTO</state>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ <title>Filetype</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>SIZE</name>
+ <title>Filesize</title>
+ <contentType>FILESIZE</contentType>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm:ss</outputFormat>
+ <inputFormat>dd.MM.yyyy HH:mm:ss</inputFormat>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>PREVIEW_IMAGE</name>
+ <title>Vorschau</title>
+ <contentType>IMAGE</contentType>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>BINDATA_UPLOAD</name>
+ <title>File</title>
+ <contentType>FILE</contentType>
+ <onValueChange>%aditoprj%/entity/Document_entity/entityfields/bindata_upload/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityActionGroup>
+ <name>Document_actions</name>
+ <children>
+ <entityActionField>
+ <name>downloadFilesAction</name>
+ <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/document_actions/children/downloadfilesaction/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:DOWNLOAD</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>UID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/uid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>KEYWORD</name>
+ <title>Keyword</title>
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>IS_MAIN_DOCUMENT</name>
+ <title>Main document</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/is_main_document/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Document_entity/entityfields/is_main_document/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityActionField>
+ <name>downloadSingleFileAction</name>
+ <onActionProcess>%aditoprj%/entity/Document_entity/entityfields/downloadsinglefileaction/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:DOWNLOAD</iconId>
+ </entityActionField>
+ <entityProvider>
+ <name>Documents</name>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>1eae1907-53ea-4d6f-bcf1-772052365020</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e4f23cab-a238-4123-8f96-1e09b9da3cb7</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8867e012-ed4e-4c34-9c1f-402acf910190</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>af4d109a-9265-4119-926e-b1fef4b3a2b3</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>92765669-c236-44c1-bacf-6d1aef7c1433</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>0d8ec167-6db1-4a8b-b1d5-8cba3f050bca</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>31a82406-7a61-49d9-b75b-731040614ecb</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>35ebe1f6-b2a2-4659-8b50-afdbe37269de</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>abd400df-a5a4-4750-b3a4-0476b2721161</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e326d4f9-40fd-42c8-88d6-0c5cefc6fa71</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Documents</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/documents/children/assignmentname_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>MainDocuments</name>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>87d738a5-5d5e-425e-b013-007371475a38</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>457fd01e-4197-4fca-8079-e2025295f89c</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>ff2d676c-7dd0-47ad-b7f2-ce35b0546e9f</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>75c1875c-5cb6-4cae-8bc7-82c45a2934e5</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8366d11d-4c46-4410-b255-6d196229a534</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>dfd2ed28-212f-4135-8f0c-7772f17b6ee6</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>Keyword_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/keyword_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentName_param</name>
+ <valueProcess>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Document_entity/entityfields/maindocuments/children/assignmentname_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Document_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/Document_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>NAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SIZE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PREVIEW_IMAGE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>KEYWORD.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 32f3eb6b39219188561b1016f99f338280cfa71d..c45b600f1c015372e4a807209082aac10d41205e 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -1,76 +1,78 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Email_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>DOCUMENT_TEMPLATE</name>
- <title>Document Template</title>
- <consumer>DocumentTemplates</consumer>
- <linkedContext>DocumentTemplate</linkedContext>
- </entityField>
- <entityConsumer>
- <name>DocumentTemplates</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>Recipient_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>RECIPIENT</name>
- <title>Recipient</title>
- <consumer>EmailAddresses</consumer>
- <textInputAllowed v="true" />
- <valueProcess>%aditoprj%/entity/Email_entity/entityfields/recipient/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Email_entity/entityfields/recipient/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>EmailAddresses</name>
- <dependency>
- <name>dependency</name>
- <entityName>Communication_entity</entityName>
- <fieldName>EmailCommunications</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <onInsert>%aditoprj%/entity/Email_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <recordFields>
- <element>UID.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Email_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>DOCUMENT_TEMPLATE</name>
+ <title>Document Template</title>
+ <consumer>DocumentTemplates</consumer>
+ <linkedContext>DocumentTemplate</linkedContext>
+ </entityField>
+ <entityConsumer>
+ <name>DocumentTemplates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>Recipient_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>RECIPIENT</name>
+ <title>Recipient</title>
+ <consumer>EmailAddresses</consumer>
+ <textInputAllowed v="true" />
+ <valueProcess>%aditoprj%/entity/Email_entity/entityfields/recipient/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Email_entity/entityfields/recipient/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>EmailAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>EmailCommunications</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Email_entity/entityfields/emailaddresses/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <onInsert>%aditoprj%/entity/Email_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Email_entity/recordcontainers/jdito/onInsert.js b/entity/Email_entity/recordcontainers/jdito/onInsert.js
index a4a6db2b00da0ebb8ffa004876a78a4a6edc75ca..6cacfadc459568989baeae6ce715af0c7dc2104a 100644
--- a/entity/Email_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Email_entity/recordcontainers/jdito/onInsert.js
@@ -4,11 +4,12 @@ import("Employee_lib");
import("system.vars");
import("Email_lib");
+var contactId = vars.get("$param.ContactId_param");
EmailUtils.openMailTemplate(
vars.get("$field.RECIPIENT"),
EmployeeUtils.getCurrentContactId(),
vars.get("$field.DOCUMENT_TEMPLATE"),
- vars.get("$param.ContactId_param")
+ contactId
);
var links = [];
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 530c5cd9a09d4c57dc18a540289f810294a86b4c..4598f76d646cc4b59d7be29b8a4e885d7e813769 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,59 +1,63 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>EmployeeRole_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Role</title>
- <titlePlural>Roles</titlePlural>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>EmployeeRoles</name>
- <dependencies>
- <entityDependency>
- <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
- <entityName>Employee_entity</entityName>
- <fieldName>EmployeeRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>UserTitle_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>ROLE</name>
- <title>Role</title>
- <dropDownProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js</dropDownProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ROLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>EmployeeRole_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Role</title>
+ <titlePlural>Roles</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>EmployeeRoles</name>
+ <dependencies>
+ <entityDependency>
+ <name>3bcec57a-7165-4773-9253-5ecab26ee3f4</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>EmployeeRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>UserTitle_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>ROLE</name>
+ <title>Role</title>
+ <dropDownProcess>%aditoprj%/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ROLE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js b/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js
index e52145c8011337d56bd0cd3a5e9eea62f3562493..2c33a21e965fb2fbac61c15ea5db3604b5a83ae0 100644
--- a/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js
+++ b/entity/EmployeeRole_entity/entityfields/role/dropDownProcess.js
@@ -1,27 +1,28 @@
-import("system.translate");
-import("system.vars");
-import("system.result");
-import("system.tools");
-
-var selectedRole = vars.get("$field.ROLE");
-var roles = [];
-var allRoles = tools.getAllRoles([tools.ROLE_INTERNAL, tools.ROLE_PROJECT, tools.ROLE_XMPP]);
-var excludeRoles = {
- "INTERNAL_GROUPWARE" : true,
- "INTERNAL_SNMP" : true,
- "INTERNAL_DESIGNER" : true,
- "INTERNAL_TECHNICAL" : true
-};
-
-if (tools.existUsers(vars.get("$param.UserTitle_param")))
-{
- var userRoles = tools.getRoles(vars.get("$param.UserTitle_param"));
- for (let i in userRoles)
- excludeRoles[userRoles[i]] = true;
-}
-
-for (let roleId in allRoles)
- if (!excludeRoles[roleId] || roleId == selectedRole)
- roles.push([roleId, translate.text(allRoles[roleId][0])]);
-
+import("system.translate");
+import("system.vars");
+import("system.result");
+import("system.tools");
+
+var selectedRole = vars.get("$field.ROLE");
+var roles = [];
+var allRoles = tools.getAllRoles([tools.ROLE_INTERNAL, tools.ROLE_PROJECT, tools.ROLE_XMPP]);
+var excludeRoles = {
+ "INTERNAL_GROUPWARE" : true,
+ "INTERNAL_SNMP" : true,
+ "INTERNAL_DESIGNER" : true,
+ "INTERNAL_TECHNICAL" : true,
+ "INTERNAL_EVERYONE" : true
+};
+
+if (tools.existUsers(vars.get("$param.UserTitle_param")))
+{
+ var userRoles = tools.getRoles(vars.get("$param.UserTitle_param"));
+ for (let i in userRoles)
+ excludeRoles[userRoles[i]] = true;
+}
+
+for (let roleId in allRoles)
+ if (!excludeRoles[roleId] || roleId == selectedRole)
+ roles.push([roleId, translate.text(allRoles[roleId][0])]);
+
result.object(roles);
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
index e7db0ea61149e8c1fe8a997579528eac8c3e1de6..0f39a80ca0ccfea20d8780639a8ab4288e352114 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/contentProcess.js
@@ -10,12 +10,11 @@ if (userTitle && tools.existUsers(userTitle))
var existsObj = {};
tools.getRoles(userTitle).forEach(function (role)
{
- if (!this[role])
+ if (!this[role] && role != "INTERNAL_EVERYONE")
{
roles.push([role, role]);
this[role] = true;
}
}, existsObj);
}
-
result.object(roles);
\ No newline at end of file
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
index 1ac230e6252328d3f455e833dc5db787c34d9fe4..2f4ef094f759222bde2633186b9e824db4724d77 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onDelete.js
@@ -3,7 +3,7 @@ import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var role = vars.get("$field.UID");
+var role = vars.get("$local.uid");
if (userTitle)
{
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
index e14f3b471b95bd47905a762c79727a531d854db7..7ccec7d4b583c7ad36bce344a5046d9a34cd7976 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onInsert.js
@@ -3,14 +3,14 @@ import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var role = vars.get("$field.ROLE");
+var newRole = vars.get("$local.rowdata")["ROLE.value"];
if (userTitle && tools.existUsers(userTitle))
{
var user = tools.getUser(userTitle);
var roles = tools.getRoles(userTitle);
var roleObj = {};
- roles = [role].concat(roles)
+ roles = [newRole].concat(roles)
.filter(function (role)
{
var exists = role in this;
diff --git a/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
index 338f14eb0341a000ce6e5a21425d633a9d37478a..ce34c134f0ef8303f3376bef0ea4be4d70dabd81 100644
--- a/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/EmployeeRole_entity/recordcontainers/jdito/onUpdate.js
@@ -3,8 +3,8 @@ import("system.vars");
import("system.tools");
var userTitle = vars.exists("$param.UserTitle_param") && vars.get("$param.UserTitle_param");
-var oldRole = vars.get("$field.UID");
-var newRole = vars.get("$field.ROLE");
+var oldRole = vars.get("$local.uid");
+var newRole = vars.get("$local.rowdata")["ROLE.value"];
if (userTitle && oldRole != newRole)
{
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 579ef8b7586a3d579df536276023f0e7534931d2..0e50e826a992efa788f2b6f283746d33de7e0970 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Employee_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Employee</title>
@@ -292,19 +292,44 @@
<onInsert>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/Employee_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>TITLE.value</element>
- <element>ISACTIVE.value</element>
- <element>FIRSTNAME.value</element>
- <element>LASTNAME.value</element>
- <element>EMAIL_ADDRESS.value</element>
- <element>EMAIL_ADDRESS.displayValue</element>
- <element>DESCRIPTION.value</element>
- <element>CONTACT_ID.value</element>
- <element>CONTACT_ID.displayValue</element>
- <element>DEPARTMENT.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ISACTIVE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>FIRSTNAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LASTNAME.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>EMAIL_ADDRESS.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>EMAIL_ADDRESS.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONTACT_ID.displayValue</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DEPARTMENT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONFIRM_PASSWORD.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
index 532462fd9108431686574a06601758644f397e11..8db2fb2cb236265ad222ddf74c176a89dd8be92f 100644
--- a/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Employee_entity/recordcontainers/jdito/contentProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("Attribute_lib");
import("system.vars");
import("system.result");
@@ -31,7 +32,8 @@ users = users.map(function (user)
user[tools.DESCRIPTION],
user[tools.PARAMS][tools.CONTACTID],
ContactUtils.getTitleByContactId(user[tools.PARAMS][tools.CONTACTID]), //TODO: get the names more efficiently
- user[tools.PARAMS].department
+ user[tools.PARAMS].department,
+ ""
];
});
diff --git a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
index 6553a5d7c8c9aaa8cafcbb9a44b3c43a3a011f6c..ac20df00f13b9101bb9c41b3e6eae675f520b315 100644
--- a/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/Employee_entity/recordcontainers/jdito/onUpdate.js
@@ -1,38 +1,39 @@
-import("system.db");
-import("system.vars");
-import("system.tools");
-import("Person_lib");
-import("Entity_lib");
-
-// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
-FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
-{
- var personId = db.cell(SqlCondition.begin()
- .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
- .buildSql("select PERSON_ID from CONTACT")
- );
- if (state == FieldChanges.STATE_CHANGED())
- PersUtils.setImage(personId, value);
- else
- PersUtils.removeImage(personId);
-});
-
-var user = tools.getUserByAttribute(tools.NAME, vars.get("$field.UID"));
-
-user[tools.TITLE] = vars.get("$field.TITLE");
-user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
-user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
-user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
-user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
-user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
-user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
-user[tools.PARAMS][tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-user[tools.PARAMS].department = vars.get("$field.DEPARTMENT");
-
-if (vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param")
- && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
-{
- user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
-}
-
+import("Sql_lib");
+import("system.db");
+import("system.vars");
+import("system.tools");
+import("Person_lib");
+import("Entity_lib");
+
+// TODO: this is a workaround for missing possibility to react on changes of fields not connected to record Contqainer #1030023
+FieldChanges.assimilateChangeAndDispose("$field.IMAGE", function (state, value)
+{
+ var personId = db.cell(SqlCondition.begin()
+ .andPrepareVars("CONTACT.CONTACTID", "$field.CONTACT_ID")
+ .buildSql("select PERSON_ID from CONTACT")
+ );
+ if (state == FieldChanges.STATE_CHANGED())
+ PersUtils.setImage(personId, value);
+ else
+ PersUtils.removeImage(personId);
+});
+
+var user = tools.getUserByAttribute(tools.NAME, vars.get("$field.UID"));
+
+user[tools.TITLE] = vars.get("$field.TITLE");
+user[tools.PARAMS][tools.ISACTIVE] = vars.get("$field.ISACTIVE");
+user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
+user[tools.PARAMS][tools.EMAIL] = vars.get("$field.EMAIL_ADDRESS");
+user[tools.PARAMS][tools.CALENDARID] = vars.get("$field.EMAIL_ADDRESS");
+user[tools.PARAMS][tools.CONTACTID] = vars.get("$field.CONTACT_ID");
+user[tools.PARAMS][tools.DESCRIPTION] = vars.get("$field.DESCRIPTION");
+user[tools.PARAMS].department = vars.get("$field.DEPARTMENT");
+
+if (vars.exists("$param.PasswordChange_param") && vars.get("$param.PasswordChange_param")
+ && vars.get("$field.PASSWORD") == vars.get("$field.CONFIRM_PASSWORD"))
+{
+ user[tools.PASSWORD] = vars.getString("$field.PASSWORD");
+}
+
tools.updateUser(user);
\ No newline at end of file
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index ad54f154ad5dc7d6cf1cf06717f77545d4aa9b83..d1a1f37a0865833eeca85678a7076ad20acd551d 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -1,177 +1,177 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Forecast_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>${FORECAST_ENGLISH}</title>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>DATE_START</name>
- <title>Planned</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/date_start/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>GROUPCODE</name>
- <title>Product</title>
- <consumer>KeywordProductGroupcodes</consumer>
- <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>INFO</name>
- <title>Info</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityField>
- <name>FORECASTID</name>
- <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/forecastid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_ROWID</name>
- <title>Connection</title>
- <consumer>Objects</consumer>
- <linkedContextProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
- <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>TYPE</name>
- </entityField>
- <entityField>
- <name>VOLUME</name>
- <titleProcess>%aditoprj%/entity/Forecast_entity/entityfields/volume/titleProcess.js</titleProcess>
- </entityField>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>OBJECT_TYPE</name>
- <title>Type</title>
- <consumer>Contexts</consumer>
- <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Contexts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Context</fieldName>
- </dependency>
- </entityConsumer>
- <entityProvider>
- <name>Links</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>42f3a486-1fcd-46b7-8282-e55b1c7ac965</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Forecasts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Forecast_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>920ae11e-ae44-400f-9df0-fa879131a05c</name>
- <tableName>FORECAST</tableName>
- <primaryKey>FORECASTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE_START.value</name>
- <recordfield>FORECAST.DATE_START</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODE.value</name>
- <recordfield>FORECAST.GROUPCODE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>FORECAST.INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.value</name>
- <recordfield>FORECAST.TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VOLUME.value</name>
- <recordfield>FORECAST.VOLUME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODE.displayValue</name>
- <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.value</name>
- <recordfield>FORECAST.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.displayValue</name>
- <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>FORECAST.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>FORECASTID.value</name>
- <recordfield>FORECAST.FORECASTID</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Forecast_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>${FORECAST_ENGLISH}</title>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_START</name>
+ <title>Planned</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/date_start/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>GROUPCODE</name>
+ <title>Product</title>
+ <consumer>KeywordProductGroupcodes</consumer>
+ <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/groupcode/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>INFO</name>
+ <title>Info</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>FORECASTID</name>
+ <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/forecastid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <title>Connection</title>
+ <consumer>Objects</consumer>
+ <linkedContextProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+ <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ </entityField>
+ <entityField>
+ <name>VOLUME</name>
+ <titleProcess>%aditoprj%/entity/Forecast_entity/entityfields/volume/titleProcess.js</titleProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>Type</title>
+ <consumer>Contexts</consumer>
+ <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Forecast_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Context</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityProvider>
+ <name>Links</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>42f3a486-1fcd-46b7-8282-e55b1c7ac965</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Forecasts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Forecast_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>920ae11e-ae44-400f-9df0-fa879131a05c</name>
+ <tableName>FORECAST</tableName>
+ <primaryKey>FORECASTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_START.value</name>
+ <recordfield>FORECAST.DATE_START</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODE.value</name>
+ <recordfield>FORECAST.GROUPCODE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>FORECAST.INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <recordfield>FORECAST.TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VOLUME.value</name>
+ <recordfield>FORECAST.VOLUME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODE.displayValue</name>
+ <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/groupcode.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ <recordfield>FORECAST.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.displayValue</name>
+ <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>FORECAST.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>FORECASTID.value</name>
+ <recordfield>FORECAST.FORECASTID</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 4030d342d8b33ceeefd15d0ed60db5186652c781..2045dff5574c837d4c4796ace4c0c7d3a571db20 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,37 +1,41 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Gender_keyword</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>VALUE</name>
- </entityField>
- <entityProvider>
- <name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>ede7d623-3709-4d22-85fa-30214e2293e2</name>
- <entityName>Person_entity</entityName>
- <fieldName>Genders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Gender_keyword/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>VALUE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Gender_keyword</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>VALUE</name>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>ede7d623-3709-4d22-85fa-30214e2293e2</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Genders</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Gender_keyword/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>VALUE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index e88577d01ac0910696ccb9eb8922cbe399d441e0..51910085670d39b5823ae7dd1483852d109136e7 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,13 +1,13 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>IndexSearchEntity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>INDEXSEARCHFIELD</name>
- </entityField>
- </entityFields>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>IndexSearchEntity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>INDEXSEARCHFIELD</name>
+ </entityField>
+ </entityFields>
+</entity>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 40ace82bc463573dc716bf5abad5749d3a67badc..84f9c5720eb1c754bee538b7c5fb2a20b79fe71c 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,169 +1,169 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>KeywordAttributeRelation_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
- <title>Keyword Attribute Values</title>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>AB_KEYWORD_ATTRIBUTERELATIONID</name>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attributerelationid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CHAR_VALUE</name>
- <title>CHAR_VALUE</title>
- </entityField>
- <entityField>
- <name>NUMBER_VALUE</name>
- <contentType>NUMBER</contentType>
- </entityField>
- <entityField>
- <name>BOOL_VALUE</name>
- <contentType>BOOLEAN</contentType>
- </entityField>
- <entityField>
- <name>AB_KEYWORD_ATTRIBUTE_ID</name>
- <title>Keyword Attribute</title>
- <consumer>KeywordAttributes</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>AB_KEYWORD_ENTRY_ID</name>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>AttributesForKeywordEntry</name>
- <titlePlural></titlePlural>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>KeywordAttributeRelations</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>53b35858-7c81-429c-9e06-0362f567ad42</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>KeywordAttributeRelationsReadOnly</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess>
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>KeywordAttributes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>SpecificContainerKeyword</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>FilterAlreadyUsedByEntryId_param</name>
- <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>valueProxy</name>
- <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/documentation.adoc</documentation>
- <title>Value</title>
- <contentTypeProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
- </entityField>
- <entityField>
- <name>attributeType</name>
- <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LONG_CHAR_VALUE</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <isPageable v="false" />
- <isRequireContainerFiltering v="false" />
- <conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
- <tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
- <primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>AB_KEYWORD_ATTRIBUTERELATIONID.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTERELATIONID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>BOOL_VALUE.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CHAR_VALUE.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NUMBER_VALUE.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_KEYWORD_ATTRIBUTE_ID.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_KEYWORD_ENTRY_ID.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_KEYWORD_ATTRIBUTE_ID.displayValue</name>
- <expression>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/recordfieldmappings/ab_keyword_attribute_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LONG_CHAR_VALUE.value</name>
- <recordfield>AB_KEYWORD_ATTRIBUTERELATION.LONG_CHAR_VALUE</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>KeywordAttributeRelation_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
+ <title>Keyword Attribute Values</title>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>AB_KEYWORD_ATTRIBUTERELATIONID</name>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attributerelationid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CHAR_VALUE</name>
+ <title>CHAR_VALUE</title>
+ </entityField>
+ <entityField>
+ <name>NUMBER_VALUE</name>
+ <contentType>NUMBER</contentType>
+ </entityField>
+ <entityField>
+ <name>BOOL_VALUE</name>
+ <contentType>BOOLEAN</contentType>
+ </entityField>
+ <entityField>
+ <name>AB_KEYWORD_ATTRIBUTE_ID</name>
+ <title>Keyword Attribute</title>
+ <consumer>KeywordAttributes</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_attribute_id/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>AB_KEYWORD_ENTRY_ID</name>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/ab_keyword_entry_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>AttributesForKeywordEntry</name>
+ <titlePlural></titlePlural>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>490d12c0-6ace-42e5-89e1-d40b25322161</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>KeywordAttributeRelations</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>53b35858-7c81-429c-9e06-0362f567ad42</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>KeywordAttributeRelationsReadOnly</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/containername_param/valueProcess.js</valueProcess>
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordAttributes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>SpecificContainerKeyword</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>FilterAlreadyUsedByEntryId_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/keywordattributes/children/filteralreadyusedbyentryid_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>valueProxy</name>
+ <documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/documentation.adoc</documentation>
+ <title>Value</title>
+ <contentTypeProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js</contentTypeProcess>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>attributeType</name>
+ <valueProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/entityfields/attributetype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LONG_CHAR_VALUE</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <isRequireContainerFiltering v="false" />
+ <conditionProcess>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>8e2938d2-e14b-403b-8ae5-875f70bc3f85</name>
+ <tableName>AB_KEYWORD_ATTRIBUTERELATION</tableName>
+ <primaryKey>AB_KEYWORD_ATTRIBUTERELATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ATTRIBUTERELATIONID.value</name>
+ <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTERELATIONID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>BOOL_VALUE.value</name>
+ <recordfield>AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CHAR_VALUE.value</name>
+ <recordfield>AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NUMBER_VALUE.value</name>
+ <recordfield>AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ATTRIBUTE_ID.value</name>
+ <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ATTRIBUTE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ENTRY_ID.value</name>
+ <recordfield>AB_KEYWORD_ATTRIBUTERELATION.AB_KEYWORD_ENTRY_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ATTRIBUTE_ID.displayValue</name>
+ <expression>%aditoprj%/entity/KeywordAttributeRelation_entity/recordcontainers/db/recordfieldmappings/ab_keyword_attribute_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LONG_CHAR_VALUE.value</name>
+ <recordfield>AB_KEYWORD_ATTRIBUTERELATION.LONG_CHAR_VALUE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index e49e6791888f9cb63814b16164abcc8be77a9958..018b5024766fc57a3aa60db58d7ca80143ece010 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>KeywordAttribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index d3f662a02b58aa43da5e2dda475c4ee158ef5a58..3f0ce0a87b8abc714c74e0bfad622034c0416431 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,523 +1,548 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>KeywordEntry_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
- <title>Keyword</title>
- <siblings />
- <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
- <onValidation>%aditoprj%/entity/KeywordEntry_entity/onValidation.js</onValidation>
- <iconId>VAADIN:KEY</iconId>
- <iconIdProcess>%aditoprj%/entity/KeywordEntry_entity/iconIdProcess.js</iconIdProcess>
- <titlePlural>Keywords</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <lookupIdfield>KEYID</lookupIdfield>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityField>
- <name>CONTAINER</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/documentation.adoc</documentation>
- <title>Container</title>
- <groupable v="true" />
- <mandatory v="true" />
- <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
- <textInputAllowed v="true" />
- <state>READONLY</state>
- <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
- </entityField>
- <entityField>
- <name>AB_KEYWORD_ENTRYID</name>
- <title>AB_KEYWORD_ENTRYID (UID)</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>KEYID</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
- <title>Key</title>
- <mandatory v="true" />
- <state>READONLY</state>
- <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>TITLE</name>
- <title>Title (original language)</title>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>SORTING</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
- <title>Sorting</title>
- <mandatory v="false" />
- <state>AUTO</state>
- </entityField>
- <entityField>
- <name>ISACTIVE</name>
- <title>Active</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ISESSENTIAL</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/documentation.adoc</documentation>
- <title>Relational</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/dropDownProcess.js</dropDownProcess>
- <state>READONLY</state>
- </entityField>
- <entityParameter>
- <name>ContainerName_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/containername_param/documentation.adoc</documentation>
- </entityParameter>
- <entityProvider>
- <name>SpecificContainerKeywords</name>
- <lookupIdfield>KEYID</lookupIdfield>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
- <entityName>Activity_entity</entityName>
- <fieldName>KeywordDirections</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractPayments</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
- <entityName>Contract_entity</entityName>
- <fieldName>ContractTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>KeywordCurrencies</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c404b010-1634-4160-adca-7edf1535ee26</name>
- <entityName>Product_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>KeywordProductGroupcodes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordOfferStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8696e561-b263-4c7c-b753-c5da44b48055</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordOrganisationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
- <entityName>Person_entity</entityName>
- <fieldName>KeywordGenders</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>001e0934-0920-4b38-afff-caf299e96abf</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
- <entityName>Productprice_entity</entityName>
- <fieldName>KeywordPricelists</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
- <entityName>Orderitem_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
- <entityName>Product_entity</entityName>
- <fieldName>KeywordQuantityUnits</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
- <entityName>Member_entity</entityName>
- <fieldName>KeywordMemberRoles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
- <entityName>SalesprojectSource_entity</entityName>
- <fieldName>KeywordSources</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36a72192-902f-431b-8f43-0bef311678f7</name>
- <entityName>Order_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
- <entityName>Stock_entity</entityName>
- <fieldName>KeywordWarehouses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
- <entityName>KeywordAttribute_entity</entityName>
- <fieldName>KeywordAttributeTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
- <entityName>Attribute_entity</entityName>
- <fieldName>KeywordAttributeTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>718fe5a2-c75f-49ed-b67e-fc4fbf63ff1d</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordProbabilties</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
- <entityName>Activity_entity</entityName>
- <fieldName>KeywordCategories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordProbabilities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>fa831dac-3287-422a-8f28-504fc525876a</name>
- <entityName>Communication_entity</entityName>
- <fieldName>KeywordMediums</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordPricePolitics</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordPricePolitics</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordWeaknesses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>854148e2-2532-4562-b393-832819e8d462</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>KeywordStrenghts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>613d5861-0494-45f9-a839-a705347a68da</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordWeaknesses</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordStrenghts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordPhases</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordPriorities</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
- <entityName>Competition_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ef8b9397-6292-42de-806e-5aaf3e3db5f3</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>KeywordWonLost</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>5d9e0e48-ece8-4b8e-ab72-beef77b5dcc3</name>
- <entityName>Task_entity</entityName>
- <fieldName>KeywordProgress</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>36aa04c1-5361-4e40-a036-0546db596973</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordDeliveryTerm</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
- <entityName>Offer_entity</entityName>
- <fieldName>KeywordPaymentTerm</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>77be3cca-8b50-4810-9549-3fd3e6fdf220</name>
- <entityName>Person_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
- <entityName>Contact_entity</entityName>
- <fieldName>KeywordContactStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>740a9696-d394-48ea-bcbf-a5484a093bde</name>
- <entityName>SalesprojectMilestone_entity</entityName>
- <fieldName>Keywords</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b5c39776-509e-4758-8d05-a64eac4e7f38</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>KeywordStates</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
- <entityName>CampaignCost_entity</entityName>
- <fieldName>KeywordCampaignManagementCostCategory</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>63bd7284-e9a0-4576-afe8-299d412e8def</name>
- <entityName>ClassificationAdmin_entity</entityName>
- <fieldName>KeywordClassificationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
- <entityName>Classification_entity</entityName>
- <fieldName>KeywordClassificationTypes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>995646a8-ccec-4962-8c81-05a54903c433</name>
- <entityName>CommRestriction_Entity</entityName>
- <fieldName>CommRestrictionMedium</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>eb7c17de-3057-45c5-96c0-f863551cc049</name>
- <entityName>BulkMailRecipient_entity</entityName>
- <fieldName>StatusKeyword</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContainerName_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>TITLE_TRANSLATED</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/title_translated/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>KeywordAttributeRelations</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttributeRelation_entity</entityName>
- <fieldName>AttributesForKeywordEntry</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordAttributeRelationsReadOnly</name>
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
- <state>READONLY</state>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordAttributeRelation_entity</entityName>
- <fieldName>AttributesForKeywordEntry</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>KeywordEntryId_param</name>
- <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ExcludedKeyIdsSubquery_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>WhitelistIds_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/whitelistids_param/documentation.adoc</documentation>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <isPageable v="false" />
- <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
- <tableName>AB_KEYWORD_ENTRY</tableName>
- <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>TITLE.value</name>
- <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SORTING.value</name>
- <recordfield>AB_KEYWORD_ENTRY.SORTING</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISESSENTIAL.value</name>
- <recordfield>AB_KEYWORD_ENTRY.ISESSENTIAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISACTIVE.value</name>
- <recordfield>AB_KEYWORD_ENTRY.ISACTIVE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>AB_KEYWORD_ENTRYID.value</name>
- <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>KEYID.value</name>
- <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTAINER.value</name>
- <recordfield>AB_KEYWORD_ENTRY.CONTAINER</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>KeywordEntry_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
+ <title>Keyword</title>
+ <siblings />
+ <grantDelete v="false" />
+ <grantDeleteProcess>%aditoprj%/entity/KeywordEntry_entity/grantDeleteProcess.js</grantDeleteProcess>
+ <contentTitleProcess>%aditoprj%/entity/KeywordEntry_entity/contentTitleProcess.js</contentTitleProcess>
+ <onValidation>%aditoprj%/entity/KeywordEntry_entity/onValidation.js</onValidation>
+ <iconId>VAADIN:KEY</iconId>
+ <iconIdProcess>%aditoprj%/entity/KeywordEntry_entity/iconIdProcess.js</iconIdProcess>
+ <titlePlural>Keywords</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <lookupIdfield>KEYID</lookupIdfield>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>CONTAINER</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/documentation.adoc</documentation>
+ <title>Container</title>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/dropDownProcess.js</dropDownProcess>
+ <textInputAllowed v="true" />
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/container/stateProcess.js</stateProcess>
+ </entityField>
+ <entityField>
+ <name>AB_KEYWORD_ENTRYID</name>
+ <title>AB_KEYWORD_ENTRYID (UID)</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/ab_keyword_entryid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>KEYID</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/documentation.adoc</documentation>
+ <title>Key</title>
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keyid/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Title (original language)</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>SORTING</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/sorting/documentation.adoc</documentation>
+ <title>Sorting</title>
+ <mandatory v="false" />
+ <state>AUTO</state>
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ <title>Active</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isactive/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ISESSENTIAL</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/documentation.adoc</documentation>
+ <title>Relational</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/dropDownProcess.js</dropDownProcess>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/isessential/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/containername_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityProvider>
+ <name>SpecificContainerKeywords</name>
+ <lookupIdfield>KEYID</lookupIdfield>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>bb48a3ee-f340-4fd4-8c80-ef73b765ab58</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordContactStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4b1d1def-36d3-45e9-9ed5-eaef12d1ec82</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>KeywordDirections</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>42219987-4eff-4429-a22c-93e8a9c55c45</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractPayments</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>2712e2b3-f17f-4a9c-9752-2383f62eb2b8</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>bd68f269-457c-487d-a1b2-e045d98f74b7</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>ContractTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b88b5cc8-c29e-4110-b86e-d1d0050460e5</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordCurrencies</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>57c746ee-a8c0-484a-8c73-6301609b76b1</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordCurrencies</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>bf014596-954b-4c7d-9304-8283c9bcc7ae</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>KeywordCurrencies</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f5dcbf08-3765-4a9d-8b42-cb1219c87f57</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>53bcaa07-94eb-4e81-9e9e-c5748156dad5</name>
+ <entityName>Orderitem_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>c404b010-1634-4160-adca-7edf1535ee26</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3575fdd7-3dd6-4318-b0d2-32d1df821076</name>
+ <entityName>Forecast_entity</entityName>
+ <fieldName>KeywordProductGroupcodes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>5a21cbe2-4eb0-4968-80fa-b98a64599230</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordOfferStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8696e561-b263-4c7c-b753-c5da44b48055</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordOrganisationTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>0d54d283-f158-4b91-8f6d-026954ed9c50</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>KeywordGenders</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8d28f08b-675d-4bcf-9318-a508d45ca69e</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b069ef7d-07a0-460c-a8e7-cde5861c96c2</name>
+ <entityName>Productprice_entity</entityName>
+ <fieldName>KeywordPricelists</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7f134ef1-cff5-4cf4-9d2a-e288c7904c28</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>c3c3b430-a14f-46b4-909a-9b53cef35413</name>
+ <entityName>Orderitem_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a1983efd-92f9-4a6b-8805-d2977fcde0c8</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>KeywordQuantityUnits</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>026021cd-cd64-400d-8bd5-f6d044af1ad8</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>KeywordMemberRoles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>356e23f9-eb05-4e18-b0b5-cbc7c8716dba</name>
+ <entityName>SalesprojectSource_entity</entityName>
+ <fieldName>KeywordSources</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>36a72192-902f-431b-8f43-0bef311678f7</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e2041dea-8647-49e9-aacf-4481b75b76ff</name>
+ <entityName>Stock_entity</entityName>
+ <fieldName>KeywordWarehouses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>403c40a4-f747-4e47-ad60-07334724d6fb</name>
+ <entityName>KeywordAttribute_entity</entityName>
+ <fieldName>KeywordAttributeTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>078bbd52-87fa-44cc-9902-04af935b5fbc</name>
+ <entityName>Attribute_entity</entityName>
+ <fieldName>KeywordAttributeTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>718fe5a2-c75f-49ed-b67e-fc4fbf63ff1d</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordProbabilties</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>a44375e9-917c-4db8-9aa8-de0625caf78f</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>KeywordCategories</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f442a641-4dff-4860-bf4c-cfddc054e075</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordProbabilities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>fa831dac-3287-422a-8f28-504fc525876a</name>
+ <entityName>Communication_entity</entityName>
+ <fieldName>KeywordMediums</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>04b28ce6-a144-4c19-ac2d-4cfbc3568700</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordPricePolitics</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f024df05-2faf-4447-9eed-ae31b329d542</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordPricePolitics</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>60840c28-9875-4e3e-8099-5ca208d58bbe</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordWeaknesses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>854148e2-2532-4562-b393-832819e8d462</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>KeywordStrenghts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>613d5861-0494-45f9-a839-a705347a68da</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordWeaknesses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>119d79d0-9e04-4dd0-80bb-0bc32eaae775</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordStrenghts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6e2d164c-1ac7-4ed0-ad8f-7bfda1328493</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3ca6d3c7-83d2-4761-bab4-50d2baecdbd6</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordPhases</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1053a90d-574a-4ca2-b41d-42b513db0fd2</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>KeywordPriorities</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>bf9f7a07-dfb9-44d0-8f9b-d3814053683e</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>ef8b9397-6292-42de-806e-5aaf3e3db5f3</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>KeywordWonLost</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>5d9e0e48-ece8-4b8e-ab72-beef77b5dcc3</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>KeywordProgress</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>36aa04c1-5361-4e40-a036-0546db596973</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordDeliveryTerm</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordPaymentTerm</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>77be3cca-8b50-4810-9549-3fd3e6fdf220</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>KeywordContactStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7945545b-f1e6-446d-84c3-ef68486652f4</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>KeywordContactStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>740a9696-d394-48ea-bcbf-a5484a093bde</name>
+ <entityName>SalesprojectMilestone_entity</entityName>
+ <fieldName>Keywords</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b5c39776-509e-4758-8d05-a64eac4e7f38</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>KeywordStates</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>13d739cb-2b97-44a0-bed0-b6868b0e579e</name>
+ <entityName>CampaignCost_entity</entityName>
+ <fieldName>KeywordCampaignManagementCostCategory</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>63bd7284-e9a0-4576-afe8-299d412e8def</name>
+ <entityName>ClassificationAdmin_entity</entityName>
+ <fieldName>KeywordClassificationTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3a81e886-0d83-47f0-9ec7-c864ffc57cda</name>
+ <entityName>Classification_entity</entityName>
+ <fieldName>KeywordClassificationTypes</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>995646a8-ccec-4962-8c81-05a54903c433</name>
+ <entityName>CommRestriction_Entity</entityName>
+ <fieldName>CommRestrictionMedium</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>eb7c17de-3057-45c5-96c0-f863551cc049</name>
+ <entityName>BulkMailRecipient_entity</entityName>
+ <fieldName>StatusKeyword</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>44f84932-2a27-4e11-833b-def950c064d9</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>KeywordTickettype</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>10ba6c44-779c-4ba8-9277-e9583af03ed5</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>KeywordTaskState</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e1b87370-aa15-4540-99c1-7bd63f0f3263</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>KeywordTaskPriority</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>d8c587cc-47db-4e08-a6ac-92ec1d91acb5</name>
+ <entityName>BulkMail_entity</entityName>
+ <fieldName>StatusKeyword</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/specificcontainerkeywords/children/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>TITLE_TRANSLATED</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/title_translated/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OnlyActives_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/onlyactives_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordAttributeRelations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttributeRelation_entity</entityName>
+ <fieldName>AttributesForKeywordEntry</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelations/children/keywordentryid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordAttributeRelationsReadOnly</name>
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/documentation.adoc</documentation>
+ <state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordAttributeRelation_entity</entityName>
+ <fieldName>AttributesForKeywordEntry</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>KeywordEntryId_param</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/keywordattributerelationsreadonly/children/keywordentryid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ExcludedKeyIdsSubquery_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/excludedkeyidssubquery_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>WhitelistIds_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/KeywordEntry_entity/entityfields/whitelistids_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityField>
+ <name>expanded</name>
+ <valueProcess>%aditoprj%/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBDelete>%aditoprj%/entity/KeywordEntry_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>52acbfe0-57f4-4614-83af-9882e168f431</name>
+ <tableName>AB_KEYWORD_ENTRY</tableName>
+ <primaryKey>AB_KEYWORD_ENTRYID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SORTING.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.SORTING</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISESSENTIAL.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.ISESSENTIAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISACTIVE.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.ISACTIVE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>AB_KEYWORD_ENTRYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.AB_KEYWORD_ENTRYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>KEYID.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.KEYID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTAINER.value</name>
+ <recordfield>AB_KEYWORD_ENTRY.CONTAINER</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js b/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcb435b5f5508a654ce8c39f81aa6dd9c74fb323
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/expanded/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object(false);
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/entityfields/isessential/valueProcess.js b/entity/KeywordEntry_entity/entityfields/isessential/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4808df1d6a5fb9f87a6b95f7f507520fab3111cb
--- /dev/null
+++ b/entity/KeywordEntry_entity/entityfields/isessential/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string("0");
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/grantDeleteProcess.js b/entity/KeywordEntry_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..92ad10574babfedba2f70446fec73ad4c3f76684
--- /dev/null
+++ b/entity/KeywordEntry_entity/grantDeleteProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+
+var isEssential = vars.get("$field.ISESSENTIAL");
+
+var granted = true;
+if (isEssential == "1")
+ granted = false;
+
+result.string(granted)
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
index e581324d162afd72b6e3b262fc2a827a64882517..c8f0a22388ad20bd9af3b6811d527c66c8691c83 100644
--- a/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/KeywordEntry_entity/recordcontainers/db/conditionProcess.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.db");
import("system.result");
@@ -17,4 +18,6 @@ if (vars.exists("$param.WhitelistIds_param") && vars.getString("$param.Whitelist
cond.andIn("AB_KEYWORD_ENTRY.KEYID", JSON.parse(vars.getString("$param.WhitelistIds_param")));
var condStr = db.translateCondition(cond.build("1 = 1"));
+logging.log(condStr)
+
result.string(condStr);
\ No newline at end of file
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 49f9d4fe6b0392f9fab1181247062a902f1e2f21..113932dd5ccb725f589389436ad196fc102f05e4 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,116 +1,138 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Language_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityField>
- <name>ISO2</name>
- </entityField>
- <entityField>
- <name>ISO3</name>
- </entityField>
- <entityField>
- <name>NAME_NATIVE</name>
- </entityField>
- <entityField>
- <name>NAME_LATIN</name>
- </entityField>
- <entityField>
- <name>ISACTIVE</name>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/Language_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityProvider>
- <name>ISO3Name</name>
- <lookupIdfield>ISO3</lookupIdfield>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>471b099a-03ab-4c49-8372-729b1e789ecc</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>3429b46c-03e1-458a-9b60-0b6d2a560ce1</name>
- <entityName>Order_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>d2ae2b80-941f-42c5-89a4-67269d9a0411</name>
- <entityName>Person_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f0fd487b-6d1e-4247-8539-4b0912b003f8</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0b2dd6bf-933f-4476-9071-de9d5e23800b</name>
- <entityName>Product_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>030ac1ae-5f5b-4815-b9f4-1121b7c881ad</name>
- <entityName>Contact_entity</entityName>
- <fieldName>Languages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>156f3abb-eef3-41a0-8bfa-aa888fe587df</name>
- <entityName>Salutation_entity</entityName>
- <fieldName>KeywordLanguages</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <linkInformation>
- <linkInformation>
- <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
- <tableName>AB_LANGUAGE</tableName>
- <primaryKey>ISO3</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ISACTIVE.value</name>
- <recordfield>AB_LANGUAGE.ISACTIVE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISO2.value</name>
- <recordfield>AB_LANGUAGE.ISO2</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ISO3.value</name>
- <recordfield>AB_LANGUAGE.ISO3</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NAME_LATIN.value</name>
- <recordfield>AB_LANGUAGE.NAME_LATIN</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NAME_NATIVE.value</name>
- <recordfield>AB_LANGUAGE.NAME_NATIVE</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Language_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>ISO2</name>
+ </entityField>
+ <entityField>
+ <name>ISO3</name>
+ </entityField>
+ <entityField>
+ <name>NAME_NATIVE</name>
+ </entityField>
+ <entityField>
+ <name>NAME_LATIN</name>
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Language_entity/entityfields/isactive/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityProvider>
+ <name>ISO3Name</name>
+ <lookupIdfield>ISO3</lookupIdfield>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>471b099a-03ab-4c49-8372-729b1e789ecc</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>3429b46c-03e1-458a-9b60-0b6d2a560ce1</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>d2ae2b80-941f-42c5-89a4-67269d9a0411</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f0fd487b-6d1e-4247-8539-4b0912b003f8</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>030ac1ae-5f5b-4815-b9f4-1121b7c881ad</name>
+ <entityName>Contact_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>156f3abb-eef3-41a0-8bfa-aa888fe587df</name>
+ <entityName>Salutation_entity</entityName>
+ <fieldName>KeywordLanguages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>ISO3NameFiltered</name>
+ <dependencies>
+ <entityDependency>
+ <name>2df9d0ed-c26b-4166-9667-786a55146e05</name>
+ <entityName>DescriptionTranslation_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ExcludedIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Language_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>3cd06d7c-16c3-49e5-87cd-672a7222e613</name>
+ <tableName>AB_LANGUAGE</tableName>
+ <primaryKey>ISO3</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ISACTIVE.value</name>
+ <recordfield>AB_LANGUAGE.ISACTIVE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISO2.value</name>
+ <recordfield>AB_LANGUAGE.ISO2</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISO3.value</name>
+ <recordfield>AB_LANGUAGE.ISO3</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME_LATIN.value</name>
+ <recordfield>AB_LANGUAGE.NAME_LATIN</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME_NATIVE.value</name>
+ <recordfield>AB_LANGUAGE.NAME_NATIVE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Language_entity/recordcontainers/db/conditionProcess.js b/entity/Language_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f35be6d3c9a951a3ecd210484e522606a660dfa1
--- /dev/null
+++ b/entity/Language_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+var cond = SqlCondition.begin();
+
+if (vars.exists("$param.ExcludedIds_param") && vars.getString("$param.ExcludedIds_param"))
+{
+ cond.andIn("AB_LANGUAGE.ISO3", JSON.parse(vars.getString("$param.ExcludedIds_param")), undefined, true)
+}
+
+result.string(db.translateCondition(cond.build("1 = 1")))
\ No newline at end of file
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 9c2d0ef2054430f155ff5ee17b133ce1106898d3..9072a38f2626faf291f243a471a82889db7b5b4c 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -1,48 +1,50 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Letter_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>DOCUMENT_TEMPLATE</name>
- <title>Document Template</title>
- <consumer>DocumentTemplates</consumer>
- <linkedContext>DocumentTemplate</linkedContext>
- </entityField>
- <entityConsumer>
- <name>DocumentTemplates</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <onInsert>%aditoprj%/entity/Letter_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <recordFields>
- <element>UID.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Letter_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>DOCUMENT_TEMPLATE</name>
+ <title>Document Template</title>
+ <consumer>DocumentTemplates</consumer>
+ <linkedContext>DocumentTemplate</linkedContext>
+ </entityField>
+ <entityConsumer>
+ <name>DocumentTemplates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <onInsert>%aditoprj%/entity/Letter_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 9a8883bfb6848b4000e2456bec0f7742f340c963..1d22e132fd9fac9c2c726daf8230c3ad7f57ebdc 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,137 +1,145 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>LogHistory_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Log</title>
- <grantUpdate v="false" />
- <grantDelete v="false" />
- <iconId>NEON:HISTORY</iconId>
- <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
- <titlePlural>Logs</titlePlural>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>DATE_NEW</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>SECOND</resolution>
- <outputFormat></outputFormat>
- <inputFormat></inputFormat>
- <groupable v="true" />
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <title>User</title>
- <groupable v="true" />
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- <mandatory v="true" />
- </entityField>
- <entityProvider>
- <name>LogHistoryProvider</name>
- <dependencies>
- <entityDependency>
- <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
- <entityName>Person_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name>
- <entityName>Offer_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name>
- <entityName>Order_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>de473d92-dbd3-4300-8887-163c997fcd62</name>
- <entityName>Contract_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name>
- <entityName>Product_entity</entityName>
- <fieldName>LogHistoryConsumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>6d14d6dd-ce6e-464f-9132-3e10c1116246</name>
- <entityName>Task_entity</entityName>
- <fieldName>LogHistories</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>tablenames_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>UID</name>
- <title>ID</title>
- <mandatory v="true" />
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ICON</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
- </entityField>
- <entityActionGroup>
- <name>Reloading_actionGroup</name>
- <children>
- <entityActionField>
- <name>ReloadEntires_action</name>
- <title>Search for new Entries</title>
- <onActionProcess>%aditoprj%/entity/LogHistory_entity/entityfields/reloading_actiongroup/children/reloadentires_action/onActionProcess.js</onActionProcess>
- <isObjectAction v="false" />
- <iconId>VAADIN:REFRESH</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <isPageable v="false" />
- <isFilterable v="true" />
- <isSortable v="false" />
- <contentProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>DATE_NEW.value</element>
- <element>USER_NEW.value</element>
- <element>DESCRIPTION.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>LogHistory_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Log</title>
+ <grantUpdate v="false" />
+ <grantDelete v="false" />
+ <iconId>NEON:HISTORY</iconId>
+ <imageProcess>%aditoprj%/entity/LogHistory_entity/imageProcess.js</imageProcess>
+ <titlePlural>Logs</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>SECOND</resolution>
+ <outputFormat></outputFormat>
+ <inputFormat></inputFormat>
+ <groupable v="true" />
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <title>User</title>
+ <groupable v="true" />
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ <mandatory v="true" />
+ </entityField>
+ <entityProvider>
+ <name>LogHistoryProvider</name>
+ <dependencies>
+ <entityDependency>
+ <name>23dbfa51-5340-48e3-bd60-e0dcb7d44ad3</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>093a40d9-9f20-4c2f-8b43-3eed39b6bede</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>58532bc9-e789-403d-91a5-832ac40d6a6e</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6caadcde-8fda-40cb-97e0-ae507beab9d7</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f49eacab-f62c-4354-88eb-359cc92c2d44</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>de473d92-dbd3-4300-8887-163c997fcd62</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>1c941565-b8ca-4805-a9d6-d49eb26a9801</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>LogHistoryConsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>6d14d6dd-ce6e-464f-9132-3e10c1116246</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>LogHistories</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>UID</name>
+ <title>ID</title>
+ <mandatory v="true" />
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/LogHistory_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>Reloading_actionGroup</name>
+ <children>
+ <entityActionField>
+ <name>ReloadEntires_action</name>
+ <title>Search for new Entries</title>
+ <onActionProcess>%aditoprj%/entity/LogHistory_entity/entityfields/reloading_actiongroup/children/reloadentires_action/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>VAADIN:REFRESH</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <isPageable v="false" />
+ <isFilterable v="true" />
+ <isSortable v="false" />
+ <contentProcess>%aditoprj%/entity/LogHistory_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index c79748976882e533d4dd66fb4e26a94d948fa71a..090ca67f85f213fdbc603ef4de8f97f58646cba1 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Member_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>${SALESPROJECT_MEMBER}</title>
diff --git a/entity/Member_entity/conditionProcess.js b/entity/Member_entity/conditionProcess.js
deleted file mode 100644
index e0f35ab06bb292e7e57bc2b43d44d96612dcfb55..0000000000000000000000000000000000000000
--- a/entity/Member_entity/conditionProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = new SqlCondition();
-cond.andPrepareVars("MEMBER.OBJECT_ROWID", "$param.ObjectRowId_param")
-cond.andPrepareVars("MEMBER.OBJECT_TYPE", "$param.ObjectType_param");
-
-//TODO: use a preparedCondition when available #1030812 #1034026
-result.string(db.translateCondition(cond.build("1 = 1")));
\ No newline at end of file
diff --git a/entity/Member_entity/fromClauseProcess.js b/entity/Member_entity/fromClauseProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index cb6ac1cc1f4820e439d7a67b2b0d48f87b814585..04d6372a08d4b79170921e669e5669767658c428 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,92 +1,106 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>ModuleTree_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>History</title>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- </entityProvider>
- <entityField>
- <name>TITLE</name>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- </entityField>
- <entityField>
- <name>ICON</name>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityProvider>
- <name>TreeProviders</name>
- <targetContextField>TYPE</targetContextField>
- <targetIdField>UID</targetIdField>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
- <entityName>Task_entity</entityName>
- <fieldName>ModuleTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>70e2ea81-1e08-47a6-ac89-3164bdbd9e02</name>
- <entityName>Activity_entity</entityName>
- <fieldName>ModuleTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContextName_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ID_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>PARENT_ID</name>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>PARENT_CONTEXT</name>
- </entityField>
- <entityField>
- <name>TYPE</name>
- </entityField>
- <entityParameter>
- <name>ContextName_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ID_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>TYPE.value</element>
- <element>PARENT_ID.value</element>
- <element>PARENT_CONTEXT.value</element>
- <element>TITLE.value</element>
- <element>DESCRIPTION.value</element>
- <element>ICON.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>ModuleTree_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>History</title>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityProvider>
+ <name>TreeProviders</name>
+ <targetContextField>TYPE</targetContextField>
+ <targetIdField>UID</targetIdField>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7da88ffb-4292-4fe2-88e2-dda2dc4aa625</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>ModuleTrees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>70e2ea81-1e08-47a6-ac89-3164bdbd9e02</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>ModuleTrees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContextName_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ID_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>PARENT_ID</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>PARENT_CONTEXT</name>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ </entityField>
+ <entityParameter>
+ <name>ContextName_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ID_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT_CONTEXT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ICON.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 0ced4d781548b293b614097ca29ef55b26a36310..3447b25df1c4974dc03b8b53fec5968f90a1ac7f 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,241 +1,241 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Notification_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Notifications</title>
- <iconId>VAADIN:BELL</iconId>
- <titlePlural>Notifications</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <targetContextField>LINKCONTEXT</targetContextField>
- <targetIdField>LINKID</targetIdField>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CONTENTID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>USER</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>STATE</name>
- <title>State</title>
- <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>BACKPACK</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CAPTION</name>
- <title>title</title>
- </entityField>
- <entityField>
- <name>CREATIONDATE</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>MINUTE</resolution>
- <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/creationdate/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>description</title>
- </entityField>
- <entityField>
- <name>FORCEDPRIORITY</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ICON</name>
- <colorProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/colorProcess.js</colorProcess>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LIFETIME</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ORIGINATORNAME</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>RECIPIENTUSERIDS</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>TYPECODE</name>
- <title>Type</title>
- <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>VERSION</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>LINKCONTEXT</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkcontext/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LINKID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>LINKINFO</name>
- <searchable v="false" />
- </entityField>
- <entityActionGroup>
- <name>setNotificationState</name>
- <children>
- <entityActionField>
- <name>archieve</name>
- <title>archieve</title>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
- <iconId>VAADIN:ARCHIVE</iconId>
- <tooltip></tooltip>
- <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>setRead</name>
- <title>setRead</title>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
- <iconId>VAADIN:OPEN_BOOK</iconId>
- <tooltip></tooltip>
- <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>setUnread</name>
- <title>setUnread</title>
- <description></description>
- <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
- <iconId>VAADIN:BOOK</iconId>
- <tooltip></tooltip>
- <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityActionField>
- <name>rowClickAction</name>
- <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
- </entityActionField>
- <entityField>
- <name>RESOLVEDPRIORITY</name>
- <title>priority</title>
- <textInputAllowed v="false" />
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>_____SYSTEMALIAS</alias>
- <isPageable v="false" />
- <conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
- <tableName>ASYS_NOTIFICATIONS</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</name>
- <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
- <primaryKey>CONTENTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>BACKPACK.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.BACKPACK</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CAPTION.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.CAPTION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTENTID.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.CONTENTID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CREATIONDATE.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATIONDATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DESCRIPTION.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.DESCRIPTION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>FORCEDPRIORITY.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LIFETIME.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.LIFETIME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORIGINATORNAME.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.ORIGINATORNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>RECIPIENTUSERIDS.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.RECIPIENTUSERIDS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATE.value</name>
- <recordfield>ASYS_NOTIFICATIONS.STATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPECODE.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.TYPECODE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UID.value</name>
- <recordfield>ASYS_NOTIFICATIONS.ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER.value</name>
- <recordfield>ASYS_NOTIFICATIONS.USERID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VERSION.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.VERSION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LINKINFO.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.LINK_INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ICON.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CALCULATEDPRIORITY.value</name>
- <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>RESOLVEDPRIORITY.value</name>
- <recordfield>ASYS_NOTIFICATIONS.RESOLVEDPRIORITY</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Notification_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Notifications</title>
+ <iconId>VAADIN:BELL</iconId>
+ <titlePlural>Notifications</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <targetContextField>LINKCONTEXT</targetContextField>
+ <targetIdField>LINKID</targetIdField>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CONTENTID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>USER</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>STATE</name>
+ <title>State</title>
+ <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/state/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>BACKPACK</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CAPTION</name>
+ <title>title</title>
+ </entityField>
+ <entityField>
+ <name>CREATIONDATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/creationdate/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>description</title>
+ </entityField>
+ <entityField>
+ <name>FORCEDPRIORITY</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <colorProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/colorProcess.js</colorProcess>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LIFETIME</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ORIGINATORNAME</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>RECIPIENTUSERIDS</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>TYPECODE</name>
+ <title>Type</title>
+ <displayValueProcess>%aditoprj%/entity/Notification_entity/entityfields/typecode/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>VERSION</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>LINKCONTEXT</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkcontext/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LINKID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Notification_entity/entityfields/linkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>LINKINFO</name>
+ <searchable v="false" />
+ </entityField>
+ <entityActionGroup>
+ <name>setNotificationState</name>
+ <children>
+ <entityActionField>
+ <name>archieve</name>
+ <title>archieve</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:ARCHIVE</iconId>
+ <tooltip></tooltip>
+ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/archieve/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>setRead</name>
+ <title>setRead</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:OPEN_BOOK</iconId>
+ <tooltip></tooltip>
+ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setread/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>setUnread</name>
+ <title>setUnread</title>
+ <description></description>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:BOOK</iconId>
+ <tooltip></tooltip>
+ <tooltipProcess>%aditoprj%/entity/Notification_entity/entityfields/setnotificationstate/children/setunread/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityActionField>
+ <name>rowClickAction</name>
+ <onActionProcess>%aditoprj%/entity/Notification_entity/entityfields/rowclickaction/onActionProcess.js</onActionProcess>
+ </entityActionField>
+ <entityField>
+ <name>RESOLVEDPRIORITY</name>
+ <title>priority</title>
+ <textInputAllowed v="false" />
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>_____SYSTEMALIAS</alias>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Notification_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>c4e34b96-6081-4d04-8377-040a8ed3e14c</name>
+ <tableName>ASYS_NOTIFICATIONS</tableName>
+ <primaryKey>ID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>38bfb16c-bfe9-45dd-8ce7-692ebba030a9</name>
+ <tableName>ASYS_NOTIFICATIONCONTENTS</tableName>
+ <primaryKey>CONTENTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>BACKPACK.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.BACKPACK</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CAPTION.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.CAPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTENTID.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.CONTENTID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CREATIONDATE.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.CREATIONDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>FORCEDPRIORITY.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LIFETIME.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.LIFETIME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORIGINATORNAME.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.ORIGINATORNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RECIPIENTUSERIDS.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.RECIPIENTUSERIDS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATE.value</name>
+ <recordfield>ASYS_NOTIFICATIONS.STATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPECODE.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.TYPECODE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UID.value</name>
+ <recordfield>ASYS_NOTIFICATIONS.ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER.value</name>
+ <recordfield>ASYS_NOTIFICATIONS.USERID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VERSION.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.VERSION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LINKINFO.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.LINK_INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ICON.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.ICON_INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CALCULATEDPRIORITY.value</name>
+ <recordfield>ASYS_NOTIFICATIONCONTENTS.FORCEDPRIORITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>RESOLVEDPRIORITY.value</name>
+ <recordfield>ASYS_NOTIFICATIONS.RESOLVEDPRIORITY</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 4e6a3a747400563d12bb8a3162c112024a0379ae..c0256f7726f90bd860a30fe4f38c637e82adac93 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>ObjectRelationType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:SPLIT</icon>
@@ -138,22 +138,50 @@
<onInsert>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onInsert.js</onInsert>
<onUpdate>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
<onDelete>%aditoprj%/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>SOURCE_RELATION_TITLE.value</element>
- <element>RELATION_TYPE.value</element>
- <element>DIRECTION.value</element>
- <element>HIERARCHY.value</element>
- <element>DEST_OBJECT_TYPE.value</element>
- <element>SOURCE_OBJECT_TYPE.value</element>
- <element>AB_OBJECTRELATIONTYPE1.value</element>
- <element>AB_OBJECTRELATIONTYPE2.value</element>
- <element>SIDE.value</element>
- <element>DEST_OBJECTRELATIONTYPEID.value</element>
- <element>DEST_RELATION_TITLE.value</element>
- <element>Type2Enabled_proxy.value</element>
- <element>ICON.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SOURCE_RELATION_TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>RELATION_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DIRECTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>HIERARCHY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DEST_OBJECT_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SOURCE_OBJECT_TYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>AB_OBJECTRELATIONTYPE1.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>AB_OBJECTRELATIONTYPE2.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SIDE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DEST_OBJECTRELATIONTYPEID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DEST_RELATION_TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Type2Enabled_proxy.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ICON.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index c77b6a483878dca28ef9e9c4144b09e5c47b4a62..2b92a0a54fc1cc432fee2186e752e4f801894865 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,209 +1,227 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>ObjectTree_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Object relation</title>
- <grantUpdateProcess>%aditoprj%/entity/ObjectTree_entity/grantUpdateProcess.js</grantUpdateProcess>
- <titlePlural>Relations</titlePlural>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityProvider>
- <name>TreeProvider</name>
- <targetContextField>TARGET_CONTEXT</targetContextField>
- <targetIdField>TARGET_ID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>ObjectTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>423acf79-e2c5-46e4-9fb5-7b1a7078d4f4</name>
- <entityName>Person_entity</entityName>
- <fieldName>ObjectTrees</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ObjectId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>RelationType_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>Uid_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ObjectId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>UID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>PARENT_ID</name>
- <searchable v="false" />
- <tooltip></tooltip>
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TITLE</name>
- <title>Object</title>
- <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/title/linkedContextProcess.js</linkedContextProcess>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ICON</name>
- <contentType>IMAGE</contentType>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>ObjectRelationTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>ObjectRelationType_entity</entityName>
- <fieldName>ObjectRelationTypes</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>SourceObjectType_param</name>
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>EXPANDED</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>NODEID</name>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>TARGET_ID</name>
- <title>Object</title>
- <consumer>Objects</consumer>
- <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
- <mandatory v="true" />
- <searchable v="false" />
- <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>TARGET_CONTEXT</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>INFO</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- <searchable v="false" />
- <tooltipProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/info/tooltipProcess.js</tooltipProcess>
- </entityField>
- <entityField>
- <name>OBJECTRELATIONTYPEID</name>
- <title>Relationtype</title>
- <consumer>ObjectRelationTypes</consumer>
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js</onValueChange>
- </entityField>
- <entityConsumer>
- <name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <title></title>
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionGroup>
- <name>alter</name>
- <children>
- <entityActionField>
- <name>insert</name>
- <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:FILE_TREE_SMALL</iconId>
- <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>edit</name>
- <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
- <iconId>NEON:PENCIL</iconId>
- <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityParameter>
- <name>RelationType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Uid_param</name>
- <expose v="true" />
- <description>Needed to load ONE Objectrelation together with ObjectId_param and ObjectType_param to determine the side</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <isFilterable v="true" />
- <contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>TITLE.value</element>
- <element>PARENT_ID.value</element>
- <element>EXPANDED.value</element>
- <element>TARGET_ID.value</element>
- <element>TARGET_CONTEXT.value</element>
- <element>INFO.value</element>
- <element>OBJECTRELATIONTYPEID.value</element>
- <element>ICON.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>ObjectTree_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Object relation</title>
+ <grantUpdateProcess>%aditoprj%/entity/ObjectTree_entity/grantUpdateProcess.js</grantUpdateProcess>
+ <titlePlural>Relations</titlePlural>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>TreeProvider</name>
+ <targetContextField>TARGET_CONTEXT</targetContextField>
+ <targetIdField>TARGET_ID</targetIdField>
+ <dependencies>
+ <entityDependency>
+ <name>f4c0605f-3ccb-4ff1-b460-7268e8553857</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>ObjectTrees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>423acf79-e2c5-46e4-9fb5-7b1a7078d4f4</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>ObjectTrees</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>RelationType_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>UID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>PARENT_ID</name>
+ <searchable v="false" />
+ <tooltip></tooltip>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/parent_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Object</title>
+ <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/title/linkedContextProcess.js</linkedContextProcess>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <contentType>IMAGE</contentType>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ObjectRelationTypes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ObjectRelationType_entity</entityName>
+ <fieldName>ObjectRelationTypes</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>SourceObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypes/children/sourceobjecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>EXPANDED</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>NODEID</name>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>TARGET_ID</name>
+ <title>Object</title>
+ <consumer>Objects</consumer>
+ <linkedContextProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
+ <searchable v="false" />
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TARGET_CONTEXT</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/target_context/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ <searchable v="false" />
+ <tooltipProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/info/tooltipProcess.js</tooltipProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECTRELATIONTYPEID</name>
+ <title>Relationtype</title>
+ <consumer>ObjectRelationTypes</consumer>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/ObjectTree_entity/entityfields/objectrelationtypeid/onValueChange.js</onValueChange>
+ </entityField>
+ <entityConsumer>
+ <name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <title></title>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <valueProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/objects/children/excludedobjectids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionGroup>
+ <name>alter</name>
+ <children>
+ <entityActionField>
+ <name>insert</name>
+ <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/insert/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>edit</name>
+ <onActionProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/onActionProcess.js</onActionProcess>
+ <iconId>NEON:PENCIL</iconId>
+ <stateProcess>%aditoprj%/entity/ObjectTree_entity/entityfields/alter/children/edit/stateProcess.js</stateProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityParameter>
+ <name>RelationType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Uid_param</name>
+ <expose v="true" />
+ <description>Needed to load ONE Objectrelation together with ObjectId_param and ObjectType_param to determine the side</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <isFilterable v="true" />
+ <contentProcess>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/ObjectTree_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>EXPANDED.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TARGET_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TARGET_CONTEXT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>INFO.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OBJECTRELATIONTYPEID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ICON.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ObjectTree_entity/grantUpdateProcess.js b/entity/ObjectTree_entity/grantUpdateProcess.js
index 105ebb440b8a5084799523a1615266a7727dcab4..33e0143ce68d08588f4cebe46478e398844793f2 100644
--- a/entity/ObjectTree_entity/grantUpdateProcess.js
+++ b/entity/ObjectTree_entity/grantUpdateProcess.js
@@ -13,14 +13,7 @@ if (vars.exists("$sys.selection") && vars.getString("$sys.selection"))
isObjectRelationNode = typeof uid[2] == "string";
}
- if (isObjectRelationNode)
- {
- result.string(true)
- }
- else
- {
- result.string(false)
- }
+ result.object(isObjectRelationNode)
}
else
- result.string(false)
\ No newline at end of file
+ result.object(false)
\ No newline at end of file
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 61c1821ac6f24d9f33c04c76148aa2e4411d887d..a2911d79d55daef5e53fc2974a2e590dee06abe7 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -82,8 +82,8 @@ function _loadObjectRelationTree(pObjectId, pObjectType, pObjectRelationTypeId,
// use always reverse-type
relationTypeData = ObjectRelationUtils.getRelationType(relationTypeData[8]);
currentObjectId = _getRootID(currentObjectId, relationTypeData);
- }
- // true to enable the insert button always --v
+ }
+ // true to enable the insert button always --v
let uids = _insertEntry(tree, [[currentObjectId, "", "", "", "", relationTypeData[7]]], pNodeId, pLayer, pObjectType, selectedRelationType, relationTypeData[12], true)
for (let i = 0; i < uids.length; i++)
{
@@ -252,6 +252,8 @@ function _getRelationTypes(pObjectType)
* @param {Integer} pLayer layernumber
* @param {String} pObjectType
* @param {String} pNewRelationTypeId the RelationType, a new relation should have, if this node is selected.
+ * @param {String} pIcon the icon which should be added to the entry
+ * @param {Boolean} pHierarchy add if hierarchy is enabled or not for this entry
* @param {Integer} [pNum=undefined] optional number added to the key. Needed, if the key would not be unique.
*
* @return {Array[][]} the uids of the inserted data. Consists of [ObjectId, pEntryData-Index, AB_OBJECTRELATIONTYPEID, pObjectType (from param), pNodeId, objecttype (from entryId), objectrelationid, hierarchy]
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index c52a9135621ad2839b20167d8a41ad65a0fea0c0..5e21c9b652b57091193307494b5f0919130a7729 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,250 +1,254 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Object_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
- <contentTitleProcess>%aditoprj%/entity/Object_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>TITLE</name>
- </entityField>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>AllObjects</name>
- <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
- <documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
- <recordContainer>jdito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
- <entityName>TaskLink_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>0a2aa5c9-1ba2-41bd-b5f4-3a761efbcf2e</name>
- <entityName>ActivityLink_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>564d43e8-a7d6-44a5-82a0-3443129d568c</name>
- <entityName>AppointmentLink_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>40bf3a74-2335-4925-9490-1404fa7c81f6</name>
- <entityName>Forecast_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>8834387f-acf8-4d9f-80ec-45425622a3dd</name>
- <entityName>Competition_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>349f13ea-8b4c-4cc0-987c-ae1717855bc1</name>
- <entityName>Member_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Organisations</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ExcludedContactIds_param</name>
- <valueProcess>%aditoprj%/entity/Object_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Persons</name>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ExcludedContactIds_param</name>
- <valueProcess>%aditoprj%/entity/Object_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Object_entity/entityfields/persons/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Offers</name>
- <dependency>
- <name>dependency</name>
- <entityName>Offer_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Object_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Orders</name>
- <dependency>
- <name>dependency</name>
- <entityName>Order_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Object_entity/entityfields/orders/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Products</name>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Contracts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Contract_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Object_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Salesprojects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Object_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>FilteredObjects</name>
- <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
- <dependencies>
- <entityDependency>
- <name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
- <entityName>ObjectTree_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e93b8c8f-2575-4669-9e45-48d8382444ab</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Objects</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ExcludedObjectIds_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Campaigns</name>
- <dependency>
- <name>dependency</name>
- <entityName>Campaign_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>CampaignSteps</name>
- <dependency>
- <name>dependency</name>
- <entityName>CampaignStep_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Object_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>TITLE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Object_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
+ <contentTitleProcess>%aditoprj%/entity/Object_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ </entityField>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>AllObjects</name>
+ <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/allobjects/targetConsumerProcess.js</targetConsumerProcess>
+ <documentation>%aditoprj%/entity/Object_entity/entityfields/allobjects/documentation.adoc</documentation>
+ <recordContainer>jdito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>445b79b3-e826-40d1-b6c2-46d62daf0818</name>
+ <entityName>TaskLink_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>0a2aa5c9-1ba2-41bd-b5f4-3a761efbcf2e</name>
+ <entityName>ActivityLink_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>564d43e8-a7d6-44a5-82a0-3443129d568c</name>
+ <entityName>AppointmentLink_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>40bf3a74-2335-4925-9490-1404fa7c81f6</name>
+ <entityName>Forecast_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>8834387f-acf8-4d9f-80ec-45425622a3dd</name>
+ <entityName>Competition_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>349f13ea-8b4c-4cc0-987c-ae1717855bc1</name>
+ <entityName>Member_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Organisations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/Object_entity/entityfields/organisations/children/excludedcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Persons</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedContactIds_param</name>
+ <valueProcess>%aditoprj%/entity/Object_entity/entityfields/persons/children/excludedcontactids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Object_entity/entityfields/persons/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Offers</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Object_entity/entityfields/offers/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Orders</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Object_entity/entityfields/orders/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contracts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Contract_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Object_entity/entityfields/contracts/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Object_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>FilteredObjects</name>
+ <targetConsumerProcess>%aditoprj%/entity/Object_entity/entityfields/filteredobjects/targetConsumerProcess.js</targetConsumerProcess>
+ <dependencies>
+ <entityDependency>
+ <name>e644a709-cc8f-425e-bef2-9c51eea9bbe9</name>
+ <entityName>ObjectTree_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e93b8c8f-2575-4669-9e45-48d8382444ab</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Objects</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExcludedObjectIds_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Campaigns</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Campaign_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>CampaignSteps</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CampaignStep_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Object_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index edf5202810824c0c5d66611a313c19278aa929b6..f7d1884b6ac421736dcd3d72384b39928e7bb7b8 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,1072 +1,1079 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Offer_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
- <title>Offer</title>
- <contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
- <afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
- <iconId>VAADIN:CART</iconId>
- <titlePlural>Offers</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <dependencies>
- <entityDependency>
- <name>f909c251-16c1-49e2-9b43-6d5f834137c6</name>
- <entityName>Object_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>CURRENCY</name>
- <title>Currency</title>
- <consumer>KeywordCurrencies</consumer>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>OFFERCODE</name>
- <documentation>%aditoprj%/entity/Offer_entity/entityfields/offercode/documentation.adoc</documentation>
- <title>Offer number</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/Offer_entity/entityfields/offercode/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>OFFERDATE</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OFFERID</name>
- <title>OFFERID (UID)</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PROBABILITY</name>
- <title>Probability</title>
- <consumer>KeywordProbabilities</consumer>
- <contentType>NUMBER</contentType>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>STATUS</name>
- <title>Status</title>
- <consumer>KeywordOfferStates</consumer>
- <mandatory v="true" />
- <state>EDITABLE</state>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>Total VAT</title>
- <contentType>NUMBER</contentType>
- <inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>HEADER</name>
- <title>Header text</title>
- <contentType>LONG_TEXT</contentType>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>Offeritems</name>
- <description></description>
- <dependency>
- <name>dependency</name>
- <entityName>Offeritem_entity</entityName>
- <fieldName>OfferItems</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>OfferId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferStatus_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>newOfferVersion</name>
- <title>New offer version</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CART</iconId>
- </entityActionField>
- <entityField>
- <name>NET</name>
- <title>Total net</title>
- <contentType>NUMBER</contentType>
- <inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>TotalGross</name>
- <documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
- <title>Total gross</title>
- <contentType>NUMBER</contentType>
- <inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>LANGUAGE</name>
- <title>Language</title>
- <consumer>Languages</consumer>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityActionField>
- <name>copyOffer</name>
- <title>Copy offer</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:COPY</iconId>
- </entityActionField>
- <entityField>
- <name>VERSNR</name>
- <documentation>%aditoprj%/entity/Offer_entity/entityfields/versnr/documentation.adoc</documentation>
- <title>Vers. no.</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/versnr/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OFFER_ID</name>
- <documentation>%aditoprj%/entity/Offer_entity/entityfields/offer_id/documentation.adoc</documentation>
- <title>OFFER_ID</title>
- </entityField>
- <entityFieldGroup>
- <name>OfferCode_VersNr_fieldgroup</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
- <title>Offer number</title>
- <description>Offercode + VersNr</description>
- <state>READONLY</state>
- <fields>
- <element>OFFERCODE</element>
- <element>VERSNR</element>
- </fields>
- </entityFieldGroup>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityActionField>
- <name>printOffer</name>
- <title>Print Offer</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:FILE_TEXT_O</iconId>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/stateProcess.js</stateProcess>
- </entityActionField>
- <entityField>
- <name>CONTACT_ORG_ID</name>
- <title>Company</title>
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>CONTACT_PERSON_ID</name>
- <title>Person</title>
- <searchable v="false" />
- </entityField>
- <entityConsumer>
- <name>AnyContacts</name>
- <dependency>
- <name>dependency</name>
- <entityName>AnyContact_entity</entityName>
- <fieldName>OnlySameCompany</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Documents</name>
- <selectionMode>MULTI</selectionMode>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>Documents</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>MainDocuments</name>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Document_entity</entityName>
- <fieldName>MainDocuments</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>AssignmentRowId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>AssignmentTable_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>ADDRESS</name>
- <documentation>%aditoprj%/entity/Offer_entity/entityfields/address/documentation.adoc</documentation>
- <title>Address</title>
- <description></description>
- <contentType>LONG_TEXT</contentType>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/address/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ChosenAddress</name>
- <title>Choose address</title>
- <consumer>PossibleAddresses</consumer>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- </onValueChangeTypes>
- </entityField>
- <entityConsumer>
- <name>KeywordCurrencies</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordOfferStates</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>newOrder</name>
- <title>Create receipt</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:DOLLAR</iconId>
- </entityActionField>
- <entityConsumer>
- <name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordProbabilities</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Activities</name>
- <dependency>
- <name>dependency</name>
- <entityName>Activity_entity</entityName>
- <fieldName>LinkedObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>RowId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>PresetLinks_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityActionField>
- <name>newActivity</name>
- <title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:HOURGLASS_END</iconId>
- <tooltip>New activity</tooltip>
- <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityProvider>
- <name>ContactOffers</name>
- <dependencies>
- <entityDependency>
- <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
- <entityName>Person_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferLanguage_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferCode_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferAddress_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferCurrency_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferDeliveryTerm_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferHeader_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferOriginal_Id_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferPaymentTerm_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferVersnr_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>PossibleConnectionTypes</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>OfferCurrency_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OfferLanguage_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OfferHeader_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OfferOriginal_Id_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OfferAddress_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OfferCode_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OfferVersnr_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityActionField>
- <name>newTask</name>
- <title>New task</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TASKS</iconId>
- </entityActionField>
- <entityField>
- <name>PAYMENTTERMS</name>
- <title>Payment term</title>
- <consumer>KeywordPaymentTerm</consumer>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>DELIVERYTERMS</name>
- <title>Delivery specification</title>
- <consumer>KeywordDeliveryTerm</consumer>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>KeywordPaymentTerm</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordDeliveryTerm</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Tasks</name>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
- <dependency>
- <name>dependency</name>
- <entityName>Task_entity</entityName>
- <fieldName>Tasks</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RowId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>PresetLinks_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>INFO</name>
- <title>Information</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityConsumer>
- <name>Attributes</name>
- <onValidation>%aditoprj%/entity/Offer_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>OfferPaymentTerm_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>OfferDeliveryTerm_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>USER_NEW</name>
- <title>USER_NEW</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <title>USER_EDIT</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <title>DATE_NEW</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_EDIT</name>
- <title>DATE_EDIT</title>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>FullOfferCode</name>
- <title>Offer number</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>PossibleAddresses</name>
- <dependency>
- <name>dependency</name>
- <entityName>Address_entity</entityName>
- <fieldName>OrganisationAndContactAddresses</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>ChoosenTEXHeader</name>
- <title>Choose Header</title>
- <consumer>DocumentTemplateTexHeader</consumer>
- </entityField>
- <entityField>
- <name>OBJECT_ROWID</name>
- <title>Link</title>
- <consumer>Objects</consumer>
- <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
- <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
- <state>AUTO</state>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_TYPE</name>
- <title>Connection Type</title>
- <consumer>Contexts</consumer>
- <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/mandatoryProcess.js</mandatoryProcess>
- <state>INVISIBLE</state>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>FilteredObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Contexts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>Context</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>Whitelist</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contexts/children/whitelist/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>Links</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Offers</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>OfferDeliveryTerm_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferCode_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferOriginal_Id_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferAddress_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferCurrency_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferHeader_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferLanguage_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferPaymentTerm_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>OfferVersnr_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>PossibleConnectionTypes</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/links/children/possibleconnectiontypes/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>chooseTEXHeader</name>
- <consumer>DocumentTemplateTex</consumer>
- </entityField>
- <entityConsumer>
- <name>DocumentTemplateTexHeader</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>DocumentTemplateTypeClassification_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>LogHistoryConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>LogHistory_entity</entityName>
- <fieldName>LogHistoryProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>tablenames_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>FOOTER</name>
- <title>Footer text</title>
- <contentType>LONG_TEXT</contentType>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/footer/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OfferFooter_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>ChoosenTEXFooter</name>
- <title>Choose Footer</title>
- <consumer>DocumentTemplateTexFooter</consumer>
- </entityField>
- <entityConsumer>
- <name>DocumentTemplateTexFooter</name>
- <dependency>
- <name>dependency</name>
- <entityName>DocumentTemplate_entity</entityName>
- <fieldName>DocumentTemplateProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DocumentTemplateType_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>DocumentTemplateTypeClassification_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Salesprojects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Salesprojects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>CONTACT_ID</name>
- <documentation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/documentation.adoc</documentation>
- <title>Contact</title>
- <consumer>AnyContacts</consumer>
- <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- <onValidation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValidation.js</onValidation>
- </entityField>
- <entityParameter>
- <name>PossibleConnectionTypes</name>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleconnectiontypes/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityField>
- <name>LETTERSALUTATION</name>
- <title>Letter salutation</title>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/lettersalutation/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <fromClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>69b62a9f-95bf-48be-8891-b6c2524f6ea1</name>
- <tableName>OFFER</tableName>
- <primaryKey>OFFERID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>d2334c28-1be0-4377-b13a-062bb1613c5a</name>
- <tableName>CONTACT</tableName>
- <primaryKey>CONTACTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>16e5d66a-f156-4855-9da4-b9dee497c3f3</name>
- <tableName>SALESPROJECT</tableName>
- <primaryKey>SALESPROJECTID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>6b708a89-8864-433b-bdec-4edcedb3d7d1</name>
- <tableName>ORGANISATION</tableName>
- <primaryKey>ORGANISATIONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- <linkInformation>
- <name>4cdfe047-48d0-409e-8b01-e2c1312e8a5b</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CURRENCY.value</name>
- <recordfield>OFFER.CURRENCY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>HEADER.value</name>
- <recordfield>OFFER.HEADER</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <recordfield>OFFER.LANGUAGE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>NET.value</name>
- <recordfield>OFFER.NET</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFERCODE.value</name>
- <recordfield>OFFER.OFFERCODE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFERDATE.value</name>
- <recordfield>OFFER.OFFERDATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFERID.value</name>
- <recordfield>OFFER.OFFERID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PROBABILITY.value</name>
- <recordfield>OFFER.PROBABILITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATUS.value</name>
- <recordfield>OFFER.STATUS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>OFFER.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VERSNR.value</name>
- <recordfield>OFFER.VERSNR</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ORG_ID.value</name>
- <recordfield>CONTACT.ORGANISATION_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_PERSON_ID.value</name>
- <recordfield>CONTACT.PERSON_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ADDRESS.value</name>
- <recordfield>OFFER.ADDRESS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATUS.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PROBABILITY.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PAYMENTTERMS.value</name>
- <recordfield>OFFER.PAYMENTTERMS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DELIVERYTERMS.value</name>
- <recordfield>OFFER.DELIVERYTERMS</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DELIVERYTERMS.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PAYMENTTERMS.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>OFFER.INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>OFFER.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>OFFER.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>OFFER.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>OFFER.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.value</name>
- <recordfield>OFFER.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>FOOTER.value</name>
- <recordfield>OFFER.FOOTER</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>OFFER.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>OFFER.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LETTERSALUTATION.value</name>
- <recordfield>OFFER.LETTERSALUTATION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ORG_ID.displayValue</name>
- <recordfield>ORGANISATION.NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_PERSON_ID.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/contact_person_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Offer_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
+ <title>Offer</title>
+ <grantUpdateProcess>%aditoprj%/entity/Offer_entity/grantUpdateProcess.js</grantUpdateProcess>
+ <grantDeleteProcess>%aditoprj%/entity/Offer_entity/grantDeleteProcess.js</grantDeleteProcess>
+ <contentTitleProcess>%aditoprj%/entity/Offer_entity/contentTitleProcess.js</contentTitleProcess>
+ <afterUiInit>%aditoprj%/entity/Offer_entity/afterUiInit.js</afterUiInit>
+ <iconId>VAADIN:CART</iconId>
+ <titlePlural>Offers</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <dependencies>
+ <entityDependency>
+ <name>f909c251-16c1-49e2-9b43-6d5f834137c6</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityField>
+ <name>CURRENCY</name>
+ <title>Currency</title>
+ <consumer>KeywordCurrencies</consumer>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>OFFERCODE</name>
+ <documentation>%aditoprj%/entity/Offer_entity/entityfields/offercode/documentation.adoc</documentation>
+ <title>Offer number</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Offer_entity/entityfields/offercode/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>OFFERDATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerdate/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OFFERID</name>
+ <title>OFFERID (UID)</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offerid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PROBABILITY</name>
+ <title>Probability</title>
+ <consumer>KeywordProbabilities</consumer>
+ <contentType>NUMBER</contentType>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/probability/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>STATUS</name>
+ <title>Status</title>
+ <consumer>KeywordOfferStates</consumer>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>Total VAT</title>
+ <contentType>NUMBER</contentType>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>HEADER</name>
+ <title>Header text</title>
+ <contentType>LONG_TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Offeritems</name>
+ <description></description>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Offeritem_entity</entityName>
+ <fieldName>OfferItems</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/ContactId_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/offerstatus_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Language_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/language_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newOfferVersion</name>
+ <title>New offer version</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
+ </entityActionField>
+ <entityField>
+ <name>NET</name>
+ <title>Total net</title>
+ <contentType>NUMBER</contentType>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TotalGross</name>
+ <documentation>%aditoprj%/entity/Offer_entity/entityfields/totalgross/documentation.adoc</documentation>
+ <title>Total gross</title>
+ <contentType>NUMBER</contentType>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>LANGUAGE</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/language/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityActionField>
+ <name>copyOffer</name>
+ <title>Copy offer</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:COPY</iconId>
+ </entityActionField>
+ <entityField>
+ <name>VERSNR</name>
+ <documentation>%aditoprj%/entity/Offer_entity/entityfields/versnr/documentation.adoc</documentation>
+ <title>Vers. no.</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/versnr/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OFFER_ID</name>
+ <documentation>%aditoprj%/entity/Offer_entity/entityfields/offer_id/documentation.adoc</documentation>
+ <title>OFFER_ID</title>
+ </entityField>
+ <entityFieldGroup>
+ <name>OfferCode_VersNr_fieldgroup</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offercode_versnr_fieldgroup/valueProcess.js</valueProcess>
+ <title>Offer number</title>
+ <description>Offercode + VersNr</description>
+ <state>READONLY</state>
+ <fields>
+ <element>OFFERCODE</element>
+ <element>VERSNR</element>
+ </fields>
+ </entityFieldGroup>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityActionField>
+ <name>printOffer</name>
+ <title>Print Offer</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_TEXT_O</iconId>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/printoffer/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityField>
+ <name>CONTACT_ORG_ID</name>
+ <title>Company</title>
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>CONTACT_PERSON_ID</name>
+ <title>Person</title>
+ <searchable v="false" />
+ </entityField>
+ <entityConsumer>
+ <name>AnyContacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>OnlySameCompany</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <selectionMode>MULTI</selectionMode>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>MainDocuments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>ADDRESS</name>
+ <documentation>%aditoprj%/entity/Offer_entity/entityfields/address/documentation.adoc</documentation>
+ <title>Address</title>
+ <description></description>
+ <contentType>LONG_TEXT</contentType>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/address/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ChosenAddress</name>
+ <title>Choose address</title>
+ <consumer>PossibleAddresses</consumer>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/chosenaddress/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordCurrencies</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordOfferStates</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordofferstates/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newOrder</name>
+ <title>Create receipt</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/neworder/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:DOLLAR</iconId>
+ </entityActionField>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordProbabilities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordprobabilities/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Activities</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Activity_entity</entityName>
+ <fieldName>LinkedObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/activities/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:HOURGLASS_END</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityProvider>
+ <name>ContactOffers</name>
+ <dependencies>
+ <entityDependency>
+ <name>5c9720b5-1288-4a30-88fd-6dcff6359083</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>b308795f-3c81-4e60-99ca-3b5f8e82f62a</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferLanguage_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCode_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferAddress_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCurrency_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferDeliveryTerm_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferHeader_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferOriginal_Id_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferPaymentTerm_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferVersnr_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>PossibleConnectionTypes</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>OfferCurrency_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferLanguage_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferHeader_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferOriginal_Id_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferAddress_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCode_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferVersnr_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityActionField>
+ <name>newTask</name>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
+ <entityField>
+ <name>PAYMENTTERMS</name>
+ <title>Payment term</title>
+ <consumer>KeywordPaymentTerm</consumer>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/paymentterms/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DELIVERYTERMS</name>
+ <title>Delivery specification</title>
+ <consumer>KeywordDeliveryTerm</consumer>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/deliveryterms/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordPaymentTerm</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDeliveryTerm</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Tasks</name>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Tasks</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RowId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/rowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/objectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>PresetLinks_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/tasks/children/presetlinks_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>INFO</name>
+ <title>Information</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityConsumer>
+ <name>Attributes</name>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/stateProcess.js</stateProcess>
+ <onValidation>%aditoprj%/entity/Offer_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>OfferPaymentTerm_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>OfferDeliveryTerm_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>USER_NEW</name>
+ <title>USER_NEW</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ <title>USER_EDIT</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/user_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>DATE_NEW</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <title>DATE_EDIT</title>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/date_edit/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>FullOfferCode</name>
+ <title>Offer number</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/fulloffercode/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>PossibleAddresses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Address_entity</entityName>
+ <fieldName>OrganisationAndContactAddresses</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>ChoosenTEXHeader</name>
+ <title>Choose Header</title>
+ <consumer>DocumentTemplateTexHeader</consumer>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <title>Link</title>
+ <consumer>Objects</consumer>
+ <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
+ <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/mandatoryProcess.js</mandatoryProcess>
+ <state>AUTO</state>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>Connection Type</title>
+ <consumer>Contexts</consumer>
+ <mandatoryProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/mandatoryProcess.js</mandatoryProcess>
+ <state>INVISIBLE</state>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>FilteredObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>Context</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Whitelist</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contexts/children/whitelist/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Links</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>88a166e6-ccd0-4d51-b554-e3327f66d834</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Offers</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>OfferDeliveryTerm_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCode_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferOriginal_Id_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferAddress_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferCurrency_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferHeader_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferLanguage_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferPaymentTerm_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferVersnr_param</name>
+ <expose v="false" />
+ </entityParameter>
+ <entityParameter>
+ <name>PossibleConnectionTypes</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/links/children/possibleconnectiontypes/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>chooseTEXHeader</name>
+ <consumer>DocumentTemplateTex</consumer>
+ </entityField>
+ <entityConsumer>
+ <name>DocumentTemplateTexHeader</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DocumentTemplateTypeClassification_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexheader/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>LogHistoryConsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/loghistoryconsumer/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>FOOTER</name>
+ <title>Footer text</title>
+ <contentType>LONG_TEXT</contentType>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/footer/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OfferFooter_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ChoosenTEXFooter</name>
+ <title>Choose Footer</title>
+ <consumer>DocumentTemplateTexFooter</consumer>
+ </entityField>
+ <entityConsumer>
+ <name>DocumentTemplateTexFooter</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplateProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplateType_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DocumentTemplateTypeClassification_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/documenttemplatetexfooter/children/documenttemplatetypeclassification_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Salesprojects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Salesprojects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <documentation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/documentation.adoc</documentation>
+ <title>Contact</title>
+ <consumer>AnyContacts</consumer>
+ <linkedContextProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Offer_entity/entityfields/contact_id/onValidation.js</onValidation>
+ </entityField>
+ <entityParameter>
+ <name>PossibleConnectionTypes</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleconnectiontypes/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>LETTERSALUTATION</name>
+ <title>Letter salutation</title>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/lettersalutation/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <fromClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Offer_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>69b62a9f-95bf-48be-8891-b6c2524f6ea1</name>
+ <tableName>OFFER</tableName>
+ <primaryKey>OFFERID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>d2334c28-1be0-4377-b13a-062bb1613c5a</name>
+ <tableName>CONTACT</tableName>
+ <primaryKey>CONTACTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>16e5d66a-f156-4855-9da4-b9dee497c3f3</name>
+ <tableName>SALESPROJECT</tableName>
+ <primaryKey>SALESPROJECTID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>6b708a89-8864-433b-bdec-4edcedb3d7d1</name>
+ <tableName>ORGANISATION</tableName>
+ <primaryKey>ORGANISATIONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ <linkInformation>
+ <name>4cdfe047-48d0-409e-8b01-e2c1312e8a5b</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CURRENCY.value</name>
+ <recordfield>OFFER.CURRENCY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>HEADER.value</name>
+ <recordfield>OFFER.HEADER</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.value</name>
+ <recordfield>OFFER.LANGUAGE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NET.value</name>
+ <recordfield>OFFER.NET</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFERCODE.value</name>
+ <recordfield>OFFER.OFFERCODE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFERDATE.value</name>
+ <recordfield>OFFER.OFFERDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFERID.value</name>
+ <recordfield>OFFER.OFFERID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PROBABILITY.value</name>
+ <recordfield>OFFER.PROBABILITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.value</name>
+ <recordfield>OFFER.STATUS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>OFFER.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VERSNR.value</name>
+ <recordfield>OFFER.VERSNR</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ORG_ID.value</name>
+ <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_PERSON_ID.value</name>
+ <recordfield>CONTACT.PERSON_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS.value</name>
+ <recordfield>OFFER.ADDRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCY.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PROBABILITY.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENTTERMS.value</name>
+ <recordfield>OFFER.PAYMENTTERMS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DELIVERYTERMS.value</name>
+ <recordfield>OFFER.DELIVERYTERMS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DELIVERYTERMS.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENTTERMS.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>OFFER.INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>OFFER.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>OFFER.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>OFFER.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>OFFER.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ <recordfield>OFFER.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>FOOTER.value</name>
+ <recordfield>OFFER.FOOTER</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>OFFER.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>OFFER.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LETTERSALUTATION.value</name>
+ <recordfield>OFFER.LETTERSALUTATION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ORG_ID.displayValue</name>
+ <recordfield>ORGANISATION.NAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_PERSON_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/contact_person_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js
index c41e20315c6fbf1f10f4978391c9af3f762b2274..36e83de50431a1d2bd09760304daa4cd67a81166 100644
--- a/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/anycontacts/children/contactid_param/valueProcess.js
@@ -1,3 +1,4 @@
+import("Context_lib");
import("system.result");
import("system.vars");
diff --git a/entity/Offer_entity/entityfields/attributes/stateProcess.js b/entity/Offer_entity/entityfields/attributes/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8225159ab271d45cf061f4e302b1eac50adada28
--- /dev/null
+++ b/entity/Offer_entity/entityfields/attributes/stateProcess.js
@@ -0,0 +1,15 @@
+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")))
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/contact_id/onValidation.js b/entity/Offer_entity/entityfields/contact_id/onValidation.js
index 548146859e29b7e0bcac291cc3f11932d740cffe..ba0b5ac64592823f2c7ffdf581644839c9e7691c 100644
--- a/entity/Offer_entity/entityfields/contact_id/onValidation.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValidation.js
@@ -1,12 +1,12 @@
-import("system.logging");
-import("system.result");
-import("system.translate");
-import("system.vars");
-import("Context_lib");
-import("Entity_lib");
-import("Contact_lib");
-
-if (ContactUtils.getContactTypeByContactId(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) != 2 && ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) == 0) {
- logging.log(ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))));
+//import("system.logging");
+//import("system.result");
+//import("system.translate");
+//import("system.vars");
+//import("Context_lib");
+//import("Entity_lib");
+//import("Contact_lib");
+//
+//if (ContactUtils.getContactTypeByContactId(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) != 2 && ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))) == 0) {
+// logging.log(ContextUtils.getCountByContactId(vars.get("$field.OBJECT_TYPE"), ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"))));
// result.string(translate.text("This contact has no possible link."))
-}
\ No newline at end of file
+//}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/contact_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
index 94a78b1a1d64fbda7416b774e9300835b36ae7ab..e0a100eeab30aaf88b169b1983628f54cf092441 100644
--- a/entity/Offer_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
@@ -23,4 +23,5 @@ else
neon.setFieldValue("$field.LANGUAGE", "");
}
-neon.setFieldValue("$field.OBJECT_ROWID", "");
\ No newline at end of file
+if(!vars.exists("$param.ObjectRowId_param") && !vars.get("$param.ObjectRowId_param"))
+ neon.setFieldValue("$field.OBJECT_ROWID", "");
diff --git a/entity/Offer_entity/entityfields/currency/valueProcess.js b/entity/Offer_entity/entityfields/currency/valueProcess.js
index 787ece941a73bd5747239c362d3f0bb9fcc0e439..2f2451289c947c75e2bba4dcdb3f224de3c01881 100644
--- a/entity/Offer_entity/entityfields/currency/valueProcess.js
+++ b/entity/Offer_entity/entityfields/currency/valueProcess.js
@@ -1,6 +1,7 @@
import("system.neon");
import("system.result");
import("system.vars");
+import("KeywordRegistry_basic");
if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
{
@@ -8,5 +9,5 @@ if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_
}
else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
- result.string("EUR");
+ result.string($KeywordRegistry.currency$eur());
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
index 0ae20dad6e06f3bda90fdbff5e7b83a63e5ca241..9d4288fee2165c91476d90ec0f0d636bde33d4a6 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -1,8 +1,11 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
import("AttributeRegistry_basic");
import("system.neon");
import("system.result");
import("system.vars");
import("Attribute_lib");
+import("Contact_lib");
if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
{
@@ -10,9 +13,19 @@ if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliv
}
else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- var contactId = vars.getString("$field.CONTACT_ID");
- if (contactId)
- {
- result.string(AttributeRelationUtils.getAttribute($AttributeRegistry.deliveryTerm(), contactId));
+ var presetValue = "";
+ var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+ if (contactIds.length >= 3 && contactIds[2])
+ {
+ var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
+ if (orgContactId)
+ {
+ presetValue = AttributeRelationUtils.getAttribute($AttributeRegistry.deliveryTerm(), orgContactId);
+ }
}
+
+ if (presetValue)
+ result.string(presetValue);
+ else
+ result.string(KeywordUtils.getFirst($KeywordRegistry.deliveryTerm()));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/documents/stateProcess.js b/entity/Offer_entity/entityfields/documents/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4c5360f5be4a89227e57e90bb98bdcaed69d6786
--- /dev/null
+++ b/entity/Offer_entity/entityfields/documents/stateProcess.js
@@ -0,0 +1,14 @@
+import("system.logging");
+import("system.vars");
+import("Offer_lib");
+import("system.result");
+import("system.neon");
+
+if (OfferUtils.isEditable(vars.get("$field.STATUS")))
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/code/stateProcess.js b/entity/Offer_entity/entityfields/language/stateProcess.js
similarity index 50%
rename from entity/Task_entity/entityfields/code/stateProcess.js
rename to entity/Offer_entity/entityfields/language/stateProcess.js
index b066ae31a4bfa6b06c5c8c9bf20df77e978fe24e..05ceada3a320c2eed56dab6341368a831ee73b1e 100644
--- a/entity/Task_entity/entityfields/code/stateProcess.js
+++ b/entity/Offer_entity/entityfields/language/stateProcess.js
@@ -1,13 +1,12 @@
-import("system.neon");
import("system.result");
+import("system.neon");
import("system.vars");
-import("ActivityTask_lib");
-if (TaskUtils.getShowCode(vars.get("$field.TYPE")))
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- result.string(neon.COMPONENTSTATE_READONLY);
+ result.string(neon.COMPONENTSTATE_EDITABLE);
}
else
{
- result.string(neon.COMPONENTSTATE_INVISIBLE);
+ result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/maindocuments/stateProcess.js b/entity/Offer_entity/entityfields/maindocuments/stateProcess.js
index 5c640c079ddca224a84ea8fe108d10d39d0f926c..d80ff786571df619cb3388194ac84777938acbff 100644
--- a/entity/Offer_entity/entityfields/maindocuments/stateProcess.js
+++ b/entity/Offer_entity/entityfields/maindocuments/stateProcess.js
@@ -1,14 +1,22 @@
+import("Offer_lib");
import("system.result");
import("system.db");
import("system.vars");
import("system.neon");
import("Sql_lib");
-if (0 == db.getBinaryCount("OFFER", "DOCUMENT", vars.get("$sys.uid"), SqlUtils.getSystemAlias(), "MAINDOCUMENT"))
+if (OfferUtils.isEditable(vars.get("$field.STATUS")))
{
- result.string(neon.COMPONENTSTATE_INVISIBLE);
+ if (0 == db.getBinaryCount("OFFER", "DOCUMENT", vars.get("$sys.uid"), SqlUtils.getSystemAlias(), "MAINDOCUMENT"))
+ {
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+ }
+ else
+ {
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+ }
}
else
{
- result.string(neon.COMPONENTSTATE_EDITABLE);
+ result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/object_rowid/titleProcess.js b/entity/Offer_entity/entityfields/object_rowid/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f83e932bb089b031ee67072a18244ec9d2f5a1ad
--- /dev/null
+++ b/entity/Offer_entity/entityfields/object_rowid/titleProcess.js
@@ -0,0 +1,21 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+import("Context_lib");
+
+var possibleTypes = vars.getString("$param.PossibleConnectionTypes");
+var title = translate.text("Link");
+
+if (possibleTypes)
+{
+ possibleTypes = JSON.parse(possibleTypes);
+ if (possibleTypes.length == 1)
+ {
+ var contextTitle = ContextUtils.getTitle(possibleTypes[0]);
+ if (contextTitle)
+ title = contextTitle;
+ }
+}
+
+result.string(title);
+
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js
index 22a6e045a3a3c037f3081a29d3d34810375564f9..7b92c1bb14aa08001b7d5738111337ab7e81f4cc 100644
--- a/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/objects/children/contactid_param/valueProcess.js
@@ -1,10 +1,10 @@
-import("system.result");
-import("system.vars");
-import("Contact_lib");
-
-if (vars.get("$field.CONTACT_ID"))
-{
- var ids = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
- if (ids.length >= 3 && ids[2])
- result.string(ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))[2]);
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+if (vars.get("$field.CONTACT_ID"))
+{
+ var ids = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"));
+ if (ids.length >= 3 && ids[2])
+ result.string(ids[2]);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offeritems/children/language_param/valueProcess.js b/entity/Offer_entity/entityfields/offeritems/children/language_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..33d4d6d238c6273767dcb38ba121c6edd66acbea
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offeritems/children/language_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+logging.log("offer " + vars.get("$field.LANGUAGE"))
+result.string(vars.get("$field.LANGUAGE"));
diff --git a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
index e75c10c9751ea47fa79c80841cfc2831dafb2deb..98081578fa2e983e3da8bcc77d81645252d65a20 100644
--- a/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/paymentterms/valueProcess.js
@@ -1,4 +1,7 @@
+import("Keyword_lib");
+import("Contact_lib");
import("AttributeRegistry_basic");
+import("KeywordRegistry_basic");
import("system.neon");
import("system.result");
import("system.vars");
@@ -10,9 +13,19 @@ if (vars.exists("$param.OfferPaymentTerm_param") && vars.get("$param.OfferPaymen
}
else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
{
- var contactId = vars.getString("$field.CONTACT_ID");
- if (contactId)
+ var presetValue = "";
+ var contactIds = ContactUtils.getPersOrgIds(vars.getString("$field.CONTACT_ID"))
+ if (contactIds.length >= 3 && contactIds[2])
{
- result.string(AttributeRelationUtils.getAttribute($AttributeRegistry.paymentTerm(), contactId));
+ var orgContactId = ContactUtils.getOrgContactId(contactIds[2]);
+ if (orgContactId)
+ {
+ presetValue = AttributeRelationUtils.getAttribute($AttributeRegistry.paymentTerm(), orgContactId);
+ }
}
+
+ if (presetValue)
+ result.string(presetValue);
+ else
+ result.string(KeywordUtils.getFirst($KeywordRegistry.paymentTerm()));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/probability/valueProcess.js b/entity/Offer_entity/entityfields/probability/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..410c669a772468381243551aa7d9577c25f4d07c
--- /dev/null
+++ b/entity/Offer_entity/entityfields/probability/valueProcess.js
@@ -0,0 +1,13 @@
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("AttributeRegistry_basic");
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Attribute_lib");
+import("Contact_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ result.string(KeywordUtils.getFirst($KeywordRegistry.offerProbability()));
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/status/valueProcess.js b/entity/Offer_entity/entityfields/status/valueProcess.js
index ef4ec27fb0c16db8e3b6a59b3723da26f78f54e8..57f4b66b2e7ca5cd616c944b52d0fece864f8fa4 100644
--- a/entity/Offer_entity/entityfields/status/valueProcess.js
+++ b/entity/Offer_entity/entityfields/status/valueProcess.js
@@ -1,6 +1,7 @@
import("system.neon");
import("system.vars");
import("system.result");
+import("KeywordRegistry_basic");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
- result.string("70d27a1b-7233-481d-826f-01a13a4bb0b2"); //Open
\ No newline at end of file
+ result.string($KeywordRegistry.offerStatus$open()); //Open
\ No newline at end of file
diff --git a/entity/Offer_entity/grantDeleteProcess.js b/entity/Offer_entity/grantDeleteProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f95c719463a913f0dfef05cfee0712e084c530ce
--- /dev/null
+++ b/entity/Offer_entity/grantDeleteProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Offer_lib");
+
+result.string(OfferUtils.isDeletable(vars.get("$field.STATUS")));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 4c23cdba4b18d520472d01173dabb7ed3ff50df8..99548b0ca8cbea6f3e004564cff0583d40607179 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,326 +1,338 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Offeritem_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
- <title>Offeritem</title>
- <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
- <titlePlural>Offeritems</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ASSIGNEDTO</name>
- </entityField>
- <entityField>
- <name>DISCOUNT</name>
- <title>Discount</title>
- <contentType>NUMBER</contentType>
- <outputFormat>0.00'%'</outputFormat>
- <inputFormat>0.00</inputFormat>
- <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>GROUPCODEID</name>
- <title>Commodity group</title>
- <consumer>KeywordProductGroupcodes</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ITEMNAME</name>
- <title>Designation</title>
- </entityField>
- <entityField>
- <name>ITEMPOSITION</name>
- <title>Position</title>
- <state>READONLY</state>
- </entityField>
- <entityField>
- <name>ITEMSORT</name>
- </entityField>
- <entityField>
- <name>OFFERITEMID</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OFFER_ID</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRICE</name>
- <title>Unit price</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
- <title>Article</title>
- <consumer>Products</consumer>
- <linkedContext>Product</linkedContext>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
- <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
- <title>Quantity</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#</outputFormat>
- <inputFormat>#</inputFormat>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>UNIT</name>
- <title>Unit</title>
- <consumer>KeywordQuantityUnits</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
- <onValueChangeTypes>
- <element>PROCESS</element>
- <element>MASK</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>VAT</title>
- <contentType>NUMBER</contentType>
- <outputFormat>0.00'%'</outputFormat>
- <inputFormat>0.00</inputFormat>
- <state>READONLY</state>
- </entityField>
- <entityParameter>
- <name>OfferId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>TotalPrice</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
- <title>Sum</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OfferStatus_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>OfferItems</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Offer_entity</entityName>
- <fieldName>Offeritems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OfferStatus_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>INFO</name>
- <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- <state>READONLY</state>
- </entityField>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Products</name>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
- <tableName>OFFERITEM</tableName>
- <primaryKey>OFFERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ASSIGNEDTO.value</name>
- <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISCOUNT.value</name>
- <recordfield>OFFERITEM.DISCOUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.value</name>
- <recordfield>OFFERITEM.GROUPCODEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMNAME.value</name>
- <recordfield>OFFERITEM.ITEMNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMPOSITION.value</name>
- <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMSORT.value</name>
- <recordfield>OFFERITEM.ITEMSORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFERITEMID.value</name>
- <recordfield>OFFERITEM.OFFERITEMID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OFFER_ID.value</name>
- <recordfield>OFFERITEM.OFFER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OPTIONAL.value</name>
- <recordfield>OFFERITEM.OPTIONAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICE.value</name>
- <recordfield>OFFERITEM.PRICE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>QUANTITY.value</name>
- <recordfield>OFFERITEM.QUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.value</name>
- <recordfield>OFFERITEM.UNIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>OFFERITEM.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>OFFERITEM.INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.displayValue</name>
- <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.displayValue</name>
- <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.displayValue</name>
- <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Offeritem_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
+ <title>Offeritem</title>
+ <grantUpdateProcess>%aditoprj%/entity/Offeritem_entity/grantUpdateProcess.js</grantUpdateProcess>
+ <grantDeleteProcess>%aditoprj%/entity/Offeritem_entity/grantDeleteProcess.js</grantDeleteProcess>
+ <afterOperatingState>%aditoprj%/entity/Offeritem_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Offeritems</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ASSIGNEDTO</name>
+ </entityField>
+ <entityField>
+ <name>DISCOUNT</name>
+ <title>Discount</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>0.00'%'</outputFormat>
+ <inputFormat>0.00</inputFormat>
+ <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/discount/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <title>Commodity group</title>
+ <consumer>KeywordProductGroupcodes</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMNAME</name>
+ <title>Designation</title>
+ </entityField>
+ <entityField>
+ <name>ITEMPOSITION</name>
+ <title>Position</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>ITEMSORT</name>
+ </entityField>
+ <entityField>
+ <name>OFFERITEMID</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offeritemid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OFFER_ID</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/offer_id/valueProcess.js</valueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <title>Optional</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <title>Unit price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/documentation.adoc</documentation>
+ <title>Article</title>
+ <consumer>Products</consumer>
+ <linkedContext>Product</linkedContext>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/stateProcess.js</stateProcess>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/documentation.adoc</documentation>
+ <title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
+ <inputFormat>#</inputFormat>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Offeritem_entity/entityfields/quantity/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <title>Unit</title>
+ <consumer>KeywordQuantityUnits</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>PROCESS</element>
+ <element>MASK</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>VAT</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>0.00'%'</outputFormat>
+ <inputFormat>0.00</inputFormat>
+ <state>READONLY</state>
+ </entityField>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TotalPrice</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/documentation.adoc</documentation>
+ <title>Sum</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>OfferItems</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>Offeritems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OfferStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Language_param</name>
+ <title></title>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>INFO</name>
+ <documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ <state>AUTO</state>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <conditionProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>1894a7fa-bc31-43c2-9ba9-d432892efdaa</name>
+ <tableName>OFFERITEM</tableName>
+ <primaryKey>OFFERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ASSIGNEDTO.value</name>
+ <recordfield>OFFERITEM.ASSIGNEDTO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT.value</name>
+ <recordfield>OFFERITEM.DISCOUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.value</name>
+ <recordfield>OFFERITEM.GROUPCODEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMNAME.value</name>
+ <recordfield>OFFERITEM.ITEMNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMPOSITION.value</name>
+ <recordfield>OFFERITEM.ITEMPOSITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMSORT.value</name>
+ <recordfield>OFFERITEM.ITEMSORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFERITEMID.value</name>
+ <recordfield>OFFERITEM.OFFERITEMID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OFFER_ID.value</name>
+ <recordfield>OFFERITEM.OFFER_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OPTIONAL.value</name>
+ <recordfield>OFFERITEM.OPTIONAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE.value</name>
+ <recordfield>OFFERITEM.PRICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>OFFERITEM.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ <recordfield>OFFERITEM.QUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.value</name>
+ <recordfield>OFFERITEM.UNIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>OFFERITEM.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>OFFERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.displayValue</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.displayValue</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index 85a18b53383611f0bc12ede10ebecb332041aa6e..b3cc01ab49bbd4ddc910037d3319e4ebb11ce25b 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -1,3 +1,5 @@
+import("system.db");
+import("Sql_lib");
import("AttributeRegistry_basic");
import("system.vars");
import("system.neon");
@@ -16,14 +18,20 @@ if(pid != "")
var PriceListFilter = { currency: currency, quantity: vars.get("$field.QUANTITY"), relationId: contactid, priceList: pricelist };
//TODO: loading from db until loading from Consumer is possible.
- var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
+ var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter,
+ [["info", db.translateStatement(SqlCondition.begin()
+ .andPrepareVars("DESCRIPTIONTRANSLATION.OBJECT_ROWID", "$field.PRODUCT_ID")
+ .and("DESCRIPTIONTRANSLATION.OBJECT_TYPE = 'Product'")
+ .andPrepareVars("DESCRIPTIONTRANSLATION.LANG", "$param.Language_param")
+ .buildSql("(select DESCRIPTION from DESCRIPTIONTRANSLATION", "1=2", ")"))]
+ ]);
if(ProductDetails.productId != undefined)
{
neon.setFieldValue("$field.GROUPCODEID", ProductDetails.groupCode);
neon.setFieldValue("$field.UNIT", ProductDetails.unit);
neon.setFieldValue("$field.ITEMNAME", ProductDetails.productName);
- neon.setFieldValue("$field.INFO", ProductDetails.INFO);
+ neon.setFieldValue("$field.INFO", ProductDetails.info);
if(ProductDetails.PriceListToUse != null)
{
diff --git a/entity/Offeritem_entity/entityfields/product_id/stateProcess.js b/entity/Offeritem_entity/entityfields/product_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b4c33a9ba5d3994b4898f06b170ac90f795fdd22
--- /dev/null
+++ b/entity/Offeritem_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);
+}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/grantDeleteProcess.js b/entity/Offeritem_entity/grantDeleteProcess.js
index b8e2e7b1a844d2c2449e44ce4249f0d0f9531167..907809c328cd0899a4a8bb1c088887d5d8d80807 100644
--- a/entity/Offeritem_entity/grantDeleteProcess.js
+++ b/entity/Offeritem_entity/grantDeleteProcess.js
@@ -2,4 +2,4 @@ import("system.vars");
import("system.result");
import("Offer_lib");
-result.string(OfferUtils.isEditable(vars.get("$param.OfferStatus_param")));
\ No newline at end of file
+//result.object(OfferUtils.isDeletable(vars.get("$param.OfferStatus_param")) && vars.get("$field.ASSIGNEDTO") == "");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
index 71fca5641e4aa3402d36cadc6eb6c6917582fedb..1e4dc46b09b8d369f24c76194c2eb16774ab8bea 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
@@ -13,7 +13,7 @@ if(oid != "")
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
- oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, contactid);
+ oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, contactid, vars.get("$param.Language_param"));
oiUtils.reOrgItems();
//update offer price
diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index 4cabfb2c41a78ae90b9345cbd3c4beafa78b7e7e..06cefae57d57b9dcd99243de1369081fd7b73e93 100644
--- a/entity/Options_Entity/Options_Entity.aod
+++ b/entity/Options_Entity/Options_Entity.aod
@@ -1,50 +1,60 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Options_Entity</name>
- <description></description>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Options</title>
- <iconId>VAADIN:WRENCH</iconId>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>Option1</name>
- <title>Option1</title>
- </entityField>
- <entityField>
- <name>Option2</name>
- <title>Option2</title>
- <contentType>NUMBER</contentType>
- </entityField>
- <entityField>
- <name>Option3</name>
- <title>Option3</title>
- <contentType>DATE</contentType>
- </entityField>
- <entityField>
- <name>Option4</name>
- <title>Option4</title>
- <contentType>PASSWORD</contentType>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Options_Entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>Option1.value</element>
- <element>Option2.value</element>
- <element>Option3.value</element>
- <element>Option4.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Options_Entity</name>
+ <description></description>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Options</title>
+ <iconId>VAADIN:WRENCH</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>Option1</name>
+ <title>Option1</title>
+ </entityField>
+ <entityField>
+ <name>Option2</name>
+ <title>Option2</title>
+ <contentType>NUMBER</contentType>
+ </entityField>
+ <entityField>
+ <name>Option3</name>
+ <title>Option3</title>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>Option4</name>
+ <title>Option4</title>
+ <contentType>PASSWORD</contentType>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Options_Entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Option1.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Option2.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Option3.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Option4.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 1359fed760eaf1ed8505495aaaf396b8ce070c39..55d9f1bbd66fc7525298e84f0d016a6e9f70aed5 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Order_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 6c8146d6aa22a96689b41734053b3d43fb4f621a..209d380fd9b7aced54336d6d6aa1552fcff259fa 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,317 +1,317 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Orderitem_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
- <title>Orderitem</title>
- <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
- <titlePlural>Orderitems</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ASSIGNEDTO</name>
- </entityField>
- <entityField>
- <name>DISCOUNT</name>
- <title>Discount</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- </entityField>
- <entityField>
- <name>GROUPCODEID</name>
- <title>Commodity group</title>
- <consumer>KeywordProductGroupcodes</consumer>
- <state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ITEMNAME</name>
- <title>Designation</title>
- </entityField>
- <entityField>
- <name>ITEMPOSITION</name>
- <title>Position</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ITEMSORT</name>
- </entityField>
- <entityField>
- <name>SALESORDERITEMID</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SALESORDER_ID</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRICE</name>
- <title>Unit price</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
- <title>Article</title>
- <consumer>Products</consumer>
- <linkedContext>Product</linkedContext>
- <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
- <title>Quantity</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#</outputFormat>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- <onValidation></onValidation>
- </entityField>
- <entityField>
- <name>UNIT</name>
- <title>Unit</title>
- <consumer>KeywordQuantityUnits</consumer>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>VAT</title>
- <contentType>NUMBER</contentType>
- <outputFormat>0.00 %</outputFormat>
- <inputFormat>0.00</inputFormat>
- <state>AUTO</state>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>OrderId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>TotalPrice</name>
- <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
- <title>Sum</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
- <onValidation></onValidation>
- </entityField>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Orderitems</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
- <entityName>Order_entity</entityName>
- <fieldName>Orderitems</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Currency_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>OrderStatus_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>INFO</name>
- <title>Description</title>
- </entityField>
- <entityConsumer>
- <name>KeywordProductGroupcodes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordQuantityUnits</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>Products</name>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
- <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
- <tableName>SALESORDERITEM</tableName>
- <primaryKey>SALESORDERITEMID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ASSIGNEDTO.value</name>
- <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DISCOUNT.value</name>
- <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.value</name>
- <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMNAME.value</name>
- <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMPOSITION.value</name>
- <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ITEMSORT.value</name>
- <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESORDERITEMID.value</name>
- <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESORDER_ID.value</name>
- <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OPTIONAL.value</name>
- <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICE.value</name>
- <recordfield>SALESORDERITEM.PRICE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>QUANTITY.value</name>
- <recordfield>SALESORDERITEM.QUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.value</name>
- <recordfield>SALESORDERITEM.UNIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>SALESORDERITEM.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>GROUPCODEID.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UNIT.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.displayValue</name>
- <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>SALESORDERITEM.INFO</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Orderitem_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
+ <title>Orderitem</title>
+ <afterOperatingState>%aditoprj%/entity/Orderitem_entity/afterOperatingState.js</afterOperatingState>
+ <titlePlural>Orderitems</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ASSIGNEDTO</name>
+ </entityField>
+ <entityField>
+ <name>DISCOUNT</name>
+ <title>Discount</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ </entityField>
+ <entityField>
+ <name>GROUPCODEID</name>
+ <title>Commodity group</title>
+ <consumer>KeywordProductGroupcodes</consumer>
+ <state>READONLY</state>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/groupcodeid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMNAME</name>
+ <title>Designation</title>
+ </entityField>
+ <entityField>
+ <name>ITEMPOSITION</name>
+ <title>Position</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/itemposition/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ITEMSORT</name>
+ </entityField>
+ <entityField>
+ <name>SALESORDERITEMID</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorderitemid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SALESORDER_ID</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/salesorder_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <title>Optional</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <title>Unit price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/documentation.adoc</documentation>
+ <title>Article</title>
+ <consumer>Products</consumer>
+ <linkedContext>Product</linkedContext>
+ <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/product_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/documentation.adoc</documentation>
+ <title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/quantity/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ <onValidation></onValidation>
+ </entityField>
+ <entityField>
+ <name>UNIT</name>
+ <title>Unit</title>
+ <consumer>KeywordQuantityUnits</consumer>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>VAT</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>0.00 %</outputFormat>
+ <inputFormat>0.00</inputFormat>
+ <state>AUTO</state>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OrderId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>TotalPrice</name>
+ <documentation>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/documentation.adoc</documentation>
+ <title>Sum</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
+ <onValidation></onValidation>
+ </entityField>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>OrderStatus_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Orderitems</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>7810e350-d011-4d95-8d0b-883f3a0e519c</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>911de4a4-0e85-4d50-93ee-6f8f2308589e</name>
+ <entityName>Order_entity</entityName>
+ <fieldName>Orderitems</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Currency_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>OrderStatus_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProductGroupcodes</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordproductgroupcodes/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordQuantityUnits</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/keywordquantityunits/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <conditionProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBUpdate>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <onDBDelete>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>cb0f1bfa-92eb-4ee9-bb02-8ac0ef3f987d</name>
+ <tableName>SALESORDERITEM</tableName>
+ <primaryKey>SALESORDERITEMID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ASSIGNEDTO.value</name>
+ <recordfield>SALESORDERITEM.ASSIGNEDTO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISCOUNT.value</name>
+ <recordfield>SALESORDERITEM.DISCOUNT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.value</name>
+ <recordfield>SALESORDERITEM.GROUPCODEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMNAME.value</name>
+ <recordfield>SALESORDERITEM.ITEMNAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMPOSITION.value</name>
+ <recordfield>SALESORDERITEM.ITEMPOSITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ITEMSORT.value</name>
+ <recordfield>SALESORDERITEM.ITEMSORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESORDERITEMID.value</name>
+ <recordfield>SALESORDERITEM.SALESORDERITEMID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESORDER_ID.value</name>
+ <recordfield>SALESORDERITEM.SALESORDER_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OPTIONAL.value</name>
+ <recordfield>SALESORDERITEM.OPTIONAL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE.value</name>
+ <recordfield>SALESORDERITEM.PRICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>SALESORDERITEM.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ <recordfield>SALESORDERITEM.QUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.value</name>
+ <recordfield>SALESORDERITEM.UNIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>SALESORDERITEM.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>GROUPCODEID.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>UNIT.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESORDERITEM.INFO</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 4ea751da8055b487586369cff0c75f24469b05e3..dbcf7f0a06f43142cc4157693163ccbc29c1a82d 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Organisation_entity</name>
<description>former Org</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -372,22 +372,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>ObjectRelations</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityConsumer>
<name>KeywordContactStates</name>
<dependency>
@@ -512,7 +496,6 @@
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/tasks/stateProcess.js</stateProcess>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
@@ -779,6 +762,13 @@
<tooltip>Add the selection to a campaign</tooltip>
<tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
+ <entityActionField>
+ <name>addToBulkMailFromTable</name>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:ENVELOPES</iconId>
+ </entityActionField>
</children>
</entityActionGroup>
<entityActionField>
@@ -831,6 +821,20 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CURLY_BRACKETS</iconId>
</entityActionField>
+ <entityConsumer>
+ <name>LinkedAppointments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>LinkedAppointments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>LinkedObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Organisation_entity/entityfields/linkedappointments/children/linkedobjectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d723a8841f561e91a346e6eea8e86054aabaeaa1
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -0,0 +1,6 @@
+import("Bulkmail_lib");
+import("system.vars");
+import("system.neon");
+
+if (vars.exists("$sys.selection"))
+ BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/linkedappointments/children/linkedobjectid_param/valueProcess.js b/entity/Organisation_entity/entityfields/linkedappointments/children/linkedobjectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5631e4c72e5afa912988df44fd17d7e5067928b7
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/linkedappointments/children/linkedobjectid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.ORGANISATIONID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js b/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
deleted file mode 100644
index 59af8506d7c8ff241823ba185c646366667521c0..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.CONTACTID"));//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js b/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 008915f61deac19ccdd40fff81701de63eb3b6a2..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib");
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js b/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js
index fb6ae92cf587f31a05c8d4f9f1fb13316eeeb5f3..7b6137b4d105e9ba592cf8ef6e796fb838a32b09 100644
--- a/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js
+++ b/entity/Organisation_entity/entityfields/objecttrees/children/objectid_param/valueProcess.js
@@ -1,3 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.ORGANISATION_ID"));
\ No newline at end of file
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/tasks/stateProcess.js b/entity/Organisation_entity/entityfields/tasks/stateProcess.js
deleted file mode 100644
index fc227febcf322b829a554a1a953de51435e4db1c..0000000000000000000000000000000000000000
--- a/entity/Organisation_entity/entityfields/tasks/stateProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("ActivityTask_lib");
-import("Context_lib");
-
-if(TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()))//TODO: CONTACTID/ORGANISATIONID: review if this should be the CONTACTID or the ORGANISATIONID
- result.string(neon.COMPONENTSTATE_EDITABLE);
-else
- result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index f0b400362b562f93706d36e1bfb3ceed96177fad..51fd4d719ee0751975616e41d5e2aa1db779227a 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,188 +1,206 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>PermissionDetail_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Permission Detail</title>
- <siblings>
- <element>PermissionOverview_entity</element>
- </siblings>
- <contentTitleProcess>%aditoprj%/entity/PermissionDetail_entity/contentTitleProcess.js</contentTitleProcess>
- <iconIdProcess>%aditoprj%/entity/PermissionDetail_entity/iconIdProcess.js</iconIdProcess>
- <recordContainer>jDito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>CONDITION</name>
- <title>Condition</title>
- <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condition/stateProcess.js</stateProcess>
- </entityField>
- <entityField>
- <name>ACTION</name>
- <title>Action</title>
- <mandatory v="true" />
- <searchable v="false" />
- </entityField>
- <entityField>
- <name>ROLE</name>
- <title>Role</title>
- <consumer>Roles</consumer>
- <groupable v="true" />
- <linkedContext>Role</linkedContext>
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>ENTITY</name>
- <title>Entity</title>
- <consumer>MetaData</consumer>
- <groupable v="true" />
- <linkedContext>PermissionMetaData</linkedContext>
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>FIELD</name>
- <title>Field</title>
- <groupable v="true" />
- <dropDownProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/field/dropDownProcess.js</dropDownProcess>
- <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/field/stateProcess.js</stateProcess>
- </entityField>
- <entityField>
- <name>UID</name>
- <title>PermissionId</title>
- </entityField>
- <entityField>
- <name>ICON</name>
- </entityField>
- <entityField>
- <name>ACCESSTYPE</name>
- <title>Access type</title>
- <consumer>KeywordAccessType</consumer>
- <groupable v="true" />
- <mandatory v="true" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CONDTYPE</name>
- <title>Condition Type</title>
- <consumer>KeywordConditionType</consumer>
- <mandatory v="true" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>PARENT</name>
- <title>Parent</title>
- </entityField>
- <entityProvider>
- <name>Permissions</name>
- <recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
- <entityName>Role_entity</entityName>
- <fieldName>Permissions</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>cc0e9a4d-5d82-4407-bc4e-698dcfae5c86</name>
- <entityName>PermissionMetaData_entity</entityName>
- <fieldName>PermissionDetails</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>RoleTitle_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Roles</name>
- <dependency>
- <name>dependency</name>
- <entityName>Role_entity</entityName>
- <fieldName>Roles</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>MetaData</name>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionMetaData_entity</entityName>
- <fieldName>MetaData</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>EntityName_param</name>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>EntityTitle_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>KeywordConditionType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordAccessType</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordaccesstype/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jDito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onUpdate>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
- <onDelete>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>ENTITY.value</element>
- <element>ROLE.value</element>
- <element>FIELD.value</element>
- <element>CONDITION.value</element>
- <element>ACTION.value</element>
- <element>ACCESSTYPE.value</element>
- <element>CONDTYPE.value</element>
- <element>PARENT.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>PermissionDetail_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Permission Detail</title>
+ <siblings>
+ <element>PermissionOverview_entity</element>
+ </siblings>
+ <contentTitleProcess>%aditoprj%/entity/PermissionDetail_entity/contentTitleProcess.js</contentTitleProcess>
+ <iconIdProcess>%aditoprj%/entity/PermissionDetail_entity/iconIdProcess.js</iconIdProcess>
+ <recordContainer>jDito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CONDITION</name>
+ <title>Condition</title>
+ <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condition/stateProcess.js</stateProcess>
+ </entityField>
+ <entityField>
+ <name>ACTION</name>
+ <title>Action</title>
+ <mandatory v="true" />
+ <searchable v="false" />
+ </entityField>
+ <entityField>
+ <name>ROLE</name>
+ <title>Role</title>
+ <consumer>Roles</consumer>
+ <groupable v="true" />
+ <linkedContext>Role</linkedContext>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/role/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ENTITY</name>
+ <title>Entity</title>
+ <consumer>MetaData</consumer>
+ <groupable v="true" />
+ <linkedContext>PermissionMetaData</linkedContext>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/entity/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>FIELD</name>
+ <title>Field</title>
+ <groupable v="true" />
+ <dropDownProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/field/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/field/stateProcess.js</stateProcess>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <title>PermissionId</title>
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ </entityField>
+ <entityField>
+ <name>ACCESSTYPE</name>
+ <title>Access type</title>
+ <consumer>KeywordAccessType</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/accesstype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CONDTYPE</name>
+ <title>Condition Type</title>
+ <consumer>KeywordConditionType</consumer>
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/condtype/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>PARENT</name>
+ <title>Parent</title>
+ </entityField>
+ <entityProvider>
+ <name>Permissions</name>
+ <recordContainer>jDito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>b1a6483c-e7b1-4eb7-aa22-d0e9d0ef0b49</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>Permissions</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>cc0e9a4d-5d82-4407-bc4e-698dcfae5c86</name>
+ <entityName>PermissionMetaData_entity</entityName>
+ <fieldName>PermissionDetails</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>RoleTitle_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Roles</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>Roles</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MetaData</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionMetaData_entity</entityName>
+ <fieldName>MetaData</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>EntityName_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>EntityTitle_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordConditionType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordconditiontype/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordAccessType</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionDetail_entity/entityfields/keywordaccesstype/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jDito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onUpdate>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onUpdate.js</onUpdate>
+ <onDelete>%aditoprj%/entity/PermissionDetail_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ENTITY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ROLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>FIELD.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONDITION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACCESSTYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CONDTYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index 4296f4623256f93094bed23bed19eef9bd250828..43c67864629fb09ef39ade95969d78adbfb10fbe 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,100 +1,108 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>PermissionMetaData_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:CONNECT</icon>
- <title>Permission</title>
- <grantCreate v="false" />
- <grantUpdate v="false" />
- <grantDelete v="false" />
- <contentTitleProcess>%aditoprj%/entity/PermissionMetaData_entity/contentTitleProcess.js</contentTitleProcess>
- <iconIdProcess>%aditoprj%/entity/PermissionMetaData_entity/iconIdProcess.js</iconIdProcess>
- <titlePlural>Permissions</titlePlural>
- <recordContainer>jDito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>TITLE</name>
- <title>Title</title>
- </entityField>
- <entityField>
- <name>DESCRIPTION</name>
- <title>Description</title>
- </entityField>
- <entityField>
- <name>UID</name>
- <title>Name</title>
- </entityField>
- <entityProvider>
- <name>MetaData</name>
- <recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3b2c9421-5ff0-49a3-99f0-6790f17bd76c</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>MetaData</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>EntityName_param</name>
- <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>PermissionOverviews</name>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionOverview_entity</entityName>
- <fieldName>PermissionOverviews</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>EntityTitle_param</name>
- <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>PermissionDetails</name>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>Permissions</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>EntityTitle_param</name>
- <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>EntityName_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>USEPERMISSION</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jDito</name>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
- <isPageable v="false" />
- <isFilterable v="true" />
- <contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>TITLE.value</element>
- <element>DESCRIPTION.value</element>
- <element>USEPERMISSION.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>PermissionMetaData_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:CONNECT</icon>
+ <title>Permission</title>
+ <grantCreate v="false" />
+ <grantUpdate v="false" />
+ <grantDelete v="false" />
+ <contentTitleProcess>%aditoprj%/entity/PermissionMetaData_entity/contentTitleProcess.js</contentTitleProcess>
+ <iconIdProcess>%aditoprj%/entity/PermissionMetaData_entity/iconIdProcess.js</iconIdProcess>
+ <titlePlural>Permissions</titlePlural>
+ <recordContainer>jDito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>TITLE</name>
+ <title>Title</title>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <title>Name</title>
+ </entityField>
+ <entityProvider>
+ <name>MetaData</name>
+ <recordContainer>jDito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>3b2c9421-5ff0-49a3-99f0-6790f17bd76c</name>
+ <entityName>PermissionDetail_entity</entityName>
+ <fieldName>MetaData</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>EntityName_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/metadata/children/entityname_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>PermissionOverviews</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionOverview_entity</entityName>
+ <fieldName>PermissionOverviews</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>EntityTitle_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissionoverviews/children/entitytitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>PermissionDetails</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionDetail_entity</entityName>
+ <fieldName>Permissions</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>EntityTitle_param</name>
+ <valueProcess>%aditoprj%/entity/PermissionMetaData_entity/entityfields/permissiondetails/children/entitytitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>EntityName_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>USEPERMISSION</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jDito</name>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <isPageable v="false" />
+ <isFilterable v="true" />
+ <contentProcess>%aditoprj%/entity/PermissionMetaData_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>USEPERMISSION.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index 3b0dbb30c754c85ee728abea8a01e431014663f4..68547b8afdc929aca9433a08b65293dac72c973b 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,98 +1,112 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>PermissionOverview_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Permission Overview</title>
- <siblings>
- <element>PermissionDetail_entity</element>
- </siblings>
- <grantUpdate v="false" />
- <grantDelete v="false" />
- <iconIdProcess>%aditoprj%/entity/PermissionOverview_entity/iconIdProcess.js</iconIdProcess>
- <recordContainer>jDito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ENTITY</name>
- <titleProcess>%aditoprj%/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js</titleProcess>
- </entityField>
- <entityField>
- <name>ACTION_VIEW</name>
- <title>View</title>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityField>
- <name>ACTION_CREATE</name>
- <title>Create</title>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityField>
- <name>ACTION_READ</name>
- <title>Read</title>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityField>
- <name>ACTION_EDIT</name>
- <title>Edit</title>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityField>
- <name>ACTION_DELETE</name>
- <title>Delete</title>
- <contentType>IMAGE</contentType>
- </entityField>
- <entityField>
- <name>CONDTYPE</name>
- </entityField>
- <entityField>
- <name>UID</name>
- <title>Permission Set ID</title>
- </entityField>
- <entityProvider>
- <name>PermissionOverviews</name>
- <recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>b9f4df41-74e9-41d2-bfe6-1427ae7c8c36</name>
- <entityName>Role_entity</entityName>
- <fieldName>PermissionOverviews</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>ac8eb318-8d26-43a0-9463-e1c3741c7710</name>
- <entityName>PermissionMetaData_entity</entityName>
- <fieldName>PermissionOverviews</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityParameter>
- <name>RoleTitle_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>EntityTitle_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jDito</name>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>ENTITY.value</element>
- <element>ACTION_VIEW.value</element>
- <element>ACTION_CREATE.value</element>
- <element>ACTION_READ.value</element>
- <element>ACTION_EDIT.value</element>
- <element>ACTION_DELETE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>PermissionOverview_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Permission Overview</title>
+ <siblings>
+ <element>PermissionDetail_entity</element>
+ </siblings>
+ <grantUpdate v="false" />
+ <grantDelete v="false" />
+ <iconIdProcess>%aditoprj%/entity/PermissionOverview_entity/iconIdProcess.js</iconIdProcess>
+ <recordContainer>jDito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ENTITY</name>
+ <titleProcess>%aditoprj%/entity/PermissionOverview_entity/entityfields/entity/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>ACTION_VIEW</name>
+ <title>View</title>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityField>
+ <name>ACTION_CREATE</name>
+ <title>Create</title>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityField>
+ <name>ACTION_READ</name>
+ <title>Read</title>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityField>
+ <name>ACTION_UPDATE</name>
+ <title>Update</title>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityField>
+ <name>ACTION_DELETE</name>
+ <title>Delete</title>
+ <contentType>IMAGE</contentType>
+ </entityField>
+ <entityField>
+ <name>CONDTYPE</name>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <title>Permission Set ID</title>
+ </entityField>
+ <entityProvider>
+ <name>PermissionOverviews</name>
+ <recordContainer>jDito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>b9f4df41-74e9-41d2-bfe6-1427ae7c8c36</name>
+ <entityName>Role_entity</entityName>
+ <fieldName>PermissionOverviews</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>ac8eb318-8d26-43a0-9463-e1c3741c7710</name>
+ <entityName>PermissionMetaData_entity</entityName>
+ <fieldName>PermissionOverviews</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ <entityParameter>
+ <name>RoleTitle_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>EntityTitle_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jDito</name>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ENTITY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACTION_VIEW.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACTION_CREATE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACTION_READ.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACTION_UPDATE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ACTION_DELETE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
index ff906bb09a9367ddac33aefd446e2cf44aa7648b..97a97d450fec1e92a8284e8788a923e895d0870f 100644
--- a/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/PermissionOverview_entity/recordcontainers/jdito/contentProcess.js
@@ -83,7 +83,7 @@ function prepareOverview(pPermSetId, pCurrOverview, pMode) {
case "read":
currOverview[4] = "VAADIN:CIRCLE";
break;
- case "edit":
+ case "update":
currOverview[5] = "VAADIN:CIRCLE";
break;
case "delete":
@@ -112,7 +112,7 @@ function prepareOverview(pPermSetId, pCurrOverview, pMode) {
case "read":
currOverview[4] = "VAADIN:CIRCLE_THIN";
break;
- case "edit":
+ case "update":
currOverview[5] = "VAADIN:CIRCLE_THIN";
break;
case "delete":
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index c5ded0f7c52daaa979807c110ea24ba1375a8625..d061d62922be1b44e9d45b5d477cdfac3d562b62 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Person_entity</name>
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
@@ -446,22 +446,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<tooltip>New activity</tooltip>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
- <entityConsumer>
- <name>ObjectRelations</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectRowid_param</name>
- <valueProcess>%aditoprj%/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityConsumer>
<name>KeywordGenders</name>
<dependency>
@@ -558,7 +542,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityActionField>
<entityConsumer>
<name>Tasks</name>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/tasks/stateProcess.js</stateProcess>
+ <state>EDITABLE</state>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
@@ -840,6 +824,13 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<tooltip>Add the selection to a campaign</tooltip>
<tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
+ <entityActionField>
+ <name>addToBulkMailFromTable</name>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:ENVELOPES</iconId>
+ </entityActionField>
</children>
</entityActionGroup>
<entityActionField>
@@ -883,11 +874,25 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityActionField>
<entityActionField>
<name>openAdminInfo</name>
- <title>Open admin info</title>
+ <title>Open admin view</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/openadmininfo/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/openadmininfo/stateProcess.js</stateProcess>
</entityActionField>
+ <entityConsumer>
+ <name>Appointments</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Appointment_entity</entityName>
+ <fieldName>LinkedAppointments</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>LinkedObjectId_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Person_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js b/entity/Person_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..18cdb55d5f138cf19832a538801cd462c1c61246
--- /dev/null
+++ b/entity/Person_entity/entityfields/appointments/children/linkedobjectid_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+
+
+result.string(vars.get("$field.CONTACTID"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d723a8841f561e91a346e6eea8e86054aabaeaa1
--- /dev/null
+++ b/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js
@@ -0,0 +1,6 @@
+import("Bulkmail_lib");
+import("system.vars");
+import("system.neon");
+
+if (vars.exists("$sys.selection"))
+ BulkMailUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/tasks/stateProcess.js b/entity/Person_entity/entityfields/tasks/stateProcess.js
deleted file mode 100644
index a33c7f3e00a9b4fdddcb9834e90446814be4cf5a..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/tasks/stateProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("ActivityTask_lib");
-import("Context_lib");
-
-if(TaskUtils.hasTasks(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId()))
- result.string(neon.COMPONENTSTATE_EDITABLE);
-else
- result.string(neon.COMPONENTSTATE_INVISIBLE);
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/onDBUpdate.js b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
index 558fad5fb32a15ce823e8c00899b7b5cdf9eb622..8c54172f7f22d1b685061f422c173f2b48249441 100644
--- a/entity/Person_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Person_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,4 @@
+import("system.tools");
import("system.vars");
import("Person_lib");
import("Communication_lib");
@@ -15,4 +16,19 @@ FieldChanges.assimilateChangeAndDispose("$field.STANDARD_PHONE_COMMUNICATION", f
});
new StandardObject("Address", vars.get("$field.ADDRESS_ID"), "Person", vars.get("$field.CONTACTID"))
- .onPersonUpdate(vars.get("$field.ORGANISATION_ID"));
\ No newline at end of file
+ .onPersonUpdate(vars.get("$field.ORGANISATION_ID"));
+
+var updates = [];
+
+// update user object if name changed
+vars.get("$local.changed").forEach(function(fieldName) {
+ switch (fieldName) {
+ case "PERSON.FIRSTNAME":
+ case "PERSON.LASTNAME":
+ var user = tools.getUserByAttribute(tools.CONTACTID, [vars.get("$field.CONTACTID")], tools.PROFILE_FULL);
+ user[tools.PARAMS][tools.FIRSTNAME] = vars.get("$field.FIRSTNAME");
+ user[tools.PARAMS][tools.LASTNAME] = vars.get("$field.LASTNAME");
+ tools.updateUser(user);
+ break;
+ }
+})
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index 370cbba31edeb871668722b355f9657cc01695c4..63a7816bbe839fa69fa802663c320bbf79785872 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,146 +1,164 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Prod2prod_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
- <title>Parts list</title>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>DEST_ID</name>
- <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/documentation.adoc</documentation>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OPTIONAL</name>
- <title>Optional</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>UID</name>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/uid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <title>Quantity</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#</outputFormat>
- <inputFormat>#</inputFormat>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SOURCE_ID</name>
- <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/documentation.adoc</documentation>
- <title>Product</title>
- <consumer>Products</consumer>
- </entityField>
- <entityField>
- <name>TAKEPRICE</name>
- <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/documentation.adoc</documentation>
- <title>Take price</title>
- <contentType>BOOLEAN</contentType>
- <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>PROD2PRODID</name>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>ProductLinks</name>
- <targetContextField>targetContext</targetContextField>
- <targetIdField>SOURCE_ID</targetIdField>
- <dependencies>
- <entityDependency>
- <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
- <entityName>Product_entity</entityName>
- <fieldName>ProductLinks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>CurrentProductId_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>PRODUCTCODE</name>
- <title>Product number</title>
- </entityField>
- <entityField>
- <name>targetContext</name>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
- </entityField>
- <entityActionGroup>
- <name>alter</name>
- <children>
- <entityActionField>
- <name>insert</name>
- <onActionProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
- <isSelectionAction v="true" />
- <iconId>VAADIN:FILE_TREE_SMALL</iconId>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityConsumer>
- <name>Products</name>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>Products</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ExcludedProducts_param</name>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/products/children/excludedproducts_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>PRODUCTID</name>
- </entityField>
- <entityParameter>
- <name>CurrentProductId_param</name>
- <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/currentproductid_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <onInsert>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js</onInsert>
- <onDelete>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js</onDelete>
- <recordFields>
- <element>UID.value</element>
- <element>SOURCE_ID.value</element>
- <element>DEST_ID.value</element>
- <element>QUANTITY.value</element>
- <element>PRODUCTCODE.value</element>
- <element>PRODUCTID.value</element>
- <element>PROD2PRODID.value</element>
- <element>OPTIONAL.value</element>
- <element>TAKEPRICE.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Prod2prod_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
+ <title>Parts list</title>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DEST_ID</name>
+ <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/documentation.adoc</documentation>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/dest_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPTIONAL</name>
+ <title>Optional</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/optional/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/uid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <title>Quantity</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#</outputFormat>
+ <inputFormat>#</inputFormat>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SOURCE_ID</name>
+ <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/source_id/documentation.adoc</documentation>
+ <title>Product</title>
+ <consumer>Products</consumer>
+ </entityField>
+ <entityField>
+ <name>TAKEPRICE</name>
+ <documentation>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/documentation.adoc</documentation>
+ <title>Take price</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/takeprice/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>PROD2PRODID</name>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/prod2prodid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>ProductLinks</name>
+ <targetContextField>targetContext</targetContextField>
+ <targetIdField>SOURCE_ID</targetIdField>
+ <dependencies>
+ <entityDependency>
+ <name>4bd06e3b-17a0-483e-a61c-818ff7e86be3</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>ProductLinks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>CurrentProductId_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>PRODUCTCODE</name>
+ <title>Product number</title>
+ </entityField>
+ <entityField>
+ <name>targetContext</name>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/targetcontext/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionGroup>
+ <name>alter</name>
+ <children>
+ <entityActionField>
+ <name>insert</name>
+ <onActionProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/alter/children/insert/onActionProcess.js</onActionProcess>
+ <isSelectionAction v="true" />
+ <iconId>VAADIN:FILE_TREE_SMALL</iconId>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityConsumer>
+ <name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Products</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExcludedProducts_param</name>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/products/children/excludedproducts_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>PRODUCTID</name>
+ </entityField>
+ <entityParameter>
+ <name>CurrentProductId_param</name>
+ <valueProcess>%aditoprj%/entity/Prod2prod_entity/entityfields/currentproductid_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <onDelete>%aditoprj%/entity/Prod2prod_entity/recordcontainers/jdito/onDelete.js</onDelete>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SOURCE_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>DEST_ID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PRODUCTCODE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PRODUCTID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PROD2PRODID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>OPTIONAL.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TAKEPRICE.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index efcf029abeb9bc0621d227983b580647c75330c3..a187dc29370693cc39c689596d2b00178e6dc36a 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Product_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
@@ -202,11 +202,6 @@
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
- <entityField>
- <name>INFO</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
<entityConsumer>
<name>Documents</name>
<selectionMode>MULTI</selectionMode>
@@ -275,22 +270,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityField>
- <name>LANGUAGE</name>
- <consumer>Languages</consumer>
- <searchable v="false" />
- <titleProcess>%aditoprj%/entity/Product_entity/entityfields/language/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/Product_entity/entityfields/language/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Product_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
<entityConsumer>
<name>Activities</name>
<dependency>
@@ -445,6 +424,24 @@
<name>ProductText_param</name>
<valueProcess>%aditoprj%/entity/Product_entity/entityfields/producttext_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityConsumer>
+ <name>DescriptionTranslations</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DescriptionTranslation_entity</entityName>
+ <fieldName>DescriptionTranslations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowid_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/descriptiontranslations/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -520,10 +517,6 @@
<name>CONTACT_ID.value</name>
<recordfield>PRODUCT.CONTACT_ID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>PRODUCT.INFO</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>GROUPCODEID.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/groupcodeid.displayvalue/expression.js</expression>
@@ -532,14 +525,6 @@
<name>UNIT.displayValue</name>
<expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/unit.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <recordfield>PRODUCT.LANGUAGE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.displayValue</name>
- <expression>%aditoprj%/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>PRODUCT.USER_NEW</recordfield>
diff --git a/entity/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js b/entity/Product_entity/entityfields/descriptiontranslations/children/objectrowid_param/valueProcess.js
similarity index 55%
rename from entity/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
rename to entity/Product_entity/entityfields/descriptiontranslations/children/objectrowid_param/valueProcess.js
index 9bd2844554488d1a7fb68ec959556b48ef4566b3..533f8ec837ea2f9b588ddf05545ac47cdda23d18 100644
--- a/entity/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
+++ b/entity/Product_entity/entityfields/descriptiontranslations/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.TASKID"))
\ No newline at end of file
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js b/entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
rename to entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js
index 008915f61deac19ccdd40fff81701de63eb3b6a2..cc6924394ae950c43386275dda2c8db5d7a9c0ed 100644
--- a/entity/Person_entity/entityfields/objectrelations/children/objecttype_param/valueProcess.js
+++ b/entity/Product_entity/entityfields/descriptiontranslations/children/objecttype_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("system.result");
import("Context_lib");
+import("system.result");
result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/language/titleProcess.js b/entity/Product_entity/entityfields/language/titleProcess.js
deleted file mode 100644
index 04be2c545b0879ee1106eeb333161b65e5520edf..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/language/titleProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.translate");
-import("system.result");
-
-result.string(translate.text("Language") + " (" + translate.text("Description") + ")");
\ No newline at end of file
diff --git a/entity/Product_entity/entityfields/language/valueProcess.js b/entity/Product_entity/entityfields/language/valueProcess.js
deleted file mode 100644
index fef47cfe6e7315f7dad5f4864bbe69e1276f7f38..0000000000000000000000000000000000000000
--- a/entity/Product_entity/entityfields/language/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("system.result");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.getString("$field.LANGUAGE"))
- result.string("deu");
\ No newline at end of file
diff --git a/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js b/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
deleted file mode 100644
index 368c9593d9bde80e463b49879026c47394294f12..0000000000000000000000000000000000000000
--- a/entity/Product_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-
-var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("PRODUCT.LANGUAGE");
-result.string(sql);
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 97254f5e3d0357beede3eb724d8b78bb6d62f3ce..365ab1e964aa772acaa354036fb6e707d432266d 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,294 +1,293 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Productprice_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
- <title>Prices</title>
- <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
- <afterOperatingState>%aditoprj%/entity/Productprice_entity/afterOperatingState.js</afterOperatingState>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityField>
- <name>BUYSELL</name>
- <title>PP/SP</title>
- <mandatory v="true" />
- <dropDownProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/dropDownProcess.js</dropDownProcess>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CURRENCY</name>
- <title>Currency</title>
- <consumer>KeywordCurrencies</consumer>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>FROMQUANTITY</name>
- <title>From no. of units</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0</outputFormat>
- <inputFormat>#,##0</inputFormat>
- <mandatory v="true" />
- <state>AUTO</state>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRICE</name>
- <title>Price</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <mandatory v="true" />
- <state>AUTO</state>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRODUCTPRICEID</name>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <title>Product</title>
- <consumer>Products</consumer>
- <linkedContext>Product</linkedContext>
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <title>Company</title>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/contact_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>VALID_FROM</name>
- <title>Valid from</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>VALID_TO</name>
- <title>Valid until</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- </entityField>
- <entityField>
- <name>VAT</name>
- <title>VAT in %</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/valueProcess.js</valueProcess>
- <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/vat/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>PRICELIST</name>
- <documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation>
- <title>Price list</title>
- <consumer>KeywordPricelists</consumer>
- <state>AUTO</state>
- <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/onValidation.js</onValidation>
- </entityField>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- <mandatory v="false" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Products</name>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>db</recordContainer>
- </entityProvider>
- <entityProvider>
- <name>Productprices</name>
- <titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
- <entityName>Product_entity</entityName>
- <fieldName>Productprices</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>4efc927f-7441-480c-aaaa-36347e2e60c5</name>
- <entityName>Person_entity</entityName>
- <fieldName>Pricelists</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>dc9e2360-1769-41ec-b4ec-1a4c67013ef8</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>Productprices</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ContactId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>KeywordCurrencies</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordPricelists</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>DELIVERYTERM</name>
- <title>Deliveryspecification</title>
- </entityField>
- <entityField>
- <name>PAYMENTTERM</name>
- <title>Paymentterm</title>
- </entityField>
- <entityField>
- <name>INFO</name>
- <title>Information</title>
- <contentType>TEXT</contentType>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityConsumer>
- <name>OrganisationConditions</name>
- <dependency>
- <name>dependency</name>
- <entityName>Organisation_entity</entityName>
- <fieldName>#PROVIDER</fieldName>
- </dependency>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBDelete>%aditoprj%/entity/Productprice_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
- <linkInformation>
- <linkInformation>
- <name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
- <tableName>PRODUCTPRICE</tableName>
- <primaryKey>PRODUCTPRICEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>BUYSELL.value</name>
- <recordfield>PRODUCTPRICE.BUYSELL</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.value</name>
- <recordfield>PRODUCTPRICE.CURRENCY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>FROMQUANTITY.value</name>
- <recordfield>PRODUCTPRICE.FROMQUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICE.value</name>
- <recordfield>PRODUCTPRICE.PRICE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRICELIST.value</name>
- <recordfield>PRODUCTPRICE.PRICELIST</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCTPRICEID.value</name>
- <recordfield>PRODUCTPRICE.PRODUCTPRICEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>PRODUCTPRICE.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>PRODUCTPRICE.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VALID_FROM.value</name>
- <recordfield>PRODUCTPRICE.VALID_FROM</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VALID_TO.value</name>
- <recordfield>PRODUCTPRICE.VALID_TO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VAT.value</name>
- <recordfield>PRODUCTPRICE.VAT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.displayValue</name>
- <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Productprice_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
+ <title>Prices</title>
+ <onValidation>%aditoprj%/entity/Productprice_entity/onValidation.js</onValidation>
+ <afterOperatingState>%aditoprj%/entity/Productprice_entity/afterOperatingState.js</afterOperatingState>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>BUYSELL</name>
+ <title>PP/SP</title>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CURRENCY</name>
+ <title>Currency</title>
+ <consumer>KeywordCurrencies</consumer>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>FROMQUANTITY</name>
+ <title>From no. of units</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0</outputFormat>
+ <inputFormat>#,##0</inputFormat>
+ <mandatory v="true" />
+ <state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/fromquantity/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRICE</name>
+ <title>Price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <mandatory v="true" />
+ <state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRODUCTPRICEID</name>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/productpriceid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <title>Product</title>
+ <consumer>Products</consumer>
+ <linkedContext>Product</linkedContext>
+ <mandatory v="true" />
+ <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <title>Company</title>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>VALID_FROM</name>
+ <title>Valid from</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/valid_from/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>VALID_TO</name>
+ <title>Valid until</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ </entityField>
+ <entityField>
+ <name>VAT</name>
+ <title>VAT in %</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/valueProcess.js</valueProcess>
+ <onValidation>%aditoprj%/entity/Productprice_entity/entityfields/vat/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>PRICELIST</name>
+ <documentation>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/documentation.adoc</documentation>
+ <title>Price list</title>
+ <consumer>KeywordPricelists</consumer>
+ <state>AUTO</state>
+ <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>db</recordContainer>
+ </entityProvider>
+ <entityProvider>
+ <name>Productprices</name>
+ <titlePluralProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titlePluralProcess.js</titlePluralProcess>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>d5f4c7c4-cd21-4075-bd56-c479672dc09a</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Productprices</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>4efc927f-7441-480c-aaaa-36347e2e60c5</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>Pricelists</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>dc9e2360-1769-41ec-b4ec-1a4c67013ef8</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Productprices</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>KeywordCurrencies</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordPricelists</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/keywordpricelists/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>DELIVERYTERM</name>
+ <title>Deliveryspecification</title>
+ </entityField>
+ <entityField>
+ <name>PAYMENTTERM</name>
+ <title>Paymentterm</title>
+ </entityField>
+ <entityField>
+ <name>INFO</name>
+ <title>Information</title>
+ <contentType>TEXT</contentType>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityConsumer>
+ <name>OrganisationConditions</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBDelete>%aditoprj%/entity/Productprice_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
+ <tableName>PRODUCTPRICE</tableName>
+ <primaryKey>PRODUCTPRICEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>BUYSELL.value</name>
+ <recordfield>PRODUCTPRICE.BUYSELL</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCY.value</name>
+ <recordfield>PRODUCTPRICE.CURRENCY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>FROMQUANTITY.value</name>
+ <recordfield>PRODUCTPRICE.FROMQUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICE.value</name>
+ <recordfield>PRODUCTPRICE.PRICE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRICELIST.value</name>
+ <recordfield>PRODUCTPRICE.PRICELIST</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCTPRICEID.value</name>
+ <recordfield>PRODUCTPRICE.PRODUCTPRICEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>PRODUCTPRICE.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>PRODUCTPRICE.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VALID_FROM.value</name>
+ <recordfield>PRODUCTPRICE.VALID_FROM</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VALID_TO.value</name>
+ <recordfield>PRODUCTPRICE.VALID_TO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VAT.value</name>
+ <recordfield>PRODUCTPRICE.VAT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCY.displayValue</name>
+ <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Productprice_entity/entityfields/pricelist/onValidation.js b/entity/Productprice_entity/entityfields/pricelist/onValidation.js
deleted file mode 100644
index 4aacd1ac134be1b8fd4f486e3b195092776ee618..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/pricelist/onValidation.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import("system.translate");
-import("system.result");
-import("system.vars");
-import("Product_lib");
-import("Util_lib");
-import("Entity_lib");
-
-var priceList = {
- priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
- , priceListId: vars.get("$field.PRODUCTPRICEID")
- , fromQuantity: vars.get("$field.FROMQUANTITY")
- , buySell: vars.get("$field.BUYSELL")
- , currency: vars.get("$field.CURRENCY")
- , validFrom: vars.get("$field.VALID_FROM")
- , validTo: vars.get("$field.VALID_TO")
- };
-
-var identicalPriceList = ProductUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
-if(identicalPriceList != null)
-{
- result.string(translate.text("Identical price list found!"));
-}
\ No newline at end of file
diff --git a/entity/Productprice_entity/onValidation.js b/entity/Productprice_entity/onValidation.js
index 6e3b8b5612c52a2218472d4336494029991dd648..fddde143c2d4bb6186ae78d6032f09866ff77610 100644
--- a/entity/Productprice_entity/onValidation.js
+++ b/entity/Productprice_entity/onValidation.js
@@ -1,9 +1,35 @@
+import("Product_lib");
+import("system.translate");
import("system.result");
import("Date_lib");
import("system.vars");
+var messages = "";
+
var startDate = vars.get("$field.VALID_FROM");
var endDate = vars.get("$field.VALID_TO");
if (!DateUtils.validateBeginnBeforeEnd(startDate, endDate))
- result.string(DateUtils.getValidationFailString());
\ No newline at end of file
+ messages += DateUtils.getValidationFailString();
+
+var priceList = {
+ priceList: vars.get("$field.PRICELIST"),
+ priceListId: vars.get("$field.PRODUCTPRICEID"),
+ fromQuantity: vars.get("$field.FROMQUANTITY"),
+ buySell: vars.get("$field.BUYSELL"),
+ vat: vars.get("$field.VAT"),
+ currency: vars.get("$field.CURRENCY"),
+ validFrom: vars.get("$field.VALID_FROM"),
+ validTo: vars.get("$field.VALID_TO")
+ };
+
+var identicalPriceList = ProductUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
+if(identicalPriceList != null)
+{
+ if (messages)
+ messages += "\n";
+ messages += translate.text("Identical price list found!");
+}
+
+if (messages)
+ result.string(messages)
\ No newline at end of file
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index 1fd0ceee14339ff7a57d0c8995783971494691b5..9d09bd1aa18c49150ce2cf1504acefac0390280f 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,88 +1,98 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Role_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:USER_CHECK</icon>
- <title>Roles</title>
- <contentTitleProcess>%aditoprj%/entity/Role_entity/contentTitleProcess.js</contentTitleProcess>
- <iconId>VAADIN:USER_CHECK</iconId>
- <recordContainer>jDito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ROLETITLE</name>
- <title>Title</title>
- </entityField>
- <entityField>
- <name>ROLETYPE</name>
- <title>Type</title>
- </entityField>
- <entityField>
- <name>ROLEDESCRIPTION</name>
- <title>Description</title>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>USERCOUNT</name>
- </entityField>
- <entityConsumer>
- <name>Permissions</name>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>Permissions</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RoleTitle_param</name>
- <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>PermissionOverviews</name>
- <dependency>
- <name>dependency</name>
- <entityName>PermissionOverview_entity</entityName>
- <fieldName>PermissionOverviews</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>RoleTitle_param</name>
- <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>Roles</name>
- <recordContainer>jDito</recordContainer>
- <dependencies>
- <entityDependency>
- <name>64d800d0-4db5-4b95-ab6a-9197b83cc09c</name>
- <entityName>PermissionDetail_entity</entityName>
- <fieldName>Roles</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jDito</name>
- <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
- <isFilterable v="true" />
- <contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>ROLETITLE.value</element>
- <element>ROLETYPE.value</element>
- <element>ROLEDESCRIPTION.value</element>
- <element>USERCOUNT.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Role_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:USER_CHECK</icon>
+ <title>Roles</title>
+ <contentTitleProcess>%aditoprj%/entity/Role_entity/contentTitleProcess.js</contentTitleProcess>
+ <iconId>VAADIN:USER_CHECK</iconId>
+ <recordContainer>jDito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>ROLETITLE</name>
+ <title>Title</title>
+ </entityField>
+ <entityField>
+ <name>ROLETYPE</name>
+ <title>Type</title>
+ </entityField>
+ <entityField>
+ <name>ROLEDESCRIPTION</name>
+ <title>Description</title>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>USERCOUNT</name>
+ </entityField>
+ <entityConsumer>
+ <name>Permissions</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionDetail_entity</entityName>
+ <fieldName>Permissions</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RoleTitle_param</name>
+ <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissions/children/roletitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>PermissionOverviews</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>PermissionOverview_entity</entityName>
+ <fieldName>PermissionOverviews</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>RoleTitle_param</name>
+ <valueProcess>%aditoprj%/entity/Role_entity/entityfields/permissionoverviews/children/roletitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>Roles</name>
+ <recordContainer>jDito</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>64d800d0-4db5-4b95-ab6a-9197b83cc09c</name>
+ <entityName>PermissionDetail_entity</entityName>
+ <fieldName>Roles</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jDito</name>
+ <jDitoRecordAlias>_____SYSTEMALIAS</jDitoRecordAlias>
+ <isFilterable v="true" />
+ <contentProcess>%aditoprj%/entity/Role_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ROLETITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ROLETYPE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ROLEDESCRIPTION.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>USERCOUNT.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index 6c335003b37d705682a4a638763505ba868193fc..3d3a0fd06a389f3b31802eb3a5a567de9619f881 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,70 +1,78 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>SalesprojectAnalyses_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
- <title>Salesproject Analyses</title>
- <iconId>VAADIN:PIE_CHART</iconId>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>SORTING</name>
- <title>Parent</title>
- </entityField>
- <entityField>
- <name>X_PHASE</name>
- <title>Phase</title>
- </entityField>
- <entityField>
- <name>Y_COUNT</name>
- <title>Count</title>
- </entityField>
- <entityField>
- <name>OVERALL_TURNOVER</name>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OVERALL_FORECAST</name>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SENT_OFFERS</name>
- <title>Sent offers</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OPEN_SALESPROJECTS</name>
- <title>Open salesprojects</title>
- <contentType>NUMBER</contentType>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>X_PHASE.value</element>
- <element>Y_COUNT.value</element>
- <element>SORTING.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>SalesprojectAnalyses_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
+ <title>Salesproject Analyses</title>
+ <iconId>VAADIN:PIE_CHART</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>SORTING</name>
+ <title>Parent</title>
+ </entityField>
+ <entityField>
+ <name>X_PHASE</name>
+ <title>Phase</title>
+ </entityField>
+ <entityField>
+ <name>Y_COUNT</name>
+ <title>Count</title>
+ </entityField>
+ <entityField>
+ <name>OVERALL_TURNOVER</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OVERALL_FORECAST</name>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SENT_OFFERS</name>
+ <title>Sent offers</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OPEN_SALESPROJECTS</name>
+ <title>Open salesprojects</title>
+ <contentType>NUMBER</contentType>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalesprojectAnalyses_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>X_PHASE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Y_COUNT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>SORTING.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index 3cfd60c715970e9ad544f07b9f9f741bcc640e04..a440d99c1eb9d4a218a05ad98ecb1dd289bd77bb 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,184 +1,185 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>SalesprojectMilestone_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title></title>
- <contentTitleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>DATE_END</name>
- <title>End date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <searchable v="true" />
- </entityField>
- <entityField>
- <name>DATE_START</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- </entityField>
- <entityField>
- <name>SALESPROJECT_MILESTONEID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SALESPROJECT_ID</name>
- <searchable v="false" />
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TYPE</name>
- <title>Type</title>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>VALUE</name>
- <consumer>Keywords</consumer>
- <mandatory v="true" />
- <titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js</titleProcess>
- <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>SalesprojectMilestones</name>
- <recordContainer>db</recordContainer>
- <children>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Type_param</name>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>DaysCount</name>
- <title>Days count</title>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/dayscount/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>PARENT</name>
- </entityField>
- <entityConsumer>
- <name>Keywords</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>Type_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>StateMilestones</name>
- <dependencies>
- <entityDependency>
- <name>da87708b-e998-4694-81ae-d0068f789a89</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectStateMilestones</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityProvider>
- <entityProvider>
- <name>PhaseMilestones</name>
- <dependencies>
- <entityDependency>
- <name>b132527b-990c-416a-b2d6-ddbe6f4397e2</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectPhaseMilestones</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityProvider>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBUpdate>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
- <title></title>
- <linkInformation>
- <linkInformation>
- <name>464f1fd7-e5b6-4cfc-92f8-4873d4e10ce3</name>
- <tableName>SALESPROJECT_MILESTONE</tableName>
- <primaryKey>SALESPROJECT_MILESTONEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE_END.value</name>
- <recordfield>SALESPROJECT_MILESTONE.DATE_END</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_START.value</name>
- <recordfield>SALESPROJECT_MILESTONE.DATE_START</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESPROJECT_MILESTONEID.value</name>
- <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_MILESTONEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.value</name>
- <recordfield>SALESPROJECT_MILESTONE.TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>VALUE.value</name>
- <recordfield>SALESPROJECT_MILESTONE.VALUE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESPROJECT_ID.value</name>
- <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PARENT.value</name>
- <expression>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/recordfieldmappings/parent.value/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>SalesprojectMilestone_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title></title>
+ <contentTitleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DATE_END</name>
+ <title>End date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <searchable v="true" />
+ </entityField>
+ <entityField>
+ <name>DATE_START</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ </entityField>
+ <entityField>
+ <name>SALESPROJECT_MILESTONEID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_milestoneid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SALESPROJECT_ID</name>
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TYPE</name>
+ <title>Type</title>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>VALUE</name>
+ <consumer>Keywords</consumer>
+ <mandatory v="true" />
+ <titleProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/value/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>SalesprojectMilestones</name>
+ <recordContainer>db</recordContainer>
+ <children>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Type_param</name>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>DaysCount</name>
+ <title>Days count</title>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/dayscount/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PARENT</name>
+ </entityField>
+ <entityConsumer>
+ <name>Keywords</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/keywords/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>Type_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>StateMilestones</name>
+ <dependencies>
+ <entityDependency>
+ <name>f705534d-dcf3-4049-a1ea-3f75e93aa2f0</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>SalesprojectStateMilestones</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/statemilestones/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>PhaseMilestones</name>
+ <dependencies>
+ <entityDependency>
+ <name>b132527b-990c-416a-b2d6-ddbe6f4397e2</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>SalesprojectPhaseMilestones</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>Type_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectMilestone_entity/entityfields/phasemilestones/children/type_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBUpdate>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/onDBUpdate.js</onDBUpdate>
+ <title></title>
+ <linkInformation>
+ <linkInformation>
+ <name>464f1fd7-e5b6-4cfc-92f8-4873d4e10ce3</name>
+ <tableName>SALESPROJECT_MILESTONE</tableName>
+ <primaryKey>SALESPROJECT_MILESTONEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_END.value</name>
+ <recordfield>SALESPROJECT_MILESTONE.DATE_END</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_START.value</name>
+ <recordfield>SALESPROJECT_MILESTONE.DATE_START</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESPROJECT_MILESTONEID.value</name>
+ <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_MILESTONEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <recordfield>SALESPROJECT_MILESTONE.TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VALUE.value</name>
+ <recordfield>SALESPROJECT_MILESTONE.VALUE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESPROJECT_ID.value</name>
+ <recordfield>SALESPROJECT_MILESTONE.SALESPROJECT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PARENT.value</name>
+ <expression>%aditoprj%/entity/SalesprojectMilestone_entity/recordcontainers/db/recordfieldmappings/parent.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 20d329a42037cbec6fdae0ee7c1c625af9c54ad2..ef583549d67921890ca9c1b35d265af872c307c0 100644
--- a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
+++ b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>SalesprojectPhase_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Phase</title>
@@ -43,12 +43,20 @@
<name>jdito</name>
<jDitoRecordAlias>Data_alias</jDitoRecordAlias>
<contentProcess>%aditoprj%/entity/SalesprojectPhase_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>STATE.value</element>
- <element>TITLE.value</element>
- <element>ICON.value</element>
- </recordFields>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>STATE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TITLE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>ICON.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
</entity>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index e1def85ab1dddab32f4d5eb2be0b337e541d41d3..3f3260e7d79664dc886fd53f7bd99f5375815786 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,127 +1,129 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>SalesprojectSource_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Touchpoint</title>
- <iconId>VAADIN:HANDSHAKE</iconId>
- <titlePlural>Touchpoints</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityProvider>
- <name>SalesprojectSouces</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>c1628437-2813-464f-b91c-71b1c6bb63a4</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectSources</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityField>
- <name>ENTRYDATE</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- </entityField>
- <entityField>
- <name>SALESPROJECT_ID</name>
- <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SALESPROJECT_SOURCEID</name>
- <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_sourceid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>SOURCE</name>
- <title>Touchpoint</title>
- <consumer>KeywordSources</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>KeywordSources</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>INFO</name>
- <title>Information</title>
- <contentType>LONG_TEXT</contentType>
- </entityField>
- <entityField>
- <name>ICON</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js</valueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>cbe646de-9bc8-4008-8a2f-41fa5728d85e</name>
- <tableName>SALESPROJECT_SOURCE</tableName>
- <primaryKey>SALESPROJECT_SOURCEID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ENTRYDATE.value</name>
- <recordfield>SALESPROJECT_SOURCE.ENTRYDATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESPROJECT_ID.value</name>
- <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALESPROJECT_SOURCEID.value</name>
- <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_SOURCEID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SOURCE.value</name>
- <recordfield>SALESPROJECT_SOURCE.SOURCE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SOURCE.displayValue</name>
- <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>SalesprojectSource_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Touchpoint</title>
+ <iconId>VAADIN:HANDSHAKE</iconId>
+ <titlePlural>Touchpoints</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>SalesprojectSouces</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>c1628437-2813-464f-b91c-71b1c6bb63a4</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>SalesprojectSources</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityField>
+ <name>ENTRYDATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SALESPROJECT_ID</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SALESPROJECT_SOURCEID</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/salesproject_sourceid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SOURCE</name>
+ <title>Touchpoint</title>
+ <consumer>KeywordSources</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/source/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordSources</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/keywordsources/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>INFO</name>
+ <title>Information</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>ICON</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/SalesprojectSource_entity/entityfields/icon/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>cbe646de-9bc8-4008-8a2f-41fa5728d85e</name>
+ <tableName>SALESPROJECT_SOURCE</tableName>
+ <primaryKey>SALESPROJECT_SOURCEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ENTRYDATE.value</name>
+ <recordfield>SALESPROJECT_SOURCE.ENTRYDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESPROJECT_ID.value</name>
+ <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALESPROJECT_SOURCEID.value</name>
+ <recordfield>SALESPROJECT_SOURCE.SALESPROJECT_SOURCEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SOURCE.value</name>
+ <recordfield>SALESPROJECT_SOURCE.SOURCE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SOURCE.displayValue</name>
+ <expression>%aditoprj%/entity/SalesprojectSource_entity/recordcontainers/db/recordfieldmappings/source.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>SALESPROJECT_SOURCE.INFO</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js b/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js
index 994a752c908897b8d3c9fb51090d16c28a555867..651bbe1ba274ee0bea9f70ef309afe11a883b175 100644
--- a/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js
+++ b/entity/SalesprojectSource_entity/entityfields/entrydate/valueProcess.js
@@ -1,6 +1,7 @@
-import("system.neon");
+import("system.datetime");
import("system.vars");
import("system.result");
+import("system.neon");
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.date"))
\ No newline at end of file
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.getString("$this.value"))
+ result.string(datetime.date());
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index caff07b8c95d8d82207daef079efab08c8be59c9..ca41548bcef34527246f4b64bfbdb80c7ad65d54 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Salesproject_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Salesproject</title>
@@ -286,12 +286,6 @@
<expose v="true" />
<description>PARAMETER</description>
</entityParameter>
- <entityConsumer>
- <name>ObjectRelations</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- </entityConsumer>
<entityField>
<name>TIMETRACKINGSUM</name>
<title>Time expenses</title>
@@ -382,19 +376,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>KeywordPhases</name>
- <dependency>
- <name>dependency</name>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordphases/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
<entityActionField>
<name>newActivity</name>
<title>New activity</title>
@@ -522,6 +503,12 @@
<entityName>SalesprojectMilestone_entity</entityName>
<fieldName>StateMilestones</fieldName>
</dependency>
+ <children>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
</entityConsumer>
<entityConsumer>
<name>Attributes</name>
@@ -628,6 +615,14 @@
<name>ShowTurnover_param</name>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/showturnover_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>MaxYear_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/maxyear_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/yearcounttoshow_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/Salesproject_entity/entityfields/phase/valueProcess.js b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
index 90b1c491d4c722c0d5712e697b0371aea23add3c..c8e9543ca52fa6a3dd2d2760ca1d551447bfc032 100644
--- a/entity/Salesproject_entity/entityfields/phase/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/phase/valueProcess.js
@@ -1,6 +1,7 @@
+import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
import("system.result");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
- result.string("9f7d1fa9-7c09-4037-8f7c-8458def14d89"); //NQC
\ No newline at end of file
+ result.string($KeywordRegistry.salesprojectPhase$nqc()); //NQC
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/reasons/mandatoryProcess.js b/entity/Salesproject_entity/entityfields/reasons/mandatoryProcess.js
index 086a5d36d49678a0e352341b792f65b46d756025..e04fe64bb9f9475704a97e61647eef1cda571d94 100644
--- a/entity/Salesproject_entity/entityfields/reasons/mandatoryProcess.js
+++ b/entity/Salesproject_entity/entityfields/reasons/mandatoryProcess.js
@@ -1,6 +1,7 @@
import("system.result");
import("system.vars");
+import("KeywordRegistry_basic");
// IDs: SalesprojectState Order and Lost
-var res = vars.get("$field.STATE") && (vars.get("$field.STATE") == 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd' || vars.get("$field.STATE") == '130bb53a-a97e-455e-8f34-8d445e985474');
+var res = vars.get("$field.STATE") && (vars.get("$field.STATE") == $KeywordRegistry.salesprojectState$order() || vars.get("$field.STATE") == $KeywordRegistry.salesprojectState$lost());
result.string(res);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/reasons/stateProcess.js b/entity/Salesproject_entity/entityfields/reasons/stateProcess.js
index 5e5536334c4ff87b845fff9f55a37d1e1dc06281..666b25be556fdf618dc8fc730751b30d5b1ce085 100644
--- a/entity/Salesproject_entity/entityfields/reasons/stateProcess.js
+++ b/entity/Salesproject_entity/entityfields/reasons/stateProcess.js
@@ -1,8 +1,9 @@
import("system.result");
import("system.vars");
+import("KeywordRegistry_basic");
// IDs: SalesprojectState Order and Lost
-if(vars.get("$field.STATE") && (vars.get("$field.STATE") == 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd' || vars.get("$field.STATE") == '130bb53a-a97e-455e-8f34-8d445e985474'))
+if(vars.get("$field.STATE") && (vars.get("$field.STATE") == $KeywordRegistry.salesprojectState$order() || vars.get("$field.STATE") == $KeywordRegistry.salesprojectState$lost()))
result.string("EDITABLE");
else
result.string("INVISIBLE");
diff --git a/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/maxyear_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/maxyear_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3fa60fe5abcf5f5d877c1354981c3e740c718168
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/maxyear_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("system.datetime");
+
+result.string(parseInt(datetime.toDate(vars.get("$sys.date"), "YYYY")) + 2)
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/yearcounttoshow_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/yearcounttoshow_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cfe5e471ffaccae236fa2eb676a3a3e4979edfa4
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesprojectforecastcharts/children/yearcounttoshow_param/valueProcess.js
@@ -0,0 +1,13 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("system.datetime");
+
+var min = parseInt(datetime.toDate(vars.get("$field.STARTDATE"), "YYYY"));
+var max = parseInt(datetime.toDate(vars.get("$sys.date"), "YYYY")) + 2;
+var count = max - min + 1;
+
+if (count > 6)
+ count = 6;
+
+result.string(count)
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js b/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b9a94c51a19da02962159545a287ddc773e7320d
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/salesprojectstatemilestones/children/salesprojectid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.getString("$field.SALESPROJECTID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/state/onValueChange.js b/entity/Salesproject_entity/entityfields/state/onValueChange.js
index fd8dae9d669334bc145bbc55b693b70a55e63726..509f1db7864bbf1d05e44ad0f040196524f85dc4 100644
--- a/entity/Salesproject_entity/entityfields/state/onValueChange.js
+++ b/entity/Salesproject_entity/entityfields/state/onValueChange.js
@@ -12,10 +12,10 @@ if (vars.get("$sys.recordstate") != neon.OPERATINGSTATE_NEW)
var state = vars.get("$field.STATE");
// Postponed
- if (state == '23d38486-4cce-41ce-a8df-164ad44df706')
+ if (state == $KeywordRegistry.salesprojectState$postponed())
{
var stateName = KeywordUtils.getViewValue($KeywordRegistry.salesprojectState(), state);
- var clearForecast = question.askYesNo(translate.withArguments("Clear forecast and set state to '%0'?", [stateName]), translate.withArguments("Would you really like to clear the forecast and set the state to '%0'?" + "\n" + translate.text("This cannot be undone!"), [stateName]), false);
+ var clearForecast = question.askYesNo(translate.withArguments("Clear forecast and set state to '%0'?", [stateName]), translate.withArguments("Would you really like to clear the forecast and set the state to '%0'?", [stateName]) + "\n" + translate.text("This cannot be undone!"), false);
if (!clearForecast)
{
diff --git a/entity/Salesproject_entity/entityfields/state/valueProcess.js b/entity/Salesproject_entity/entityfields/state/valueProcess.js
index abb032b5aee7f5975d2638190fb6f782adc4e219..a4457905d6e53c4ca6b3ac93001932fbdd6ae3c0 100644
--- a/entity/Salesproject_entity/entityfields/state/valueProcess.js
+++ b/entity/Salesproject_entity/entityfields/state/valueProcess.js
@@ -1,6 +1,7 @@
+import("KeywordRegistry_basic");
import("system.neon");
import("system.vars");
import("system.result");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
- result.string("483bcaeb-1e5b-4772-b54e-7d7d8aa65712"); //Open
\ No newline at end of file
+ result.string($KeywordRegistry.salesprojectState$open()); //Open
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
index 67dfadce51729efc98e31f67a5a9892eb264710e..775a8af9d388163a8d1208e001d41893eaa4447d 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBUpdate.js
@@ -30,7 +30,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
// set COMPETITION / OFFER to Lost
// Lost
- if (state == 'd8a60f60-a4e6-46ee-88ec-bac53e1afedd')
+ if (state == $KeywordRegistry.salesprojectState$lost())
{
// set all offers of the salesproject to lost
db.updateData("OFFER", ["STATUS"], null, ["a5682630-01ae-4769-8f03-47dc1db44da4"], SqlCondition.equals("OFFER.OBJECT_ROWID", vars.getString("$field.SALESPROJECTID"), "1=2"));
@@ -38,7 +38,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
clearReason = false;
}
// Order
- else if (state == '130bb53a-a97e-455e-8f34-8d445e985474')
+ else if (state == $KeywordRegistry.salesprojectState$order())
{
// set all competitions of the salesproject to lost
db.updateData("COMPETITION", ["STATUS"], null, ["ff73172c-8517-4b6e-98cb-43aebacd9af1"], SqlCondition.equals("COMPETITION.OBJECT_ROWID", vars.getString("$field.SALESPROJECTID"), "1=2"));
@@ -46,7 +46,7 @@ vars.get("$local.changed").forEach(function(fieldName) {
clearReason = false;
}
// Postponed
- else if (state == '23d38486-4cce-41ce-a8df-164ad44df706')
+ else if (state == $KeywordRegistry.salesprojectState$postponed())
{
// do not notify as the user just got a question, if he really would like to clear the forecast
needToUpdateForecast = false;
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index b72cb44b449bdfe156d04949610be0e25924472a..2337c9d7b47718f219998adc2f803a24217015de 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,39 +1,41 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>SalutationDistinct_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <contentTitleProcess>%aditoprj%/entity/SalutationDistinct_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityProvider>
- <name>Salutations</name>
- <children>
- <entityParameter>
- <name>Language_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>Language_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>SalutationDistinct_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/SalutationDistinct_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityProvider>
+ <name>Salutations</name>
+ <children>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 48184627530e179e2e1073912186f6dda6ae530d..6da4e3129f1d6f48a5ccd18234289047285edd13 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,48 +1,50 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>SalutationTitleDistinct_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <contentTitleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/contentTitleProcess.js</contentTitleProcess>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>Salutation_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>SalutationTitles</name>
- <children>
- <entityParameter>
- <name>Language_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>Salutation_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>Language_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>SalutationTitleDistinct_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <contentTitleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>Salutation_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>SalutationTitles</name>
+ <children>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Salutation_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index 7423ff0a98964b7a3b9a48b392b2fea786086c80..2fc87ff2fb333fe58e8f5f9fd8df464e97a51cca 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -1,128 +1,127 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Salutation_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Salutation</title>
- <iconId>VAADIN:COMMENT_ELLIPSIS</iconId>
- <titlePlural>Salutations</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>SALUTATIONID</name>
- <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/salutationid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>HEADLINE</name>
- <title>Headline</title>
- </entityField>
- <entityField>
- <name>LANGUAGE</name>
- <title>Language</title>
- <consumer>KeywordLanguages</consumer>
- <displayValueProcess>%aditoprj%/entity/Salutation_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>LETTERSALUTATION</name>
- <title>Letter salutation</title>
- </entityField>
- <entityField>
- <name>SALUTATION_TEXT</name>
- <title>Salutation</title>
- </entityField>
- <entityField>
- <name>SEX</name>
- <title>Gender</title>
- <consumer>KeywordGenders</consumer>
- <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/sex/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Salutation_entity/entityfields/sex/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Salutation_entity/entityfields/sex/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>SORT</name>
- <title>Sorting</title>
- </entityField>
- <entityField>
- <name>TITLE</name>
- <title>Title</title>
- </entityField>
- <entityConsumer>
- <name>KeywordGenders</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/keywordgenders/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>KeywordLanguages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <orderClauseProcess>%aditoprj%/entity/Salutation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>4cbc9860-9a09-4250-8540-7017c7d22545</name>
- <tableName>SALUTATION</tableName>
- <primaryKey>SALUTATIONID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>HEADLINE.value</name>
- <recordfield>SALUTATION.HEADLINE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.value</name>
- <recordfield>SALUTATION.LANGUAGE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LETTERSALUTATION.value</name>
- <recordfield>SALUTATION.LETTERSALUTATION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALUTATION_TEXT.value</name>
- <recordfield>SALUTATION.SALUTATION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SALUTATIONID.value</name>
- <recordfield>SALUTATION.SALUTATIONID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SEX.value</name>
- <recordfield>SALUTATION.SEX</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>SORT.value</name>
- <recordfield>SALUTATION.SORT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TITLE.value</name>
- <recordfield>SALUTATION.TITLE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>LANGUAGE.displayValue</name>
- <expression>%aditoprj%/entity/Salutation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Salutation_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Salutation</title>
+ <iconId>VAADIN:COMMENT_ELLIPSIS</iconId>
+ <titlePlural>Salutations</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>SALUTATIONID</name>
+ <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/salutationid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>HEADLINE</name>
+ <title>Headline</title>
+ </entityField>
+ <entityField>
+ <name>LANGUAGE</name>
+ <title>Language</title>
+ <consumer>KeywordLanguages</consumer>
+ <displayValueProcess>%aditoprj%/entity/Salutation_entity/entityfields/language/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>LETTERSALUTATION</name>
+ <title>Letter salutation</title>
+ </entityField>
+ <entityField>
+ <name>SALUTATION_TEXT</name>
+ <title>Salutation</title>
+ </entityField>
+ <entityField>
+ <name>SEX</name>
+ <title>Gender</title>
+ <consumer>KeywordGenders</consumer>
+ <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/sex/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Salutation_entity/entityfields/sex/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>SORT</name>
+ <title>Sorting</title>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Title</title>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordGenders</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/keywordgenders/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordLanguages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <orderClauseProcess>%aditoprj%/entity/Salutation_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>4cbc9860-9a09-4250-8540-7017c7d22545</name>
+ <tableName>SALUTATION</tableName>
+ <primaryKey>SALUTATIONID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>HEADLINE.value</name>
+ <recordfield>SALUTATION.HEADLINE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.value</name>
+ <recordfield>SALUTATION.LANGUAGE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LETTERSALUTATION.value</name>
+ <recordfield>SALUTATION.LETTERSALUTATION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALUTATION_TEXT.value</name>
+ <recordfield>SALUTATION.SALUTATION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALUTATIONID.value</name>
+ <recordfield>SALUTATION.SALUTATIONID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SEX.value</name>
+ <recordfield>SALUTATION.SEX</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SORT.value</name>
+ <recordfield>SALUTATION.SORT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>SALUTATION.TITLE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>LANGUAGE.displayValue</name>
+ <expression>%aditoprj%/entity/Salutation_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Salutation_entity/entityfields/sex/onValidation.js b/entity/Salutation_entity/entityfields/sex/onValidation.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index da8061963c760862ee5259a3be4487ab984ea4ff..7fa651a361aa15335541bde805e3f32fb8450dce 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,35 +1,36 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Social_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Social Media</title>
- <entityFields>
- <entityField>
- <name>TWITTER_TIMELINE</name>
- <contentType>HTML</contentType>
- <valueProcess>%aditoprj%/entity/Social_entity/entityfields/twitter_timeline/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>FACEBOOK_TIMELINE</name>
- <contentType>HTML</contentType>
- <valueProcess>%aditoprj%/entity/Social_entity/entityfields/facebook_timeline/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>YOUTUBE</name>
- <contentType>HTML</contentType>
- <valueProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>Account_param</name>
- <title>Benutzer</title>
- <expose v="true" />
- <description>Benutzer</description>
- </entityParameter>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- </entityFields>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Social_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Social Media</title>
+ <entityFields>
+ <entityField>
+ <name>TWITTER_TIMELINE</name>
+ <contentType>HTML</contentType>
+ <valueProcess>%aditoprj%/entity/Social_entity/entityfields/twitter_timeline/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>FACEBOOK_TIMELINE</name>
+ <contentType>HTML</contentType>
+ <valueProcess>%aditoprj%/entity/Social_entity/entityfields/facebook_timeline/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>YOUTUBE</name>
+ <contentType>HTML</contentType>
+ <valueProcess>%aditoprj%/entity/Social_entity/entityfields/youtube/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>Account_param</name>
+ <title>Benutzer</title>
+ <expose v="true" />
+ <mandatory v="true" />
+ <description>Benutzer</description>
+ </entityParameter>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ </entityFields>
+</entity>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index ac3a7e8fad938d80024831967c0ba577ade82320..ee7f97d0599d81e2f98bede87d73ba0a7aa01a52 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,164 +1,164 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Stock_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
- <title>Stock</title>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityField>
- <name>ENTRYDATE</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>IN_OUT</name>
- <title>I / O</title>
- <contentType>TEXT</contentType>
- <mandatory v="true" />
- <dropDownProcess>%aditoprj%/entity/Stock_entity/entityfields/in_out/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityField>
- <name>PRODUCT_ID</name>
- <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/product_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>QUANTITY</name>
- <title>Quantity</title>
- <contentType>TEXT</contentType>
- <outputFormat>#.##0</outputFormat>
- <inputFormat>#.##0</inputFormat>
- <mandatory v="true" />
- </entityField>
- <entityField>
- <name>REFNUMBER</name>
- <title>Reference</title>
- </entityField>
- <entityField>
- <name>STOCKID</name>
- <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>WAREHOUSE</name>
- <title>Warehouse</title>
- <consumer>KeywordWarehouses</consumer>
- <mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityProvider>
- <name>Stocks</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
- <entityName>Product_entity</entityName>
- <fieldName>Stocks</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- <entityDependency>
- <name>e6168337-2f0b-4135-be16-1a4fd1c2ff65</name>
- <entityName>Product_entity</entityName>
- <fieldName>StockCounts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>IMAGE</name>
- <contentType>IMAGE</contentType>
- <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/image/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>STOCKCOUNT</name>
- <title>Stock</title>
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockcount/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ProductId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityConsumer>
- <name>KeywordWarehouses</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <maximumDbRows v="0" />
- <conditionProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <orderClauseProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <linkInformation>
- <linkInformation>
- <name>d291e552-0b6a-48e1-a830-1558beb5f58e</name>
- <tableName>STOCK</tableName>
- <primaryKey>STOCKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>ENTRYDATE.value</name>
- <recordfield>STOCK.ENTRYDATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>IN_OUT.value</name>
- <recordfield>STOCK.IN_OUT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>PRODUCT_ID.value</name>
- <recordfield>STOCK.PRODUCT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>QUANTITY.value</name>
- <recordfield>STOCK.QUANTITY</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REFNUMBER.value</name>
- <recordfield>STOCK.REFNUMBER</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STOCKID.value</name>
- <recordfield>STOCK.STOCKID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>WAREHOUSE.value</name>
- <recordfield>STOCK.WAREHOUSE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>WAREHOUSE.displayValue</name>
- <expression>%aditoprj%/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Stock_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
+ <title>Stock</title>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>ENTRYDATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/entrydate/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>IN_OUT</name>
+ <title>I / O</title>
+ <contentType>TEXT</contentType>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/Stock_entity/entityfields/in_out/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>PRODUCT_ID</name>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/product_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>QUANTITY</name>
+ <title>Quantity</title>
+ <contentType>TEXT</contentType>
+ <outputFormat>#.##0</outputFormat>
+ <inputFormat>#.##0</inputFormat>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>REFNUMBER</name>
+ <title>Reference</title>
+ </entityField>
+ <entityField>
+ <name>STOCKID</name>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>WAREHOUSE</name>
+ <title>Warehouse</title>
+ <consumer>KeywordWarehouses</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Stock_entity/entityfields/warehouse/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityProvider>
+ <name>Stocks</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>aa9264c8-2c96-4a7a-94c7-e38bc0ae7df3</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Stocks</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>e6168337-2f0b-4135-be16-1a4fd1c2ff65</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>StockCounts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>IMAGE</name>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/image/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STOCKCOUNT</name>
+ <title>Stock</title>
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/stockcount/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ProductId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityConsumer>
+ <name>KeywordWarehouses</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/Stock_entity/entityfields/keywordwarehouses/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="false" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <maximumDbRows v="0" />
+ <conditionProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/Stock_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>d291e552-0b6a-48e1-a830-1558beb5f58e</name>
+ <tableName>STOCK</tableName>
+ <primaryKey>STOCKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ENTRYDATE.value</name>
+ <recordfield>STOCK.ENTRYDATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>IN_OUT.value</name>
+ <recordfield>STOCK.IN_OUT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PRODUCT_ID.value</name>
+ <recordfield>STOCK.PRODUCT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>QUANTITY.value</name>
+ <recordfield>STOCK.QUANTITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REFNUMBER.value</name>
+ <recordfield>STOCK.REFNUMBER</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STOCKID.value</name>
+ <recordfield>STOCK.STOCKID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>WAREHOUSE.value</name>
+ <recordfield>STOCK.WAREHOUSE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>WAREHOUSE.displayValue</name>
+ <expression>%aditoprj%/entity/Stock_entity/recordcontainers/db/recordfieldmappings/warehouse.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cfb5e2f208ebc097a37f1142fda6c9a3c916a89d
--- /dev/null
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -0,0 +1,424 @@
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>SupportTicket_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Supportticket</title>
+ <iconId>VAADIN:CHAT</iconId>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>CODE</name>
+ <title>ticket number</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>0000000</outputFormat>
+ <inputFormat>0000000</inputFormat>
+ <searchable v="false" />
+ <state>DISABLED</state>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/code/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_SUBJECT</name>
+ <title>subject</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>TASK_STATUS</name>
+ <title>{$TICKET_STATUS}</title>
+ <consumer>KeywordTaskState</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_status/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_PRIORITY</name>
+ <title>Priority</title>
+ <consumer>KeywordTaskPriority</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_REQUESTOR_CONTACT_ID</name>
+ <title>{$TICKET_REQUESTOR}</title>
+ <consumer>ContactRequestors</consumer>
+ <linkedContext>Person</linkedContext>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_EDITOR_CONTACT_ID</name>
+ <title>{$TICKET_EDITOR}</title>
+ <consumer>ContactEditors</consumer>
+ <linkedContext>Person</linkedContext>
+ <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_START_DATE</name>
+ <title>Begin</title>
+ <contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+ <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
+ <groupable v="true" />
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_start_date/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_MATURITY_DATE</name>
+ <title>Maturity</title>
+ <contentType>DATE</contentType>
+ <resolution>MINUTE</resolution>
+ <outputFormat>dd.MM.yyyy HH:mm</outputFormat>
+ <inputFormat>dd.MM.yyyy HH:mm</inputFormat>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_TYPE</name>
+ <title>type</title>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_type/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_DESCRIPTION</name>
+ <title>description</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
+ <entityField>
+ <name>TASK_TASKID</name>
+ <title>TASKID (UID)</title>
+ <mandatory v="true" />
+ <searchable v="false" />
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_taskid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_PRIORITY_ICON</name>
+ <colorProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js</colorProcess>
+ <contentType>IMAGE</contentType>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority_icon/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>FilterOnlyOwnTicket_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/filteronlyownticket_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityConsumer>
+ <name>Links</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TaskLink_entity</entityName>
+ <fieldName>Link</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>TaskId_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/links/children/taskid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Attributes</name>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/stateProcess.js</stateProcess>
+ <onValidation>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/onValidation.js</onValidation>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AttributeRelation_entity</entityName>
+ <fieldName>AttributeRelations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectRowId_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ShowEmpty_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/showempty_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>FilteredAttributeIds_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>DisplaySimpleName_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>MainDocuments</name>
+ <stateProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/maindocuments/stateProcess.js</stateProcess>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Documents</name>
+ <selectionMode>MULTI</selectionMode>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Document_entity</entityName>
+ <fieldName>Documents</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>AssignmentRowId_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>AssignmentTable_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <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/SupportTicket_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>TASK_PROGRESS</name>
+ <title>Progress</title>
+ <consumer>KeywordProgress</consumer>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_progress/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_progress/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordProgress</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>TICKETTYPE</name>
+ <consumer>KeywordTickettype</consumer>
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/tickettype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TICKETID</name>
+ </entityField>
+ <entityField>
+ <name>TASK_ID</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_SUBJECT_DETAILS</name>
+ <title>subject</title>
+ <linkedContext>Task</linkedContext>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordTickettype</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtickettype/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordTaskState</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>WhitelistIds_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>TicketType_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/tickettype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordTaskPriority</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContactEditors</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ContactRequestors</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isRequireContainerFiltering v="true" />
+ <fromClauseProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <onDBInsert>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
+ <onDBDelete>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
+ <linkInformation>
+ <linkInformation>
+ <name>ec5c2cd3-f05b-467f-88c6-c1d4d7de87cc</name>
+ <tableName>TICKET</tableName>
+ <primaryKey>TICKETID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>d73da2b3-bc44-4909-9bc0-9298cf57e7d7</name>
+ <tableName>TASK</tableName>
+ <primaryKey>TASKID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>CODE.value</name>
+ <recordfield>TICKET.CODE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_DESCRIPTION.value</name>
+ <recordfield>TASK.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_EDITOR_CONTACT_ID.value</name>
+ <recordfield>TASK.EDITOR_CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_MATURITY_DATE.value</name>
+ <recordfield>TASK.MATURITY_DATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_PRIORITY.value</name>
+ <recordfield>TASK.PRIORITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_REQUESTOR_CONTACT_ID.value</name>
+ <recordfield>TASK.REQUESTOR_CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_START_DATE.value</name>
+ <recordfield>TASK.START_DATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_STATUS.value</name>
+ <recordfield>TASK.STATUS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_SUBJECT.value</name>
+ <recordfield>TASK.SUBJECT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_EDITOR_CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_editor_contact_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_REQUESTOR_CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_requestor_contact_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_PRIORITY.displayValue</name>
+ <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_priority.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_PROGRESS.value</name>
+ <recordfield>TASK.PROGRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_PROGRESS.displayValue</name>
+ <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_progress.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_STATUS.displayValue</name>
+ <expression>%aditoprj%/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/task_status.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_TYPE.value</name>
+ <recordfield>TASK.TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_ID.value</name>
+ <recordfield>TICKET.TASK_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_TASKID.value</name>
+ <recordfield>TASK.TASKID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TICKETID.value</name>
+ <recordfield>TICKET.TICKETID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TICKETTYPE.value</name>
+ <recordfield>TICKET.TICKETTYPE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Task_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
similarity index 100%
rename from entity/Task_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
rename to entity/SupportTicket_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js
diff --git a/entity/SupportTicket_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ddf4072c2285b3f3482d176506e3df1ca0e42dc1
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("Ticket_lib");
+import("system.vars");
+import("system.result");
+
+result.object(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getTypeAttributes());
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
similarity index 53%
rename from entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
rename to entity/SupportTicket_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
index ee0cddc370f78c08084b64d57e2a36686aad1e82..1e8cb5a2124b3f6dea5a1b671d51272804c4dcd5 100644
--- a/entity/Person_entity/entityfields/objectrelations/children/objectrowid_param/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("system.result");
-result.string(vars.get("$field.PERSONID"));
\ No newline at end of file
+result.string(vars.get("$field.TICKETID"))
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2466d02a342a0ff203950856c2c9944299c5a942
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Context_lib")
+
+result.string("Ticket");
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/attributes/children/showempty_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/attributes/children/showempty_param/valueProcess.js
similarity index 100%
rename from entity/Task_entity/entityfields/attributes/children/showempty_param/valueProcess.js
rename to entity/SupportTicket_entity/entityfields/attributes/children/showempty_param/valueProcess.js
diff --git a/entity/Task_entity/entityfields/attributes/onValidation.js b/entity/SupportTicket_entity/entityfields/attributes/onValidation.js
similarity index 100%
rename from entity/Task_entity/entityfields/attributes/onValidation.js
rename to entity/SupportTicket_entity/entityfields/attributes/onValidation.js
diff --git a/entity/Task_entity/entityfields/attributes/stateProcess.js b/entity/SupportTicket_entity/entityfields/attributes/stateProcess.js
similarity index 65%
rename from entity/Task_entity/entityfields/attributes/stateProcess.js
rename to entity/SupportTicket_entity/entityfields/attributes/stateProcess.js
index 8c4ca0d7a0ad5b3a03f3206a27db0c7fba0fa525..2dadafc29018747c7006b7a126d8f18dbd52c8a3 100644
--- a/entity/Task_entity/entityfields/attributes/stateProcess.js
+++ b/entity/SupportTicket_entity/entityfields/attributes/stateProcess.js
@@ -1,9 +1,9 @@
+import("Ticket_lib");
import("system.result");
import("system.vars");
import("system.neon");
-import("ActivityTask_lib");
-if (TaskUtils.typeHasAttributes(vars.get("$field.TYPE")))
+if (TicketUtils.begin(vars.get("$field.TICKETTYPE")).typeHasAttributes())
{
result.string(neon.COMPONENTSTATE_EDITABLE);
}
diff --git a/entity/SupportTicket_entity/entityfields/code/valueProcess.js b/entity/SupportTicket_entity/entityfields/code/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b3745b58d06c37e5cdd691e0fab9a532fe53083a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/code/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string("-1");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c95f5ea0c85673d6f68abfdbef56f55fb63597c1
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/documents/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9f9b1dd3ca646d2537ccafd3658f4d6c4621e206
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/documents/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string("TICKET");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/filteronlyownticket_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/filteronlyownticket_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e0f3ec47e2b963a577204e41d9847dd6ad0725a8
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/filteronlyownticket_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(false);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js
similarity index 63%
rename from entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js
rename to entity/SupportTicket_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js
index b139734c3ee81a4a9d2ce291db74ea5241044e81..b19308201a587f0681e4a6486ea3751b784e1ebb 100644
--- a/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/keywordprogress/children/containername_param/valueProcess.js
@@ -2,4 +2,4 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string($KeywordRegistry.taskType());
+result.string($KeywordRegistry.taskProgress());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js
similarity index 55%
rename from entity/Task_entity/entityfields/type_param/valueProcess.js
rename to entity/SupportTicket_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js
index f1d6cdd9b2e130ea987bb633c2422d98befe664b..e241431e6d5824a79bc1eb683559296952dcde12 100644
--- a/entity/Task_entity/entityfields/type_param/valueProcess.js
+++ b/entity/SupportTicket_entity/entityfields/keywordtaskpriority/children/containername_param/valueProcess.js
@@ -1,4 +1,4 @@
-import("KeywordRegistry_basic");
import("system.result");
+import("KeywordRegistry_basic");
-result.string($KeywordRegistry.taskType$Task());
\ No newline at end of file
+result.string($KeywordRegistry.taskPriority());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..db7e6399caf4cc0d3a6bfe852bba43576649ddeb
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.taskStatus());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ee2bf21d31ab11aeeb48c898fc04fc05561bb47
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/keywordtaskstate/children/whitelistids_param/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.logging");
+import("system.vars");
+import("system.result");
+import("Ticket_lib");
+logging.log(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getAvailableStatus())
+result.object(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getAvailableStatus())
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/keywordtickettype/children/containername_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/keywordtickettype/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..73ef051c47c31aff08eccfae9b44c2232d505e47
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/keywordtickettype/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.ticketType())
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/links/children/taskid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/links/children/taskid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f8071b02f44283617dd54ee8cb35c2bf40367483
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/links/children/taskid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.TASK_TASKID"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9dcf6c151f4c2caafeb0adce1d7cc0a6999618e0
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.TICKETID"), tableNames: ["TICKET"]});
+res.push({id: vars.get("$field.TASK_TASKID"), tableNames: ["TASK"]});
+
+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/SupportTicket_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c95f5ea0c85673d6f68abfdbef56f55fb63597c1
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..09f18437abaebfab9d325e30b46537f9f9a6949a
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/maindocuments/children/assignmenttable_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("TICKET");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/maindocuments/stateProcess.js b/entity/SupportTicket_entity/entityfields/maindocuments/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5458354c9a9f66b8f11aa4e84682bbc666bea207
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/maindocuments/stateProcess.js
@@ -0,0 +1,14 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+if (0 == db.getBinaryCount("TASK", "DOCUMENT", vars.get("$sys.uid"), SqlUtils.getSystemAlias(), "MAINDOCUMENT"))
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_EDITABLE);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0dde82e7728286629b1c210326725aac2ebb92c5
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_editor_contact_id/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+var id = vars.get("$this.value");
+//show the simpel title since this will be later an employee-entry and therefore no organisation is needed
+var title = ContactUtils.getTitleByContactId(id);
+result.string(title);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_id/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..48fc3a1ef5d921f4a3fdce21148b7944925be12b
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_id/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.neon");
+import("system.vars");
+import("system.result");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(vars.get("$field.TASK_TASKID"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f86620cd5deb97d5d66c61ef83d177d2da85f3ea
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_maturity_date/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.eMath");
+import("system.datetime");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ var startDate = vars.get("$field.TASK_START_DATE");
+ var presetVal = eMath.addInt(startDate, datetime.ONE_WEEK);
+ result.string(presetVal);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_priority/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/task_priority/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7828c80c39140dd71172ff71c8d03ca0c62dccd0
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_priority/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskPriority(), vars.get("$field.TASK_PRIORITY")));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d84677bdf68e820d7955d86a9c5fe8b2935c698e
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_priority/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Ticket_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getDefaultPriority());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d5381e94ed349aaf085f56d443df54cf3afea7ec
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js
@@ -0,0 +1,21 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.neon");
+
+switch(vars.getString("$field.TASK_PRIORITY"))
+{
+ case $KeywordRegistry.taskPriority$none():
+ result.string(neon.PRIORITY_NONE_COLOR);
+ break;
+ case $KeywordRegistry.taskPriority$low():
+ result.string(neon.PRIORITY_LOW_COLOR);
+ break;
+ case $KeywordRegistry.taskPriority$medium():
+ result.string(neon.PRIORITY_MEDIUM_COLOR);
+ break;
+ case $KeywordRegistry.taskPriority$high():
+ result.string(neon.PRIORITY_HIGH_COLOR);
+ break;
+}
+
diff --git a/entity/SupportTicket_entity/entityfields/task_priority_icon/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_priority_icon/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c8a46bd41b69b171557e53d30b2dc3c074e3ad99
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_priority_icon/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
+import("system.result");
+
+result.string(TaskUtils.getStatusIcon(vars.getString("$field.TASK_STATUS")));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_progress/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/task_progress/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..19faa7e8ceb8b7db17c67252b7d90b303589d0bf
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_progress/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskProgress(), vars.get("$field.TASK_PROGRESS")));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_progress/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_progress/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..854d3c94292f47f7eee1f245ceada6ec2704fee7
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_progress/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("KeywordRegistry_basic");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string($KeywordRegistry.taskProgress$0());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0dde82e7728286629b1c210326725aac2ebb92c5
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Contact_lib");
+
+var id = vars.get("$this.value");
+//show the simpel title since this will be later an employee-entry and therefore no organisation is needed
+var title = ContactUtils.getTitleByContactId(id);
+result.string(title);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e62e7551ccb20b0b0d7aca34f64b6e448b5dda7
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_requestor_contact_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Employee_lib");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(EmployeeUtils.getCurrentContactId());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_start_date/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_start_date/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b098ba003d06ee9125c54f3f53559b2155ea8e3
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_start_date/valueProcess.js
@@ -0,0 +1,12 @@
+import("system.datetime");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ var presetVal = datetime.date();
+ //TODO: depending on what happens in #1032274 we need to manually set the resolution to MINUTES or not (which means we've to set everything smaller than MINUTES (Seconds, etc.) to zero)
+ presetVal = Math.floor(presetVal / datetime.ONE_MINUTE) * datetime.ONE_MINUTE;
+ result.string(presetVal);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_status/displayValueProcess.js b/entity/SupportTicket_entity/entityfields/task_status/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e8f71e16db074f12bd5a41e011e2fc4de151a333
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_status/displayValueProcess.js
@@ -0,0 +1,6 @@
+import("KeywordRegistry_basic");
+import("system.vars");
+import("system.result");
+import("Keyword_lib");
+
+result.string(KeywordUtils.getViewValue($KeywordRegistry.taskStatus(), vars.get("$field.TASK_STATUS")));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..caf782637394f5505b64eff69edd7685a80fabdc
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_status/valueProcess.js
@@ -0,0 +1,9 @@
+import("Ticket_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string(TicketUtils.begin(vars.get("$field.TICKETTYPE")).getDefaultStatus());
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..575d44d113e181400c9265d78f93c57799692ffe
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_subject_details/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+var responsible = vars.get("$field.TASK_EDITOR_CONTACT_ID.displayValue");
+result.string(vars.get("$field.TASK_SUBJECT") + (responsible ? " (" + responsible + ")" : ""));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_taskid/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_taskid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4af99287f59a86e98d9b4c552c010fe13c106cc7
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_taskid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/task_type/valueProcess.js b/entity/SupportTicket_entity/entityfields/task_type/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..68c9898c516c39fd154e5c53f6e22ee2dd4e16e6
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/task_type/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ // Sets the type to "Task" as default value.
+ result.string($KeywordRegistry.taskType$ticket());
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/tickettype/valueProcess.js b/entity/SupportTicket_entity/entityfields/tickettype/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c3e6ca34b7a1586f84141392adfffe8fb2b6dc38
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/tickettype/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string(vars.get("$param.TicketType_param"));
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/entityfields/tickettype_param/valueProcess.js b/entity/SupportTicket_entity/entityfields/tickettype_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..70a9670c7167981475d648c17d26c9c5b4182ca2
--- /dev/null
+++ b/entity/SupportTicket_entity/entityfields/tickettype_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.ticketType$supportTicket());
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7aed878b9c800335d8ba7d6747eb5f84d99e0459
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,43 @@
+import("system.logging");
+import("Employee_lib");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+var cond = new SqlCondition();
+cond.andPrepare("TASK.TYPE", $KeywordRegistry.taskType$ticket())
+ .andPrepareVars("TICKET.TICKETTYPE", "$param.TicketType_param")
+
+var loadNothing = false;
+
+if (vars.getString("$param.FilterOnlyOwnTicket_param") == "true")
+{
+ var ownContactId = EmployeeUtils.getCurrentContactId();
+ if (ownContactId)
+ cond.andPrepareIfSet("TASK.EDITOR_CONTACT_ID", ownContactId);
+ else
+ loadNothing = true;
+}
+
+if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ var activityLinkCond = SqlCondition.begin().andPrepareVars("TASKLINK.OBJECT_ROWID", "$param.RowId_param")
+ .andPrepareVars("TASKLINK.OBJECT_TYPE", "$param.ObjectId_param");
+
+ // TODO: more performant way than IN. Maybe a join?
+ cond.and(db.translateStatement(activityLinkCond.buildSql("TASK.TASKID in (select TASKLINK.TASK_ID from TASKLINK", "1=2", ")")))
+}
+
+if (loadNothing)
+{
+ result.string("1=2");
+}
+else
+{
+ //TODO: use a preparedCondition when available #1030812 #1034026
+ var resCond = db.translateCondition(cond.build("1=1"));
+ logging.log(resCond)
+ result.string(resCond);
+}
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js b/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..12885dc890edd5411d5e080ca1a7a98af3088223
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("TICKET left join TASK on TASK_ID = TASKID");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js b/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js
new file mode 100644
index 0000000000000000000000000000000000000000..533e52691a63b864202ef1d916048b1f7d289144
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBDelete.js
@@ -0,0 +1,9 @@
+import("system.logging");
+import("system.vars");
+import("system.db");
+import("Sql_lib");
+
+var condition = SqlCondition.begin()
+ .andPrepareVars("TASKLINK.TASK_ID", "$field.TASK_TASKID");
+logging.log("delete " + vars.get("$field.TASK_TASKID"))
+db.deleteData("TASKLINK", condition.build("1=2"));
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a2c2a214c48b0e752b2c1bc122ae428e275fbc7
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/onDBInsert.js
@@ -0,0 +1,6 @@
+import("Util_lib");
+import("system.vars");
+import("system.db");
+import("ActivityTask_lib")
+
+CodeUtils.setCode(vars.get("$field.TICKETID"), "TICKET", "TICKETID", "CODE");
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js b/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1eed9e6c15fff6062b3ed8161413699d5301f28
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.db");
+import("system.result");
+
+result.object({"TASK.MATURITY_DATE": db.DESCENDING});
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5961584dd2e3bd5741ac96032105a8cc43ec58b
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Person_lib");
+
+//TODO: try to find a better solution for this -> #TITLE-mechanic when available
+var subSql = PersUtils.getResolvingDisplaySubSql("TASK.EDITOR_CONTACT_ID");
+result.string(subSql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..0b2c6568c32b748a32d429eddffbc29e9f24d980
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/priority.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskPriority(), "TASK.PRIORITY");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..4666f5143991d0e7ade783064a6094470f7f397e
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/progress.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.taskProgress(), "TASK.PROGRESS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c6d6087a2615c447bc2b84294d4e029b1cde9ba
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Person_lib");
+
+//TODO: try to find a better solution for this -> #TITLE-mechanic when available
+var subSql = PersUtils.getResolvingDisplaySubSql("TASK.REQUESTOR_CONTACT_ID");
+result.string(subSql);
\ No newline at end of file
diff --git a/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f15c2dfb29cfb0697cf46955ed2840b4480a8ef
--- /dev/null
+++ b/entity/SupportTicket_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js
@@ -0,0 +1,2 @@
+// do not use this, because TaskUtils.getTypeStatusKeyword(vars.get("$field.TASK_TYPE")) has to be called, which is not possible in a subselect.
+// --> only use display value process
\ No newline at end of file
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index 69cba5eafea7b5f89b556916d8c317374a140fdd..d6a4e934688ecabf08ae5748f2a3ea5b19306154 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,119 +1,125 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>TaskLink_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Connection</title>
- <titlePlural>Connections</titlePlural>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>TASKLINKID</name>
- <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/tasklinkid/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>TASK_ID</name>
- <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/task_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_TYPE</name>
- <title>{$OBJECTLINK_TYPE}</title>
- <consumer>Contexts</consumer>
- <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>OBJECT_ROWID</name>
- <title>{$OBJECTLINK_OBJECT}</title>
- <consumer>Objects</consumer>
- <linkedContextProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
- <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityProvider>
- <name>Link</name>
- <targetContextField>OBJECT_TYPE</targetContextField>
- <targetIdField>OBJECT_ROWID</targetIdField>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>40cc8bcd-c178-4a77-a968-642e1d8e1f70</name>
- <entityName>Task_entity</entityName>
- <fieldName>Links</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>TaskId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityParameter>
- <name>TaskId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityConsumer>
- <name>Contexts</name>
- <dependency>
- <name>dependency</name>
- <entityName>Context_entity</entityName>
- <fieldName>TaskLinkable</fieldName>
- </dependency>
- </entityConsumer>
- <entityConsumer>
- <name>Objects</name>
- <dependency>
- <name>dependency</name>
- <entityName>Object_entity</entityName>
- <fieldName>AllObjects</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>75141ff0-c6de-4dfd-ad35-6bf2fc931fb9</name>
- <tableName>TASKLINK</tableName>
- <primaryKey>TASKLINKID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.value</name>
- <recordfield>TASKLINK.OBJECT_ROWID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_TYPE.value</name>
- <recordfield>TASKLINK.OBJECT_TYPE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TASK_ID.value</name>
- <recordfield>TASKLINK.TASK_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TASKLINKID.value</name>
- <recordfield>TASKLINK.TASKLINKID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ROWID.displayValue</name>
- <expression>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>TaskLink_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Connection</title>
+ <titlePlural>Connections</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>TASKLINKID</name>
+ <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/tasklinkid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TASK_ID</name>
+ <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/task_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_TYPE</name>
+ <title>{$OBJECTLINK_TYPE}</title>
+ <consumer>Contexts</consumer>
+ <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_type/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ROWID</name>
+ <title>{$OBJECTLINK_OBJECT}</title>
+ <consumer>Objects</consumer>
+ <linkedContextProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/linkedContextProcess.js</linkedContextProcess>
+ <displayValueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/object_rowid/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityProvider>
+ <name>Link</name>
+ <targetContextField>OBJECT_TYPE</targetContextField>
+ <targetIdField>OBJECT_ROWID</targetIdField>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>40cc8bcd-c178-4a77-a968-642e1d8e1f70</name>
+ <entityName>Task_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>96ab81b2-20d1-4e30-8563-4b06d8406269</name>
+ <entityName>SupportTicket_entity</entityName>
+ <fieldName>Links</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>TaskId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>TaskId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>Contexts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>TaskLinkable</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Objects</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Object_entity</entityName>
+ <fieldName>AllObjects</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ObjectType_param</name>
+ <valueProcess>%aditoprj%/entity/TaskLink_entity/entityfields/objects/children/objecttype_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>75141ff0-c6de-4dfd-ad35-6bf2fc931fb9</name>
+ <tableName>TASKLINK</tableName>
+ <primaryKey>TASKLINKID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.value</name>
+ <recordfield>TASKLINK.OBJECT_ROWID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_TYPE.value</name>
+ <recordfield>TASKLINK.OBJECT_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASK_ID.value</name>
+ <recordfield>TASKLINK.TASK_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TASKLINKID.value</name>
+ <recordfield>TASKLINK.TASKLINKID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ROWID.displayValue</name>
+ <expression>%aditoprj%/entity/TaskLink_entity/recordcontainers/db/recordfieldmappings/object_rowid.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index ea428b0a1b7dcc2cae30be60a507a664d11ce2b8..4703d5dcdba710183cff3f004e32fb211206ea3d 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,5 +1,5 @@
<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
<name>Task_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
@@ -16,16 +16,6 @@
<name>#PROVIDER</name>
<recordContainer>db</recordContainer>
</entityProvider>
- <entityField>
- <name>CODE</name>
- <title>task number</title>
- <contentType>NUMBER</contentType>
- <outputFormat>0000000</outputFormat>
- <inputFormat>0000000</inputFormat>
- <searchable v="false" />
- <state>DISABLED</state>
- <stateProcess>%aditoprj%/entity/Task_entity/entityfields/code/stateProcess.js</stateProcess>
- </entityField>
<entityField>
<name>SUBJECT</name>
<title>subject</title>
@@ -34,7 +24,6 @@
<entityField>
<name>STATUS</name>
<title>{$TASK_STATUS}</title>
- <colorProcess>%aditoprj%/entity/Task_entity/entityfields/status/colorProcess.js</colorProcess>
<consumer>KeywordStates</consumer>
<groupable v="true" />
<mandatory v="true" />
@@ -85,16 +74,6 @@
<inputFormat>dd.MM.yyyy HH:mm</inputFormat>
<valueProcess>%aditoprj%/entity/Task_entity/entityfields/maturity_date/valueProcess.js</valueProcess>
</entityField>
- <entityField>
- <name>TYPE</name>
- <title>type</title>
- <consumer>KeywordTypes</consumer>
- <groupable v="true" />
- <searchable v="true" />
- <state>READONLY</state>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Task_entity/entityfields/type/displayValueProcess.js</displayValueProcess>
- </entityField>
<entityField>
<name>DESCRIPTION</name>
<title>description</title>
@@ -125,7 +104,6 @@
<children>
<entityParameter>
<name>OnlyActives_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/contacteditors/children/onlyactives_param/valueProcess.js</valueProcess>
</entityParameter>
</children>
</entityConsumer>
@@ -175,21 +153,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>KeywordTypes</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/keywordtypes/children/containername_param/valueProcess.js</valueProcess>
- <expose v="false" />
- </entityParameter>
- </children>
- </entityConsumer>
<entityConsumer>
<name>ModuleTrees</name>
<dependency>
@@ -303,6 +266,7 @@
</entityConsumer>
<entityConsumer>
<name>Links</name>
+ <state>EDITABLE</state>
<dependency>
<name>dependency</name>
<entityName>TaskLink_entity</entityName>
@@ -453,62 +417,10 @@
</entityParameter>
</children>
</entityConsumer>
- <entityConsumer>
- <name>Attributes</name>
- <stateProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/stateProcess.js</stateProcess>
- <onValidation>%aditoprj%/entity/Task_entity/entityfields/attributes/onValidation.js</onValidation>
- <dependency>
- <name>dependency</name>
- <entityName>AttributeRelation_entity</entityName>
- <fieldName>AttributeRelations</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ObjectRowId_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/objectrowid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ObjectType_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/objecttype_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ShowEmpty_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/showempty_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>FilteredAttributeIds_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>DisplaySimpleName_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/attributes/children/displaysimplename_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>Type_param</name>
- <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityActionGroup>
- <name>tableActions</name>
- <children>
- <entityActionField>
- <name>newBugTicket</name>
- <title>New Bugticket</title>
- <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PUZZLE_PIECE</iconId>
- <tooltip>New Bugticket</tooltip>
- </entityActionField>
- <entityActionField>
- <name>newSupportTicket</name>
- <title>New Supportticket</title>
- <onActionProcess>%aditoprj%/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:QUESTION</iconId>
- <tooltip>New Supportticket</tooltip>
- </entityActionField>
- </children>
- </entityActionGroup>
+ <entityField>
+ <name>TYPE</name>
+ <valueProcess>%aditoprj%/entity/Task_entity/entityfields/type/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -516,11 +428,10 @@
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBDelete>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
- <name>47e1b4a5-6901-48b0-85ba-bec39b86a2d7</name>
+ <name>6dfe6f25-2b83-413b-89e4-5c5b9839be2e</name>
<tableName>TASK</tableName>
<primaryKey>TASKID</primaryKey>
<isUIDTable v="true" />
@@ -528,10 +439,6 @@
</linkInformation>
</linkInformation>
<recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CODE.value</name>
- <recordfield>TASK.CODE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DESCRIPTION.value</name>
<recordfield>TASK.DESCRIPTION</recordfield>
@@ -572,10 +479,6 @@
<name>TASKID.value</name>
<recordfield>TASK.TASKID</recordfield>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.value</name>
- <recordfield>TASK.TYPE</recordfield>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>EDITOR_CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/editor_contact_id.displayvalue/expression.js</expression>
@@ -584,10 +487,6 @@
<name>REQUESTOR_CONTACT_ID.displayValue</name>
<expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/requestor_contact_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.displayValue</name>
- <expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/type.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PARENT_CONTEXT.value</name>
<recordfield>TASK.PARENT_CONTEXT</recordfield>
@@ -612,6 +511,10 @@
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/Task_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <recordfield>TASK.TYPE</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js b/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
deleted file mode 100644
index 47009a542400d5bd799e4892bf7c05a261be8aea..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/attributes/children/filteredattributeids_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.vars");
-import("system.result");
-import("ActivityTask_lib");
-
-result.object(TaskUtils.getTypeAttributes(vars.get("$field.TYPE")));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/attributes/children/objecttype_param/valueProcess.js b/entity/Task_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
deleted file mode 100644
index 6f0153b04fc8c8d5a96fd136bdc438f35169d787..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/attributes/children/objecttype_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("Context_lib")
-
-result.string(ContextUtils.getCurrentContextId());
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/contacteditors/children/onlyactives_param/valueProcess.js b/entity/Task_entity/entityfields/contacteditors/children/onlyactives_param/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Task_entity/entityfields/keywordstates/children/whitelistids_param/valueProcess.js b/entity/Task_entity/entityfields/keywordstates/children/whitelistids_param/valueProcess.js
index e9a933ca7ebe5479c050dbe91d569683d07d3507..03b66f45bd45fd69ac03a36d21907b6bd3c537b4 100644
--- a/entity/Task_entity/entityfields/keywordstates/children/whitelistids_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/keywordstates/children/whitelistids_param/valueProcess.js
@@ -1,5 +1,9 @@
-import("system.vars");
import("system.result");
-import("ActivityTask_lib");
+import("KeywordRegistry_basic");
-result.object(TaskUtils.getAvailableStatus(vars.get("$field.TYPE")));
\ No newline at end of file
+result.object([
+ $KeywordRegistry.taskStatus$new(),
+ $KeywordRegistry.taskStatus$inProgress(),
+ $KeywordRegistry.taskStatus$waiting(),
+ $KeywordRegistry.taskStatus$ended()
+]);
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/linkedobjects/children/presettype_param/valueProcess.js b/entity/Task_entity/entityfields/linkedobjects/children/presettype_param/valueProcess.js
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/entity/Task_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js b/entity/Task_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js
index 291121452f76328ba9ac2421f14440a703fefc3d..c95f5ea0c85673d6f68abfdbef56f55fb63597c1 100644
--- a/entity/Task_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js
+++ b/entity/Task_entity/entityfields/maindocuments/children/assignmentrowid_param/valueProcess.js
@@ -1,4 +1,4 @@
import("system.result");
import("system.vars");
-result.string(vars.get("$field.TASKID"));//TODO: sys.uid or similar?
\ No newline at end of file
+result.string(vars.get("$sys.uid"));
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/status/valueProcess.js b/entity/Task_entity/entityfields/status/valueProcess.js
index 7381489b6267e26f60ce7ad52b9cb07f73de400d..db358521bc070d2a6bf07582bdf12573673a1ec4 100644
--- a/entity/Task_entity/entityfields/status/valueProcess.js
+++ b/entity/Task_entity/entityfields/status/valueProcess.js
@@ -1,13 +1,9 @@
-import("ActivityTask_lib");
-import("system.util");
+import("KeywordRegistry_basic");
import("system.result");
import("system.neon");
import("system.vars");
-import("KeywordRegistry_basic");
-import("Keyword_lib");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
- var defaultState = TaskUtils.getDefaultStatus(vars.get("$field.TYPE"));
- result.string(defaultState);
+ result.string($KeywordRegistry.taskStatus$new());
}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js b/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js
deleted file mode 100644
index 5a967a81057b8ce337e9789b841c044c007f343f..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/tableactions/children/newbugticket/onActionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("ActivityTask_lib");
-import("KeywordRegistry_basic");
-import("Context_lib");
-
-// no parentid as tickets do not use them
-TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), undefined, {Type_param: $KeywordRegistry.taskType$bugTicket()});
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js b/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js
deleted file mode 100644
index 56a663ad518bb5156c6a5ed889190b143fa87200..0000000000000000000000000000000000000000
--- a/entity/Task_entity/entityfields/tableactions/children/newsupportticket/onActionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("ActivityTask_lib");
-import("KeywordRegistry_basic");
-import("Context_lib");
-
-// no parentid as tickets do not use them
-TaskUtils.createNewTask(undefined, undefined, ContextUtils.getCurrentContextId(), undefined, {Type_param: $KeywordRegistry.taskType$supportTicket()});
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/type/valueProcess.js b/entity/Task_entity/entityfields/type/valueProcess.js
index 5785a095c958b5fe6e59428fce0420b546ae38db..04149ad63a18b650dc2e75a1792c870d88a55f43 100644
--- a/entity/Task_entity/entityfields/type/valueProcess.js
+++ b/entity/Task_entity/entityfields/type/valueProcess.js
@@ -6,5 +6,5 @@ import("KeywordRegistry_basic");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
{
// Sets the type to "Task" as default value.
- result.string(vars.get("$param.Type_param"));
+ result.string($KeywordRegistry.taskType$task());
}
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/conditionProcess.js b/entity/Task_entity/recordcontainers/db/conditionProcess.js
index 1aa0331dada93a3eaae1f0b074c473132e0c7efc..8169552d13ec3c4b1acf8a3c0864e289c1ac6ae5 100644
--- a/entity/Task_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Task_entity/recordcontainers/db/conditionProcess.js
@@ -1,29 +1,39 @@
-import("Employee_lib");
-import("system.vars");
-import("system.db");
-import("system.result");
-import("Sql_lib");
-
-var cond = new SqlCondition();
-var alternativeFallbackCondition = "1 = 1";
-
-if (vars.getString("$param.FilterOnlyOwnTask_param") == "true")
-{
- var ownContactId = EmployeeUtils.getCurrentContactId();
- if (ownContactId)
- cond.andPrepareIfSet("TASK.EDITOR_CONTACT_ID", ownContactId);
- else
- alternativeFallbackCondition = "1 = 2";
-}
-if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
-{
- var activityLinkCond = SqlCondition.begin().andPrepareVars("TASKLINK.OBJECT_ROWID", "$param.RowId_param")
- .andPrepareVars("TASKLINK.OBJECT_TYPE", "$param.ObjectId_param");
-
- // TODO: more performant way than IN. Maybe a join?
- cond.and(db.translateStatement(activityLinkCond.buildSql("TASK.TASKID in (select TASKLINK.TASK_ID from TASKLINK", "1=2", ")")))
-}
-
-//TODO: use a preparedCondition when available #1030812 #1034026
-var resCond = db.translateCondition(cond.build(alternativeFallbackCondition));
-result.string(resCond);
+import("Employee_lib");
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+import("KeywordRegistry_basic");
+
+var cond = new SqlCondition();
+cond.andPrepare("TASK.TYPE", $KeywordRegistry.taskType$task())
+
+var loadNothing = false;
+
+if (vars.getString("$param.FilterOnlyOwnTask_param") == "true")
+{
+ var ownContactId = EmployeeUtils.getCurrentContactId();
+ if (ownContactId)
+ cond.andPrepareIfSet("TASK.EDITOR_CONTACT_ID", ownContactId);
+ else
+ loadNothing = true;
+}
+if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ var activityLinkCond = SqlCondition.begin().andPrepareVars("TASKLINK.OBJECT_ROWID", "$param.RowId_param")
+ .andPrepareVars("TASKLINK.OBJECT_TYPE", "$param.ObjectId_param");
+
+ // TODO: more performant way than IN. Maybe a join?
+ cond.and(db.translateStatement(activityLinkCond.buildSql("TASK.TASKID in (select TASKLINK.TASK_ID from TASKLINK", "1=2", ")")))
+}
+
+if (loadNothing)
+{
+ result.string("1=2");
+}
+else
+{
+ //TODO: use a preparedCondition when available #1030812 #1034026
+ var resCond = db.translateCondition(cond.build("1=1"));
+ result.string(resCond);
+}
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/onDBInsert.js b/entity/Task_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index d1600f76112729020c057ab2a436a59ca5da716e..0000000000000000000000000000000000000000
--- a/entity/Task_entity/recordcontainers/db/onDBInsert.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("ActivityTask_lib")
-
-TaskUtils.setCode(vars.get("$field.TASKID"));
\ No newline at end of file
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index a91b644f56f5d25f79a492577f433e944b249ea5..f4153595caebfd2d8635831eb0dd9fd8f710703b 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,179 +1,179 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Timetracking_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Timetracking</title>
- <recordContainer>db</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>INFO</name>
- <title>Description</title>
- <contentType>LONG_TEXT</contentType>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityField>
- <name>MINUTES</name>
- <title>Time</title>
- <contentType>TEXT</contentType>
- <mandatory v="true" />
- <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess>
- <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
- <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
- </entityField>
- <entityField>
- <name>OBJECT_ID</name>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/object_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>ROW_ID</name>
- <title>Connection</title>
- <linkedContextProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/linkedContextProcess.js</linkedContextProcess>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>CONTACT_ID</name>
- <title>Creator</title>
- <consumer>Employees</consumer>
- <linkedContext>Person</linkedContext>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>TIMETRACKINGID</name>
- </entityField>
- <entityField>
- <name>DATE</name>
- <title>Date</title>
- <contentType>DATE</contentType>
- <resolution>DAY</resolution>
- <outputFormat>dd.MM.yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/date/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ObjectId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>RowId_param</name>
- <expose v="true" />
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>Timetrackings</name>
- <recordContainer>db</recordContainer>
- <dependencies>
- <entityDependency>
- <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>Timetrackings</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>ObjectId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>RowId_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Employees</name>
- <dependency>
- <name>dependency</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Employees</fieldName>
- </dependency>
- </entityConsumer>
- <entityField>
- <name>TOTALTIME</name>
- <title>Total time</title>
- <color>$priority-low-color</color>
- <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>YEAR</name>
- <title>Year</title>
- <contentType>DATE</contentType>
- <outputFormat>yyyy</outputFormat>
- <inputFormat>dd.MM.yyyy</inputFormat>
- <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/displayValueProcess.js</displayValueProcess>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>db</name>
- <alias>Data_alias</alias>
- <fromClauseProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
- <conditionProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>56c74a11-cd33-44e3-9d41-da54d64a997c</name>
- <tableName>TIMETRACKING</tableName>
- <primaryKey>TIMETRACKINGID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- <linkInformation>
- <name>c2ef3832-61c5-4d49-8484-f3188b95e277</name>
- <tableName>PERSON</tableName>
- <primaryKey>PERSONID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="true" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE.value</name>
- <recordfield>TIMETRACKING.DATE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>INFO.value</name>
- <recordfield>TIMETRACKING.INFO</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MINUTES.value</name>
- <recordfield>TIMETRACKING.MINUTES</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>OBJECT_ID.value</name>
- <recordfield>TIMETRACKING.OBJECT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.value</name>
- <recordfield>TIMETRACKING.CONTACT_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ROW_ID.value</name>
- <recordfield>TIMETRACKING.ROW_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TIMETRACKINGID.value</name>
- <recordfield>TIMETRACKING.TIMETRACKINGID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONTACT_ID.displayValue</name>
- <expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Timetracking_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Timetracking</title>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>INFO</name>
+ <title>Description</title>
+ <contentType>LONG_TEXT</contentType>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityField>
+ <name>MINUTES</name>
+ <title>Time</title>
+ <contentType>TEXT</contentType>
+ <mandatory v="true" />
+ <titleProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/titleProcess.js</titleProcess>
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/Timetracking_entity/entityfields/minutes/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>OBJECT_ID</name>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/object_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ROW_ID</name>
+ <title>Connection</title>
+ <linkedContextProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/linkedContextProcess.js</linkedContextProcess>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/row_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <title>Creator</title>
+ <consumer>Employees</consumer>
+ <linkedContext>Person</linkedContext>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TIMETRACKINGID</name>
+ </entityField>
+ <entityField>
+ <name>DATE</name>
+ <title>Date</title>
+ <contentType>DATE</contentType>
+ <resolution>DAY</resolution>
+ <outputFormat>dd.MM.yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/date/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>Timetrackings</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>3636c414-fbc9-4144-a8b1-8e4ca0a146b2</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>Timetrackings</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ObjectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>RowId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Employees</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Employee_entity</entityName>
+ <fieldName>Employees</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityField>
+ <name>TOTALTIME</name>
+ <title>Total time</title>
+ <color>$priority-low-color</color>
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/totaltime/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>YEAR</name>
+ <title>Year</title>
+ <contentType>DATE</contentType>
+ <outputFormat>yyyy</outputFormat>
+ <inputFormat>dd.MM.yyyy</inputFormat>
+ <valueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Timetracking_entity/entityfields/year/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <fromClauseProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
+ <conditionProcess>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>56c74a11-cd33-44e3-9d41-da54d64a997c</name>
+ <tableName>TIMETRACKING</tableName>
+ <primaryKey>TIMETRACKINGID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ <linkInformation>
+ <name>c2ef3832-61c5-4d49-8484-f3188b95e277</name>
+ <tableName>PERSON</tableName>
+ <primaryKey>PERSONID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE.value</name>
+ <recordfield>TIMETRACKING.DATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>INFO.value</name>
+ <recordfield>TIMETRACKING.INFO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MINUTES.value</name>
+ <recordfield>TIMETRACKING.MINUTES</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>OBJECT_ID.value</name>
+ <recordfield>TIMETRACKING.OBJECT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>TIMETRACKING.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ROW_ID.value</name>
+ <recordfield>TIMETRACKING.ROW_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TIMETRACKINGID.value</name>
+ <recordfield>TIMETRACKING.TIMETRACKINGID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Timetracking_entity/recordcontainers/db/recordfieldmappings/contact_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index ec6299b74af9c1fa7d6827dee28c8c2257267273..43fb7d7a47a73e6cef7734f99179a1a163013bfd 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,115 +1,133 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>TurnoverTree_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Tree</title>
- <iconId>NEON:LOGO</iconId>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>CATEGORY</name>
- <groupable v="true" />
- </entityField>
- <entityField>
- <name>TURNOVERPRICE</name>
- <title>Turnover</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- </entityField>
- <entityParameter>
- <name>YearCountToShow_param</name>
- <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="false" />
- <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>MaxYear_param</name>
- <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="false" />
- <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ShowForecast_param</name>
- <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/showforecast_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ShowTurnover_param</name>
- <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/showturnover_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityProvider>
- <name>FilteredTurnovers</name>
- <dependencies>
- <entityDependency>
- <name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
- <entityName>Turnover_entity</entityName>
- <fieldName>Turnover_tree</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>YearCountToShow_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityField>
- <name>PARENT</name>
- </entityField>
- <entityField>
- <name>GROUP</name>
- <title>Product group</title>
- </entityField>
- <entityField>
- <name>FORECASTPRICE</name>
- <title>Forecast</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- </entityField>
- <entityField>
- <name>YEAR</name>
- </entityField>
- <entityField>
- <name>MONTH</name>
- </entityField>
- <entityField>
- <name>LAYER</name>
- </entityField>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT.value</element>
- <element>GROUP.value</element>
- <element>CATEGORY.value</element>
- <element>TURNOVERPRICE.value</element>
- <element>FORECASTPRICE.value</element>
- <element>YEAR.value</element>
- <element>MONTH.value</element>
- <element>LAYER.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>TurnoverTree_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Tree</title>
+ <iconId>NEON:LOGO</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>CATEGORY</name>
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>TURNOVERPRICE</name>
+ <title>Turnover</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ </entityField>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>MaxYear_param</name>
+ <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/TurnoverTree_entity/entityfields/maxyear_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ShowForecast_param</name>
+ <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/showforecast_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ShowTurnover_param</name>
+ <valueProcess>%aditoprj%/entity/TurnoverTree_entity/entityfields/showturnover_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>FilteredTurnovers</name>
+ <dependencies>
+ <entityDependency>
+ <name>0ea4ad47-985b-4a9c-81d8-946be324ae04</name>
+ <entityName>Turnover_entity</entityName>
+ <fieldName>Turnover_tree</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>PARENT</name>
+ </entityField>
+ <entityField>
+ <name>GROUP</name>
+ <title>Product group</title>
+ </entityField>
+ <entityField>
+ <name>FORECASTPRICE</name>
+ <title>Forecast</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ </entityField>
+ <entityField>
+ <name>YEAR</name>
+ </entityField>
+ <entityField>
+ <name>MONTH</name>
+ </entityField>
+ <entityField>
+ <name>LAYER</name>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/TurnoverTree_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>GROUP.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CATEGORY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>TURNOVERPRICE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>FORECASTPRICE.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>YEAR.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>MONTH.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>LAYER.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index e9ea3833653f9fa4e544a3f046452327cdaa49bb..24617feeaf7405503c77e98e2b729300e72b4dfc 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,131 +1,144 @@
-<?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.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.8">
- <name>Turnover_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
- <title>Turnover</title>
- <iconId>VAADIN:CHART</iconId>
- <recordContainer>jdito</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- <recordContainer>jdito</recordContainer>
- </entityProvider>
- <entityField>
- <name>UID</name>
- <title>Year</title>
- </entityField>
- <entityField>
- <name>Y</name>
- <titleProcess>%aditoprj%/entity/Turnover_entity/entityfields/y/titleProcess.js</titleProcess>
- </entityField>
- <entityField>
- <name>PARENT</name>
- <title>Parent</title>
- </entityField>
- <entityField>
- <name>CATEGORY</name>
- <title>Category</title>
- </entityField>
- <entityField>
- <name>X</name>
- <title>Year</title>
- <contentType>TEXT</contentType>
- </entityField>
- <entityParameter>
- <name>YearCountToShow_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="false" />
- <documentation>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityParameter>
- <name>MaxYear_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
- <expose v="true" />
- <mandatory v="false" />
- <documentation>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/documentation.adoc</documentation>
- <description>PARAMETER</description>
- </entityParameter>
- <entityProvider>
- <name>FilteredTurnovers</name>
- <dependencies>
- <entityDependency>
- <name>51106aba-bd82-4ac5-8de6-fc56d53c6117</name>
- <entityName>Salesproject_entity</entityName>
- <fieldName>SalesprojectForecastCharts</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- <children>
- <entityParameter>
- <name>MaxYear_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>YearCountToShow_param</name>
- <expose v="true" />
- </entityParameter>
- </children>
- </entityProvider>
- <entityConsumer>
- <name>Turnover_tree</name>
- <dependency>
- <name>dependency</name>
- <entityName>TurnoverTree_entity</entityName>
- <fieldName>FilteredTurnovers</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>MaxYear_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>YearCountToShow_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ShowForecast_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/showforecast_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ShowTurnover_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/showturnover_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/salesprojectid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>SalesprojectId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ShowForecast_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/showforecast_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>ShowTurnover_param</name>
- <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/showturnover_param/valueProcess.js</valueProcess>
- <expose v="true" />
- </entityParameter>
- </entityFields>
- <recordContainers>
- <jDitoRecordContainer>
- <name>jdito</name>
- <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
- <contentProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
- <recordFields>
- <element>UID.value</element>
- <element>PARENT.value</element>
- <element>CATEGORY.value</element>
- <element>X.value</element>
- <element>Y.value</element>
- </recordFields>
- </jDitoRecordContainer>
- </recordContainers>
-</entity>
+<?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.9" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.9">
+ <name>Turnover_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
+ <title>Turnover</title>
+ <siblings>
+ <element>Forecast_entity</element>
+ </siblings>
+ <iconId>VAADIN:CHART</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ <recordContainer>jdito</recordContainer>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ <title>Year</title>
+ </entityField>
+ <entityField>
+ <name>Y</name>
+ <titleProcess>%aditoprj%/entity/Turnover_entity/entityfields/y/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>PARENT</name>
+ <title>Parent</title>
+ </entityField>
+ <entityField>
+ <name>CATEGORY</name>
+ <title>Category</title>
+ </entityField>
+ <entityField>
+ <name>X</name>
+ <title>Year</title>
+ <contentType>TEXT</contentType>
+ </entityField>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/Turnover_entity/entityfields/yearcounttoshow_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityParameter>
+ <name>MaxYear_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/Turnover_entity/entityfields/maxyear_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>FilteredTurnovers</name>
+ <dependencies>
+ <entityDependency>
+ <name>51106aba-bd82-4ac5-8de6-fc56d53c6117</name>
+ <entityName>Salesproject_entity</entityName>
+ <fieldName>SalesprojectForecastCharts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>MaxYear_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityConsumer>
+ <name>Turnover_tree</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>TurnoverTree_entity</entityName>
+ <fieldName>FilteredTurnovers</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>MaxYear_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/maxyear_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>YearCountToShow_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/yearcounttoshow_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ShowForecast_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/showforecast_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ShowTurnover_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/showturnover_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/turnover_tree/children/salesprojectid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>SalesprojectId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ShowForecast_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/showforecast_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>ShowTurnover_param</name>
+ <valueProcess>%aditoprj%/entity/Turnover_entity/entityfields/showturnover_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/Turnover_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>PARENT.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>CATEGORY.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>X.value</name>
+ </jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>Y.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 680374aa6f279c91f097f9c0fdc2522e0d039eff..df149270d2983fb32f657b58f2e02454d4e8ce12 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4275,6 +4275,225 @@
<entry>
<key>No valid Selection</key>
</entry>
+ <entry>
+ <key>Open admin view</key>
+ </entry>
+ <entry>
+ <key>Sender address</key>
+ </entry>
+ <entry>
+ <key>Send</key>
+ </entry>
+ <entry>
+ <key>Pending</key>
+ </entry>
+ <entry>
+ <key>Failed</key>
+ </entry>
+ <entry>
+ <key>UID</key>
+ </entry>
+ <entry>
+ <key>ticket number</key>
+ </entry>
+ <entry>
+ <key>AB_KEYWORD_ENTRYID (UID)</key>
+ </entry>
+ <entry>
+ <key>DATE_NEW_CONTACT</key>
+ </entry>
+ <entry>
+ <key>Icon</key>
+ </entry>
+ <entry>
+ <key>in progress</key>
+ </entry>
+ <entry>
+ <key>PARENT_CONTEXT</key>
+ </entry>
+ <entry>
+ <key>OFFER_ID</key>
+ </entry>
+ <entry>
+ <key>SMS</key>
+ </entry>
+ <entry>
+ <key>CAMPAIGNID (UID)</key>
+ </entry>
+ <entry>
+ <key>PARENT_ID</key>
+ </entry>
+ <entry>
+ <key>Interfaces</key>
+ </entry>
+ <entry>
+ <key>Feature</key>
+ </entry>
+ <entry>
+ <key>ORGANISATIONID (UID)</key>
+ </entry>
+ <entry>
+ <key>SALESORDER_ID</key>
+ </entry>
+ <entry>
+ <key>Ticket</key>
+ </entry>
+ <entry>
+ <key>Delivery problems</key>
+ </entry>
+ <entry>
+ <key>Tickets</key>
+ </entry>
+ <entry>
+ <key>PERSON_ID</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_REQUESTOR}</key>
+ </entry>
+ <entry>
+ <key>Billable</key>
+ </entry>
+ <entry>
+ <key>TASKID (UID)</key>
+ </entry>
+ <entry>
+ <key>Fax</key>
+ </entry>
+ <entry>
+ <key>DATE_EDIT</key>
+ </entry>
+ <entry>
+ <key>OFFERID (UID)</key>
+ </entry>
+ <entry>
+ <key>Connection Type</key>
+ </entry>
+ <entry>
+ <key>UID (AB_ATTRIBUTEID)</key>
+ </entry>
+ <entry>
+ <key>Phases</key>
+ </entry>
+ <entry>
+ <key>Questions</key>
+ </entry>
+ <entry>
+ <key>User error</key>
+ </entry>
+ <entry>
+ <key>ACTIVITYID (UID)</key>
+ </entry>
+ <entry>
+ <key>Issue</key>
+ </entry>
+ <entry>
+ <key>CONTACTID</key>
+ </entry>
+ <entry>
+ <key>Maintenance</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_STATUS}</key>
+ </entry>
+ <entry>
+ <key>DATE_NEW</key>
+ </entry>
+ <entry>
+ <key>SALESPROJECTID (UID)</key>
+ </entry>
+ <entry>
+ <key>ORGANISATION_ID</key>
+ </entry>
+ <entry>
+ <key>CONTRACTID (UID)</key>
+ </entry>
+ <entry>
+ <key>[%0]it was necessary to create a file from a blob-field but no lob-file-path was specified.</key>
+ </entry>
+ <entry>
+ <key>SqlUtils.getSqlInStatement: if pAsPrepared is true, pPreparedDbType has to be filld with the correct db type</key>
+ </entry>
+ <entry>
+ <key>[%0]it was necessary to create a text-file from a clob-field but no lob-file-path was specified.</key>
+ </entry>
+ <entry>
+ <key>USER_NEW</key>
+ </entry>
+ <entry>
+ <key>USER_EDIT</key>
+ </entry>
+ <entry>
+ <key>CONTACTID (UID)</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_EDITOR}</key>
+ </entry>
+ <entry>
+ <key>Supportticket</key>
+ </entry>
+ <entry>
+ <key>Modul group</key>
+ </entry>
+ <entry>
+ <key>PRODUCTID (UID)</key>
+ </entry>
+ <entry>
+ <key>no keyword attribute \"%0\" found in keyword \"%1\" from container \"%2\"</key>
+ </entry>
+ <entry>
+ <key>Total time</key>
+ </entry>
+ <entry>
+ <key>SALESORDERID (UID)</key>
+ </entry>
+ <entry>
+ <key>Cause</key>
+ </entry>
+ <entry>
+ <key>Assembly</key>
+ </entry>
+ <entry>
+ <key>Dokument template usage</key>
+ </entry>
+ <entry>
+ <key>Open admin info</key>
+ </entry>
+ <entry>
+ <key>USER_NEW_CONTACT</key>
+ </entry>
+ <entry>
+ <key>Linked Appointments</key>
+ </entry>
+ <entry>
+ <key>Location</key>
+ </entry>
+ <entry>
+ <key>Not sent</key>
+ </entry>
+ <entry>
+ <key>Is being sent</key>
+ </entry>
+ <entry>
+ <key>Preview</key>
+ </entry>
+ <entry>
+ <key>Content</key>
+ </entry>
+ <entry>
+ <key>Bulk mail was sent!</key>
+ </entry>
+ <entry>
+ <key>%0 mails sent sucessfully, %1 mails failed</key>
+ </entry>
+ <entry>
+ <key>Bulk mail \"%0\" was sent!</key>
+ </entry>
+ <entry>
+ <key>Descriptions</key>
+ </entry>
+ <entry>
+ <key>User Administration</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index a12b4eb2bbe63d56a0e8ba9c65c9804dde659d54..a754ff6973b76a2064d8c70cebae29d9f622ba2a 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -30,6 +30,14 @@
<key>Maximal</key>
<value></value>
</entry>
+ <entry>
+ <key>Sender address</key>
+ <value>Senderadresse</value>
+ </entry>
+ <entry>
+ <key>Failed</key>
+ <value>Fehlgeschlagen</value>
+ </entry>
<entry>
<key>SalesprojectPhase</key>
<value>Phase</value>
@@ -45,6 +53,14 @@
<key>This contact has no possible link.</key>
<value>Dieser Kontakt hat keine möglichen Verknüpfungen.</value>
</entry>
+ <entry>
+ <key>Is being sent</key>
+ <value>Wird versendet</value>
+ </entry>
+ <entry>
+ <key>User Administration</key>
+ <value>Benutzerverwaltung</value>
+ </entry>
<entry>
<key>Restrictions</key>
<value>Einschränkungen</value>
@@ -69,6 +85,10 @@
<key>Object selection</key>
<value>Objektauswahl</value>
</entry>
+ <entry>
+ <key>Send</key>
+ <value>Senden</value>
+ </entry>
<entry>
<key>CONFIRMED</key>
<value>Gelesen</value>
@@ -85,6 +105,10 @@
<key>Bulk mail</key>
<value>Serienmail</value>
</entry>
+ <entry>
+ <key>Bulk mail \"%0\" was sent!</key>
+ <value>Serienmail \"%0\" wurde versendet!</value>
+ </entry>
<entry>
<key>No fax</key>
<value>Kein Fax</value>
@@ -601,6 +625,10 @@
<key>Confirmed</key>
<value>Bestätigt</value>
</entry>
+ <entry>
+ <key>Descriptions</key>
+ <value>Beschreibungen</value>
+ </entry>
<entry>
<key>Free</key>
<value>Frei</value>
@@ -831,6 +859,10 @@
<key>Advertising material</key>
<value>Werbemittel</value>
</entry>
+ <entry>
+ <key>%0 mails sent sucessfully, %1 mails failed</key>
+ <value>%0 Mails erfolgreich versendet, %1 Mails fehlgeschlagen</value>
+ </entry>
<entry>
<key>Valid from</key>
<value>gültig ab</value>
@@ -993,6 +1025,10 @@
<entry>
<key>0 %</key>
</entry>
+ <entry>
+ <key>Location</key>
+ <value>Ort</value>
+ </entry>
<entry>
<key>75 %</key>
<value></value>
@@ -1213,6 +1249,10 @@
<key>Show all offers</key>
<value>Alle Angebote anzeigen</value>
</entry>
+ <entry>
+ <key>Preview</key>
+ <value>Vorschau</value>
+ </entry>
<entry>
<key>Filetype</key>
<value>Dateityp</value>
@@ -2552,6 +2592,10 @@
<key>Czech Republic</key>
<value>Tschechische Republik</value>
</entry>
+ <entry>
+ <key>Not sent</key>
+ <value>Nicht versendet</value>
+ </entry>
<entry>
<key>Mauritania</key>
<value>Mauretanien</value>
@@ -3629,6 +3673,7 @@
</entry>
<entry>
<key>Support</key>
+ <value>Support</value>
</entry>
<entry>
<key>{$ADDRESS_IDENTIFIER}</key>
@@ -3643,6 +3688,10 @@
<entry>
<key>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </key>
</entry>
+ <entry>
+ <key>Pending</key>
+ <value>Ausstehend</value>
+ </entry>
<entry>
<key>Hierarchy</key>
<value>Hierarchie</value>
@@ -3740,6 +3789,7 @@
</entry>
<entry>
<key>Calendar</key>
+ <value>Kalender</value>
</entry>
<entry>
<key>${SQL_LIB_UNDEFINED_VALUE} field: %0</key>
@@ -3846,6 +3896,10 @@
<key>per</key>
<value>pro</value>
</entry>
+ <entry>
+ <key>Content</key>
+ <value>Inhalt</value>
+ </entry>
<entry>
<key>The max participants count has to be equal or greater than the count of the current participants!</key>
<value>Die maximale Teilnehmerzahl muss gleich oder größer der aktuellen Teilnehmerzahl sein!</value>
@@ -4217,6 +4271,10 @@
<entry>
<key>Parent context</key>
</entry>
+ <entry>
+ <key>Linked Appointments</key>
+ <value>Verknüpfte Termine</value>
+ </entry>
<entry>
<key>Organisation Id</key>
</entry>
@@ -5389,6 +5447,194 @@
<key>Urlaubsprüfung durch</key>
<value>Urlaubsprüfung durch</value>
</entry>
+ <entry>
+ <key>UID</key>
+ </entry>
+ <entry>
+ <key>ticket number</key>
+ </entry>
+ <entry>
+ <key>AB_KEYWORD_ENTRYID (UID)</key>
+ </entry>
+ <entry>
+ <key>DATE_NEW_CONTACT</key>
+ </entry>
+ <entry>
+ <key>Icon</key>
+ </entry>
+ <entry>
+ <key>in progress</key>
+ </entry>
+ <entry>
+ <key>PARENT_CONTEXT</key>
+ </entry>
+ <entry>
+ <key>OFFER_ID</key>
+ </entry>
+ <entry>
+ <key>SMS</key>
+ </entry>
+ <entry>
+ <key>CAMPAIGNID (UID)</key>
+ </entry>
+ <entry>
+ <key>PARENT_ID</key>
+ </entry>
+ <entry>
+ <key>Interfaces</key>
+ <value>Schnittstellen</value>
+ </entry>
+ <entry>
+ <key>Feature</key>
+ <value>Feature</value>
+ </entry>
+ <entry>
+ <key>ORGANISATIONID (UID)</key>
+ </entry>
+ <entry>
+ <key>SALESORDER_ID</key>
+ </entry>
+ <entry>
+ <key>Ticket</key>
+ </entry>
+ <entry>
+ <key>Delivery problems</key>
+ <value>Leferprobleme</value>
+ </entry>
+ <entry>
+ <key>Tickets</key>
+ </entry>
+ <entry>
+ <key>PERSON_ID</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_REQUESTOR}</key>
+ <value>Anforderer</value>
+ </entry>
+ <entry>
+ <key>Billable</key>
+ <value>Verrechenbar</value>
+ </entry>
+ <entry>
+ <key>TASKID (UID)</key>
+ </entry>
+ <entry>
+ <key>Fax</key>
+ </entry>
+ <entry>
+ <key>DATE_EDIT</key>
+ </entry>
+ <entry>
+ <key>OFFERID (UID)</key>
+ </entry>
+ <entry>
+ <key>Connection Type</key>
+ </entry>
+ <entry>
+ <key>UID (AB_ATTRIBUTEID)</key>
+ </entry>
+ <entry>
+ <key>Phases</key>
+ </entry>
+ <entry>
+ <key>Questions</key>
+ <value>Fragen</value>
+ </entry>
+ <entry>
+ <key>User error</key>
+ <value>Anwenderfehler</value>
+ </entry>
+ <entry>
+ <key>ACTIVITYID (UID)</key>
+ </entry>
+ <entry>
+ <key>Issue</key>
+ <value>Fehler</value>
+ </entry>
+ <entry>
+ <key>CONTACTID</key>
+ </entry>
+ <entry>
+ <key>Maintenance</key>
+ <value>Wartung</value>
+ </entry>
+ <entry>
+ <key>{$TICKET_STATUS}</key>
+ <value>Status</value>
+ </entry>
+ <entry>
+ <key>DATE_NEW</key>
+ </entry>
+ <entry>
+ <key>SALESPROJECTID (UID)</key>
+ </entry>
+ <entry>
+ <key>ORGANISATION_ID</key>
+ </entry>
+ <entry>
+ <key>CONTRACTID (UID)</key>
+ </entry>
+ <entry>
+ <key>[%0]it was necessary to create a file from a blob-field but no lob-file-path was specified.</key>
+ </entry>
+ <entry>
+ <key>SqlUtils.getSqlInStatement: if pAsPrepared is true, pPreparedDbType has to be filld with the correct db type</key>
+ </entry>
+ <entry>
+ <key>[%0]it was necessary to create a text-file from a clob-field but no lob-file-path was specified.</key>
+ </entry>
+ <entry>
+ <key>USER_NEW</key>
+ </entry>
+ <entry>
+ <key>USER_EDIT</key>
+ </entry>
+ <entry>
+ <key>CONTACTID (UID)</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_EDITOR}</key>
+ <value>Bearbeiter</value>
+ </entry>
+ <entry>
+ <key>Supportticket</key>
+ </entry>
+ <entry>
+ <key>Modul group</key>
+ <value>Modulgruppe</value>
+ </entry>
+ <entry>
+ <key>PRODUCTID (UID)</key>
+ </entry>
+ <entry>
+ <key>no keyword attribute \"%0\" found in keyword \"%1\" from container \"%2\"</key>
+ </entry>
+ <entry>
+ <key>Total time</key>
+ </entry>
+ <entry>
+ <key>SALESORDERID (UID)</key>
+ </entry>
+ <entry>
+ <key>Cause</key>
+ <value>Ursache</value>
+ </entry>
+ <entry>
+ <key>Assembly</key>
+ <value>Montage</value>
+ </entry>
+ <entry>
+ <key>Dokument template usage</key>
+ </entry>
+ <entry>
+ <key>Open admin info</key>
+ </entry>
+ <entry>
+ <key>USER_NEW_CONTACT</key>
+ </entry>
+ <entry>
+ <key>Bulk mail was sent!</key>
+ </entry>
<entry>
<key>All selected participants already are in the campaign</key>
<value>Alle selektierten Teilnehmer sind bereits in der Kampagne</value>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 672361032b66d26b1b74ac81b818431cc67c13e7..9b801d4a6b05b6bbcf41ff558421ff699f0dfd5b 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4324,6 +4324,225 @@
<entry>
<key>No valid Selection</key>
</entry>
+ <entry>
+ <key>Open admin view</key>
+ </entry>
+ <entry>
+ <key>Sender address</key>
+ </entry>
+ <entry>
+ <key>Send</key>
+ </entry>
+ <entry>
+ <key>Pending</key>
+ </entry>
+ <entry>
+ <key>Failed</key>
+ </entry>
+ <entry>
+ <key>UID</key>
+ </entry>
+ <entry>
+ <key>ticket number</key>
+ </entry>
+ <entry>
+ <key>AB_KEYWORD_ENTRYID (UID)</key>
+ </entry>
+ <entry>
+ <key>DATE_NEW_CONTACT</key>
+ </entry>
+ <entry>
+ <key>Icon</key>
+ </entry>
+ <entry>
+ <key>in progress</key>
+ </entry>
+ <entry>
+ <key>PARENT_CONTEXT</key>
+ </entry>
+ <entry>
+ <key>OFFER_ID</key>
+ </entry>
+ <entry>
+ <key>SMS</key>
+ </entry>
+ <entry>
+ <key>CAMPAIGNID (UID)</key>
+ </entry>
+ <entry>
+ <key>PARENT_ID</key>
+ </entry>
+ <entry>
+ <key>Interfaces</key>
+ </entry>
+ <entry>
+ <key>Feature</key>
+ </entry>
+ <entry>
+ <key>ORGANISATIONID (UID)</key>
+ </entry>
+ <entry>
+ <key>SALESORDER_ID</key>
+ </entry>
+ <entry>
+ <key>Ticket</key>
+ </entry>
+ <entry>
+ <key>Delivery problems</key>
+ </entry>
+ <entry>
+ <key>Tickets</key>
+ </entry>
+ <entry>
+ <key>PERSON_ID</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_REQUESTOR}</key>
+ </entry>
+ <entry>
+ <key>Billable</key>
+ </entry>
+ <entry>
+ <key>TASKID (UID)</key>
+ </entry>
+ <entry>
+ <key>Fax</key>
+ </entry>
+ <entry>
+ <key>DATE_EDIT</key>
+ </entry>
+ <entry>
+ <key>OFFERID (UID)</key>
+ </entry>
+ <entry>
+ <key>Connection Type</key>
+ </entry>
+ <entry>
+ <key>UID (AB_ATTRIBUTEID)</key>
+ </entry>
+ <entry>
+ <key>Phases</key>
+ </entry>
+ <entry>
+ <key>Questions</key>
+ </entry>
+ <entry>
+ <key>User error</key>
+ </entry>
+ <entry>
+ <key>ACTIVITYID (UID)</key>
+ </entry>
+ <entry>
+ <key>Issue</key>
+ </entry>
+ <entry>
+ <key>CONTACTID</key>
+ </entry>
+ <entry>
+ <key>Maintenance</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_STATUS}</key>
+ </entry>
+ <entry>
+ <key>DATE_NEW</key>
+ </entry>
+ <entry>
+ <key>SALESPROJECTID (UID)</key>
+ </entry>
+ <entry>
+ <key>ORGANISATION_ID</key>
+ </entry>
+ <entry>
+ <key>CONTRACTID (UID)</key>
+ </entry>
+ <entry>
+ <key>[%0]it was necessary to create a file from a blob-field but no lob-file-path was specified.</key>
+ </entry>
+ <entry>
+ <key>SqlUtils.getSqlInStatement: if pAsPrepared is true, pPreparedDbType has to be filld with the correct db type</key>
+ </entry>
+ <entry>
+ <key>[%0]it was necessary to create a text-file from a clob-field but no lob-file-path was specified.</key>
+ </entry>
+ <entry>
+ <key>USER_NEW</key>
+ </entry>
+ <entry>
+ <key>USER_EDIT</key>
+ </entry>
+ <entry>
+ <key>CONTACTID (UID)</key>
+ </entry>
+ <entry>
+ <key>{$TICKET_EDITOR}</key>
+ </entry>
+ <entry>
+ <key>Supportticket</key>
+ </entry>
+ <entry>
+ <key>Modul group</key>
+ </entry>
+ <entry>
+ <key>PRODUCTID (UID)</key>
+ </entry>
+ <entry>
+ <key>no keyword attribute \"%0\" found in keyword \"%1\" from container \"%2\"</key>
+ </entry>
+ <entry>
+ <key>Total time</key>
+ </entry>
+ <entry>
+ <key>SALESORDERID (UID)</key>
+ </entry>
+ <entry>
+ <key>Cause</key>
+ </entry>
+ <entry>
+ <key>Assembly</key>
+ </entry>
+ <entry>
+ <key>Dokument template usage</key>
+ </entry>
+ <entry>
+ <key>Open admin info</key>
+ </entry>
+ <entry>
+ <key>USER_NEW_CONTACT</key>
+ </entry>
+ <entry>
+ <key>Linked Appointments</key>
+ </entry>
+ <entry>
+ <key>Location</key>
+ </entry>
+ <entry>
+ <key>Not sent</key>
+ </entry>
+ <entry>
+ <key>Is being sent</key>
+ </entry>
+ <entry>
+ <key>Preview</key>
+ </entry>
+ <entry>
+ <key>Content</key>
+ </entry>
+ <entry>
+ <key>Bulk mail was sent!</key>
+ </entry>
+ <entry>
+ <key>%0 mails sent sucessfully, %1 mails failed</key>
+ </entry>
+ <entry>
+ <key>Bulk mail \"%0\" was sent!</key>
+ </entry>
+ <entry>
+ <key>Descriptions</key>
+ </entry>
+ <entry>
+ <key>User Administration</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Appointment/Appointment.aod b/neonContext/Appointment/Appointment.aod
index ad9c16271253ff3ed8a60c315b72be8991d876a0..67da92ae2faee58f5e7fe5e08c9a7c212f32ca27 100644
--- a/neonContext/Appointment/Appointment.aod
+++ b/neonContext/Appointment/Appointment.aod
@@ -1,23 +1,31 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Appointment</name>
- <title>Termin</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonContext/Appointment/documentation.adoc</documentation>
- <icon>VAADIN:CALENDAR</icon>
- <mainview>AppointmentEdit_view</mainview>
- <filterview>AppointmentPreview_view</filterview>
- <editview>AppointmentEdit_view</editview>
- <preview>AppointmentPreview_view</preview>
- <entity>Appointment_entity</entity>
- <references>
- <neonViewReference>
- <name>90fe74fe-9bc6-4f63-9c06-52e1b0ccfcb3</name>
- <view>AppointmentEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>9cf48e57-ca02-4cee-911c-20b09e36637d</name>
- <view>AppointmentPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Appointment</name>
+ <title>Termin</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonContext/Appointment/documentation.adoc</documentation>
+ <icon>VAADIN:CALENDAR</icon>
+ <mainview>AppointmentEdit_view</mainview>
+ <filterview>AppointmentPreview_view</filterview>
+ <editview>AppointmentEdit_view</editview>
+ <preview>AppointmentPreview_view</preview>
+ <entity>Appointment_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>90fe74fe-9bc6-4f63-9c06-52e1b0ccfcb3</name>
+ <view>AppointmentEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>9cf48e57-ca02-4cee-911c-20b09e36637d</name>
+ <view>AppointmentPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>2a5e05b2-3f12-43b4-a3f4-3c31dbe0dace</name>
+ <view>AppointmentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>de97b676-6504-4edc-96ba-77ff8483a3a0</name>
+ <view>AppointmentFilterDashlet_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/BulkMail/BulkMail.aod b/neonContext/BulkMail/BulkMail.aod
index 5671a98946abec37c4a4fc1c9fa5da370688a107..8001515cc6c87991d8701f4cfe4ffd8168388acb 100644
--- a/neonContext/BulkMail/BulkMail.aod
+++ b/neonContext/BulkMail/BulkMail.aod
@@ -25,5 +25,9 @@
<name>d9462c8d-f0ad-4d9f-9c0c-80bca19cbb7f</name>
<view>BulkMailFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>6b057fb0-94ac-4bca-88b2-c97fdfcf9d6e</name>
+ <view>BulkMailTest_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/BulkMailAddRecipients/BulkMailAddRecipients.aod b/neonContext/BulkMailAddRecipients/BulkMailAddRecipients.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1769aa30496e1a30b4acc2e8b4d05757bc332b9c
--- /dev/null
+++ b/neonContext/BulkMailAddRecipients/BulkMailAddRecipients.aod
@@ -0,0 +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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>BulkMailAddRecipients</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <editview>BulkMailAddRecipientsEdit_view</editview>
+ <entity>BulkMailAddRecipients_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>bab2e1b6-77a8-4830-8f60-cc0d4129f54d</name>
+ <view>BulkMailAddRecipientsEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Campaign/Campaign.aod b/neonContext/Campaign/Campaign.aod
index 8bc2886950c94094e4e8741a0b0e5a0e405b2d52..cb3c4d5cb7ed23622429d5fd68df7feb0f9e7437 100644
--- a/neonContext/Campaign/Campaign.aod
+++ b/neonContext/Campaign/Campaign.aod
@@ -1,47 +1,47 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Campaign</name>
- <title>Campaign</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:GROUP</icon>
- <mainview>CampaignMain_view</mainview>
- <filterview>CampaignFilter_view</filterview>
- <editview>CampaignEdit_view</editview>
- <preview>CampaignPreview_view</preview>
- <lookupview>CampaignFilter_view</lookupview>
- <entity>Campaign_entity</entity>
- <references>
- <neonViewReference>
- <name>7a90a8ed-62e9-47c1-9c8c-2b1019e31da0</name>
- <view>CampaignFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>b4750aec-8ad6-419b-9b44-2848d90b68d0</name>
- <view>CampaignMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>678bda6a-42f2-49c3-8527-5289e70645a2</name>
- <view>CampaignEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>2fffb548-0b4f-4986-9b50-aefa2e00bade</name>
- <view>CampaignPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4a5377cc-af00-49c7-aad2-ac93e2752b3f</name>
- <view>CampaignCost_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>484d39ea-5135-4bb2-a12d-cb7114e2981c</name>
- <view>CampaignCharts_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>11240bc6-700c-443a-bfa3-1190ad58fccd</name>
- <view>CampaignOverview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c32002ad-92ff-408c-a399-2998868f94d0</name>
- <view>CampaignCostFix_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Campaign</name>
+ <title>Campaign</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>NEON:GROUP_APPOINTMENT</icon>
+ <mainview>CampaignMain_view</mainview>
+ <filterview>CampaignFilter_view</filterview>
+ <editview>CampaignEdit_view</editview>
+ <preview>CampaignPreview_view</preview>
+ <lookupview>CampaignFilter_view</lookupview>
+ <entity>Campaign_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>7a90a8ed-62e9-47c1-9c8c-2b1019e31da0</name>
+ <view>CampaignFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b4750aec-8ad6-419b-9b44-2848d90b68d0</name>
+ <view>CampaignMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>678bda6a-42f2-49c3-8527-5289e70645a2</name>
+ <view>CampaignEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>2fffb548-0b4f-4986-9b50-aefa2e00bade</name>
+ <view>CampaignPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4a5377cc-af00-49c7-aad2-ac93e2752b3f</name>
+ <view>CampaignCost_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>484d39ea-5135-4bb2-a12d-cb7114e2981c</name>
+ <view>CampaignCharts_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>11240bc6-700c-443a-bfa3-1190ad58fccd</name>
+ <view>CampaignOverview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c32002ad-92ff-408c-a399-2998868f94d0</name>
+ <view>CampaignCostFix_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod b/neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8943099824a34c54b2d5310cce656814c75ee7c2
--- /dev/null
+++ b/neonContext/ClassificationGroupAnalyses/ClassificationGroupAnalyses.aod
@@ -0,0 +1,12 @@
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>ClassificationGroupAnalyses</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>ClassificationGroupAnalyses_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>7f1a88f1-c5de-4657-aa44-8309a61422be</name>
+ <view>ClassificationGroupAnalysesChart_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Contract/Contract.aod b/neonContext/Contract/Contract.aod
index c4fb8084f5020df81d2e21c079fb259c0901bcf5..edd38006d7ba2a66d500b62f438a818c6f154fe5 100644
--- a/neonContext/Contract/Contract.aod
+++ b/neonContext/Contract/Contract.aod
@@ -1,30 +1,32 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Contract</name>
- <title>Contract</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>ContractMain_view</mainview>
- <filterview>ContractFilter_view</filterview>
- <editview>ContractEdit_view</editview>
- <preview>ContractPreview_view</preview>
- <lookupview>ContractFilter_view</lookupview>
- <entity>Contract_entity</entity>
- <references>
- <neonViewReference>
- <name>b3049f73-3918-407f-905f-61307497a3d8</name>
- <view>ContractFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>dbca973c-b41f-4a85-961c-025ebe073e62</name>
- <view>ContractPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ff6d8aec-1ad3-4cfe-a7a8-3346f4fa8ff0</name>
- <view>ContractMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e096f918-5312-46eb-8289-d9eddbeaa1f6</name>
- <view>ContractEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Contract</name>
+ <title>Contract</title>
+ <comment><null value></comment>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:FILE_TEXT</icon>
+ <mainview>ContractMain_view</mainview>
+ <filterview>ContractFilter_view</filterview>
+ <editview>ContractEdit_view</editview>
+ <preview>ContractPreview_view</preview>
+ <lookupview>ContractFilter_view</lookupview>
+ <entity>Contract_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>b3049f73-3918-407f-905f-61307497a3d8</name>
+ <view>ContractFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dbca973c-b41f-4a85-961c-025ebe073e62</name>
+ <view>ContractPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ff6d8aec-1ad3-4cfe-a7a8-3346f4fa8ff0</name>
+ <view>ContractMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e096f918-5312-46eb-8289-d9eddbeaa1f6</name>
+ <view>ContractEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/DescriptionTranslation/DescriptionTranslation.aod b/neonContext/DescriptionTranslation/DescriptionTranslation.aod
new file mode 100644
index 0000000000000000000000000000000000000000..caef8dbd5c08a7f4b057a7d4db0d0ec048f21d53
--- /dev/null
+++ b/neonContext/DescriptionTranslation/DescriptionTranslation.aod
@@ -0,0 +1,23 @@
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>DescriptionTranslation</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterview>DescriptionTranslationFilter_view</filterview>
+ <editview>DescriptionTranslationEdit_view</editview>
+ <preview>DescriptionTranslationPreview_view</preview>
+ <entity>DescriptionTranslation_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>dd74152c-282f-4cde-9ad8-93a027dbbf56</name>
+ <view>DescriptionTranslationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0d8720bb-5bef-4913-a0ea-d426875d8127</name>
+ <view>DescriptionTranslationEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d0cfda07-eb27-440d-a698-03763ca8d664</name>
+ <view>DescriptionTranslationPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Offer/Offer.aod b/neonContext/Offer/Offer.aod
index 40418dc2dbd8042c2a0b757a6d61a8f401bd5aa9..67ff22e4d1264711c712d89166924e58b9ee74d3 100644
--- a/neonContext/Offer/Offer.aod
+++ b/neonContext/Offer/Offer.aod
@@ -1,38 +1,39 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Offer</name>
- <title>Offer</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>OfferMain_view</mainview>
- <filterview>OfferFilter_view</filterview>
- <editview>OfferEdit_view</editview>
- <preview>OfferPreview_view</preview>
- <lookupview>OfferFilter_view</lookupview>
- <entity>Offer_entity</entity>
- <references>
- <neonViewReference>
- <name>1dd0290d-b820-4a3b-ada7-1850025ca914</name>
- <view>OfferFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>08b180ed-7983-4675-9be4-2b55467c713c</name>
- <view>OfferMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4ed03135-fe7e-4413-8272-c64ad5f3287d</name>
- <view>OfferEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c7f456ce-a141-436b-ad4b-7007a95eae04</name>
- <view>OfferPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name>
- <view>OfferCoverLetter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>d72d1eb1-461c-442c-881d-48fb71b89316</name>
- <view>OfferDrawer_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Offer</name>
+ <title>Offer</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:CART</icon>
+ <mainview>OfferMain_view</mainview>
+ <filterview>OfferFilter_view</filterview>
+ <editview>OfferEdit_view</editview>
+ <preview>OfferPreview_view</preview>
+ <lookupview>OfferFilter_view</lookupview>
+ <entity>Offer_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>1dd0290d-b820-4a3b-ada7-1850025ca914</name>
+ <view>OfferFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>08b180ed-7983-4675-9be4-2b55467c713c</name>
+ <view>OfferMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4ed03135-fe7e-4413-8272-c64ad5f3287d</name>
+ <view>OfferEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c7f456ce-a141-436b-ad4b-7007a95eae04</name>
+ <view>OfferPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a68c9d63-aff4-4e82-af23-72d20c2b6b76</name>
+ <view>OfferCoverLetter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d72d1eb1-461c-442c-881d-48fb71b89316</name>
+ <view>OfferDrawer_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Organisation/Organisation.aod b/neonContext/Organisation/Organisation.aod
index bff0a3fdd3edc1748a7d0e3ec89ca8850766ffc1..4f3f5585095eaa4754949ae9b06f3c4d78f6bbff 100644
--- a/neonContext/Organisation/Organisation.aod
+++ b/neonContext/Organisation/Organisation.aod
@@ -51,5 +51,9 @@
<name>512e3b17-d91d-4ed3-8fc8-f1e2607d3b44</name>
<view>OrganisationAdmin_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>51a18051-fcb8-4d90-9075-802fdce12f9c</name>
+ <view>OrganisationTaskAppointment_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Person/Person.aod b/neonContext/Person/Person.aod
index 620bdba515b1aa22aff4759ef46d99361964d8a1..26861e84934a45fab69fd92f418641445045958e 100644
--- a/neonContext/Person/Person.aod
+++ b/neonContext/Person/Person.aod
@@ -50,5 +50,9 @@
<name>b0105010-457a-4866-a9cd-277d183ea130</name>
<view>PersonAdmin_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>fc7e2546-b42a-48c0-8670-2d4033ad0598</name>
+ <view>PersonTaskAppointment_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/Product/Product.aod b/neonContext/Product/Product.aod
index 64a4cf42e7c55d9be744f9b415413a62aeeaa7b3..a91bfe8529ca21610ebc1edcea60092691199a93 100644
--- a/neonContext/Product/Product.aod
+++ b/neonContext/Product/Product.aod
@@ -1,34 +1,30 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Product</name>
- <title>Product</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mainview>ProductMain_view</mainview>
- <filterview>ProductFilter_view</filterview>
- <editview>ProductEdit_view</editview>
- <preview>ProductPreview_view</preview>
- <lookupview>ProductFilter_view</lookupview>
- <entity>Product_entity</entity>
- <references>
- <neonViewReference>
- <name>8a0bd726-b3f6-4c5a-bd2a-251285b9ad90</name>
- <view>ProductMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ecb98950-5460-44ab-8da8-757bd143c03e</name>
- <view>ProductEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>cc985c0d-755f-46bd-89a2-71c5c6227198</name>
- <view>ProductFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
- <view>ProductPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>f5f7c429-56ca-421e-8e43-e8da14ca88a0</name>
- <view>ProductDescription_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Product</name>
+ <title>Product</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mainview>ProductMain_view</mainview>
+ <filterview>ProductFilter_view</filterview>
+ <editview>ProductEdit_view</editview>
+ <preview>ProductPreview_view</preview>
+ <lookupview>ProductFilter_view</lookupview>
+ <entity>Product_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>8a0bd726-b3f6-4c5a-bd2a-251285b9ad90</name>
+ <view>ProductMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ecb98950-5460-44ab-8da8-757bd143c03e</name>
+ <view>ProductEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>cc985c0d-755f-46bd-89a2-71c5c6227198</name>
+ <view>ProductFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5580ead4-2257-4cdb-a3ac-5e7067c4c1ab</name>
+ <view>ProductPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index c76aeadba0da1a4bda02b9c2851f45045cdb9b3f..9b104d93a7002621e32a85a3a1c148e5588f17a8 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -3,6 +3,7 @@
<name>Salesproject</name>
<title>Salesproject</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:BOOK_DOLLAR</icon>
<mainview>SalesprojectMain_view</mainview>
<filterview>SalesprojectFilter_view</filterview>
<editview>SalesprojectEdit_view</editview>
@@ -70,5 +71,13 @@
<name>589b0f12-a4d9-4108-9da1-4ddb418c3991</name>
<view>SalesprojectOverview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>1c957028-bf6b-4b9c-9b46-60f8b53f9edd</name>
+ <view>SaleprojectOverviewCharts_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>fb935080-9328-48ad-a5ce-9ec966fb526a</name>
+ <view>SalesprojectMilestoneInfo_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/SupportTicket/SupportTicket.aod b/neonContext/SupportTicket/SupportTicket.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fb9473deb5c21fd15bffcc129018e86d46867cdf
--- /dev/null
+++ b/neonContext/SupportTicket/SupportTicket.aod
@@ -0,0 +1,30 @@
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>SupportTicket</name>
+ <title>Support Ticket</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:QUESTION</icon>
+ <mainview>SupportTicketMain_view</mainview>
+ <filterview>SupportTicketFilter_view</filterview>
+ <editview>SupportTicketEdit_view</editview>
+ <preview>SupportTicketPreview_view</preview>
+ <entity>SupportTicket_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3191f35b-3dde-4912-b728-130fa1fc1b7e</name>
+ <view>SupportTicketFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f5c0ef30-deea-4a8b-a177-2f2052621ca3</name>
+ <view>SupportTicketEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a1830cdc-a1a1-4110-b666-7a74157f78fc</name>
+ <view>SupportTicketMain_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c290c5f1-53d3-4634-bf42-0de2ee89974c</name>
+ <view>SupportTicketPreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/Task/Task.aod b/neonContext/Task/Task.aod
index 73a85997d1948f608eec8fa6ca79a68729c4efce..34cc2cb4de6771d99d1c7582943f42fb0e113e40 100644
--- a/neonContext/Task/Task.aod
+++ b/neonContext/Task/Task.aod
@@ -1,34 +1,30 @@
-<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>Task</name>
- <title>Task</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <documentation>%aditoprj%/neonContext/Task/documentation.adoc</documentation>
- <mainview>TaskMain_view</mainview>
- <filterview>TaskFilter_view</filterview>
- <editview>TaskEdit_view</editview>
- <preview>TaskPreview_view</preview>
- <entity>Task_entity</entity>
- <references>
- <neonViewReference>
- <name>5e6fdab4-8781-4e2d-af7a-755d834b631d</name>
- <view>TaskFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>7a4bcf0f-2861-4400-8fab-152c6a9ecb9b</name>
- <view>TaskPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>b9bd19b5-2a67-47a4-83cd-41ba30e81888</name>
- <view>TaskEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>83309ef0-d1c0-4f74-bb44-41fd8e054b4b</name>
- <view>TaskMain_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>b2d84509-c72b-497e-9422-e4efae2e6b68</name>
- <view>TaskMainPreview_view</view>
- </neonViewReference>
- </references>
-</neonContext>
+<?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.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>Task</name>
+ <title>Task</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/neonContext/Task/documentation.adoc</documentation>
+ <mainview>TaskMain_view</mainview>
+ <filterview>TaskFilter_view</filterview>
+ <editview>TaskEdit_view</editview>
+ <preview>TaskPreview_view</preview>
+ <entity>Task_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>5e6fdab4-8781-4e2d-af7a-755d834b631d</name>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7a4bcf0f-2861-4400-8fab-152c6a9ecb9b</name>
+ <view>TaskPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b9bd19b5-2a67-47a4-83cd-41ba30e81888</name>
+ <view>TaskEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>83309ef0-d1c0-4f74-bb44-41fd8e054b4b</name>
+ <view>TaskMain_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
index f6813451bfa56d60bcbddaed22287a8268901cb9..fdb73689f7125bba3697070f7d8e1876cc43e65b 100644
--- a/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
+++ b/neonDashboard/Vertriebsdashboard/Vertriebsdashboard.aod
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.1.0">
- <name>Vertriebsdashboard</name>
- <title>Salesdashboard</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:CHART_GRID</icon>
- <dashboardType>PUBLIC</dashboardType>
- <editRoles>
- <element>INTERNAL_ADMINISTRATOR</element>
- <element>INTERNAL_DASHBOARDSTOREADMIN</element>
- </editRoles>
- <defaultDashlets>
- <neonDashlet>
- <name>Dashlet</name>
- <viewName>SalesprojectScoreCard_view</viewName>
- <configName>KeyFigures</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="1" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet4</name>
- <viewName>OrganisationFilter_view</viewName>
- <configName>AllOrgsDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="2" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet5</name>
- <viewName>TurnoverChart_view</viewName>
- <configName>TurnoverDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="0" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet2</name>
- <viewName>SalesprojectFilter_view</viewName>
- <configName>OpenSalesprojectsDashlet</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="1" />
- <yPos v="5" />
- <colspan v="2" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>Dashlet3</name>
- <viewName>SalesprojectPhases_view</viewName>
- <configName>Salesproject phases</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="0" />
- <yPos v="5" />
- <colspan v="1" />
- <rowspan v="5" />
- </uiConfiguration>
- </neonDashlet>
- </defaultDashlets>
-</neonDashboard>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.1.0">
+ <name>Vertriebsdashboard</name>
+ <title>Salesdashboard</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:CHART_GRID</icon>
+ <dashboardType>PUBLIC</dashboardType>
+ <editRoles>
+ <element>INTERNAL_ADMINISTRATOR</element>
+ <element>INTERNAL_DASHBOARDSTOREADMIN</element>
+ </editRoles>
+ <defaultDashlets>
+ <neonDashlet>
+ <name>Dashlet</name>
+ <viewName>SalesprojectScoreCard_view</viewName>
+ <configName>KeyFigures</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="1" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet4</name>
+ <viewName>OrganisationFilter_view</viewName>
+ <configName>AllOrgsDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="2" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet5</name>
+ <viewName>TurnoverChart_view</viewName>
+ <configName>TurnoverDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="0" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet2</name>
+ <viewName>SalesprojectFilter_view</viewName>
+ <configName>OpenSalesprojectsDashlet</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="1" />
+ <yPos v="5" />
+ <colspan v="2" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ <neonDashlet>
+ <name>Dashlet3</name>
+ <viewName>SalesprojectPhases_view</viewName>
+ <configName>SalesprojectPhases</configName>
+ <uiConfiguration>
+ <name>uiConfiguration</name>
+ <xPos v="0" />
+ <yPos v="5" />
+ <colspan v="1" />
+ <rowspan v="5" />
+ </uiConfiguration>
+ </neonDashlet>
+ </defaultDashlets>
+</neonDashboard>
diff --git a/neonNotificationType/BulkMailSent/BulkMailSent.aod b/neonNotificationType/BulkMailSent/BulkMailSent.aod
new file mode 100644
index 0000000000000000000000000000000000000000..63b6ad9c3e2da370cdd6b33a807b1852aece2ed8
--- /dev/null
+++ b/neonNotificationType/BulkMailSent/BulkMailSent.aod
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonNotificationType xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonNotificationType/1.1.0">
+ <name>BulkMailSent</name>
+ <title>Bulk mail sent</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:ENVELOPES</icon>
+</neonNotificationType>
diff --git a/neonView/ActivityDrawer_view/ActivityDrawer_view.aod b/neonView/ActivityDrawer_view/ActivityDrawer_view.aod
index 83b47cbe383508807a6e8647d92349cf077e3e30..44276ba9e4f49343cafff1696383af3c54dba842 100644
--- a/neonView/ActivityDrawer_view/ActivityDrawer_view.aod
+++ b/neonView/ActivityDrawer_view/ActivityDrawer_view.aod
@@ -6,6 +6,7 @@
<drawerLayout>
<name>layout</name>
<layoutCaption>Activities</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
diff --git a/neonView/ActivityMain_view/ActivityMain_view.aod b/neonView/ActivityMain_view/ActivityMain_view.aod
index 7ea15fc932a522b5ea0c67203c8607be8c1d2ae1..1a20ee03e1f7405af7273a7241241c855847487a 100644
--- a/neonView/ActivityMain_view/ActivityMain_view.aod
+++ b/neonView/ActivityMain_view/ActivityMain_view.aod
@@ -24,15 +24,15 @@
<entityField>ModuleTrees</entityField>
<view>ModuleTree_view</view>
</neonViewReference>
- <neonViewReference>
- <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>f57fb116-d356-47c7-8da6-ee64b4a01b46</name>
<entityField>AttributeTree</entityField>
<view>AttributeRelationTree_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>7bab8dbf-b69e-412d-a604-3a6999658e10</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod b/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6ce3ce63a5671607245180c40b9e70a45093daf2
--- /dev/null
+++ b/neonView/AppointmentFilterDashlet_view/AppointmentFilterDashlet_view.aod
@@ -0,0 +1,59 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>AppointmentFilterDashlet_view</name>
+ <title>Linked Appointments</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="false" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>appointmentFilterConfig</name>
+ <title>Linked Appointments</title>
+ <fragment>Appointment/full</fragment>
+ <icon>VAADIN:CALENDAR</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>Calendar</name>
+ <title>Calendar</title>
+ </neonDashletCategory>
+ </categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>LinkedAppointmentsFromDashlet_param</name>
+ <value>true</value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <autoNewRow v="false" />
+ <entityField>#ENTITY</entityField>
+ <isEditable v="false" />
+ <isDeletable v="false" />
+ <columns>
+ <neonTableColumn>
+ <name>0aa3d147-674f-4765-826e-f97a4b48dc8a</name>
+ <entityField>SUMMARY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>87170445-d63e-449b-9568-a055d5ed8afd</name>
+ <entityField>BEGIN</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2284bbe2-dab7-45ce-9ced-8227802c3e92</name>
+ <entityField>END</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>43f7ef8a-19da-4ed6-afd3-2cfb825ab5b8</name>
+ <entityField>LOCATION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentFilter_view/AppointmentFilter_view.aod b/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..73c8f584ab446287564d4b75ad3d214cc15dc288
--- /dev/null
+++ b/neonView/AppointmentFilter_view/AppointmentFilter_view.aod
@@ -0,0 +1,38 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>AppointmentFilter_view</name>
+ <title>Linked Appointments</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="false" />
+ <layout>
+ <drawerLayout>
+ <name>layout</name>
+ <layoutCaption>Linked Appointments</layoutCaption>
+ </drawerLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <hideActions v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>dfc5cdb0-6ff6-4089-b0e7-6ebcab5061e6</name>
+ <entityField>SUMMARY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>65d462d0-e685-4493-bb73-c32c7ffe393b</name>
+ <entityField>BEGIN</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ba6f5f7a-7ae4-41cb-940b-c115561c0a71</name>
+ <entityField>END</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0a591a05-1efe-4e33-9a59-363a5e423802</name>
+ <entityField>LOCATION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
index edbc10931d281e5a31d0294027724cefaf0c0269..1012aedd4033e37ea4389299e952c6d0236f9cfd 100644
--- a/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
+++ b/neonView/AppointmentLinkFilter_view/AppointmentLinkFilter_view.aod
@@ -4,9 +4,10 @@
<title>relations</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <drawerLayout>
<name>layout</name>
- </noneLayout>
+ <layoutCaption>Connections</layoutCaption>
+ </drawerLayout>
</layout>
<children>
<tableViewTemplate>
diff --git a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
index 3e0e2f3ac8a1d6f00d4fa0b1ad857e512924aa6e..c915ea5d418345f306f291d7386c1df1a70947eb 100644
--- a/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
+++ b/neonView/AppointmentPreview_view/AppointmentPreview_view.aod
@@ -4,9 +4,9 @@
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/neonView/AppointmentPreview_view/documentation.adoc</documentation>
<layout>
- <boxLayout>
+ <headerFooterLayout>
<name>layout</name>
- </boxLayout>
+ </headerFooterLayout>
</layout>
<children>
<appointmentPreviewViewTemplate>
diff --git a/neonView/AttributeFilter_view/AttributeFilter_view.aod b/neonView/AttributeFilter_view/AttributeFilter_view.aod
index 469cabe73efa8e3461c454e643c70590f8f6c420..efc402138881c343508a0f1b84590058a633a40c 100644
--- a/neonView/AttributeFilter_view/AttributeFilter_view.aod
+++ b/neonView/AttributeFilter_view/AttributeFilter_view.aod
@@ -1,62 +1,63 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AttributeFilter_view</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <groupLayout>
- <name>layout</name>
- </groupLayout>
- </layout>
- <children>
- <treeTableViewTemplate>
- <name>AttributeTreeTable</name>
- <parentField>ATTRIBUTE_PARENT_ID</parentField>
- <favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
- <showChildrenCount v="false" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>169aceb2-2ff8-42de-ab89-4d3cc15d5747</name>
- <entityField>ICON</entityField>
- <width v="75" />
- </neonTableColumn>
- <neonTableColumn>
- <name>a776a053-6712-44f9-943f-da26d1ce11ee</name>
- <entityField>ATTRIBUTE_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>b975154d-8bac-4182-9030-e3b3d744c642</name>
- <entityField>ATTRIBUTE_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ad92d325-6cdb-4fa0-a99b-27c937c89936</name>
- <entityField>USAGELIST</entityField>
- </neonTableColumn>
- </columns>
- </treeTableViewTemplate>
- <tableViewTemplate>
- <name>AttributesTable</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>c1ee431e-e4d2-4744-ad8c-2bf2c2eed8d6</name>
- <entityField>ICON</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4dae1a23-8798-42ff-998c-7f5fedc7dcc5</name>
- <entityField>FULL_ATTRIBUTE_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ed7598ea-c29c-4d04-9b28-27ee3b28a5b1</name>
- <entityField>ATTRIBUTE_TYPE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>cc88ea53-2673-4c6e-ac2e-6766d2698453</name>
- <entityField>USAGELIST</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>AttributeFilter_view</name>
+ <title>Attributes</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>AttributeTreeTable</name>
+ <parentField>ATTRIBUTE_PARENT_ID</parentField>
+ <favoriteActionGroup1>AttributeActions</favoriteActionGroup1>
+ <nodeExpandedField>expanded</nodeExpandedField>
+ <showChildrenCount v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>169aceb2-2ff8-42de-ab89-4d3cc15d5747</name>
+ <entityField>ICON</entityField>
+ <width v="75" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a776a053-6712-44f9-943f-da26d1ce11ee</name>
+ <entityField>ATTRIBUTE_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b975154d-8bac-4182-9030-e3b3d744c642</name>
+ <entityField>ATTRIBUTE_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ad92d325-6cdb-4fa0-a99b-27c937c89936</name>
+ <entityField>USAGELIST</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ <tableViewTemplate>
+ <name>AttributesTable</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>c1ee431e-e4d2-4744-ad8c-2bf2c2eed8d6</name>
+ <entityField>ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4dae1a23-8798-42ff-998c-7f5fedc7dcc5</name>
+ <entityField>FULL_ATTRIBUTE_NAME</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ed7598ea-c29c-4d04-9b28-27ee3b28a5b1</name>
+ <entityField>ATTRIBUTE_TYPE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>cc88ea53-2673-4c6e-ac2e-6766d2698453</name>
+ <entityField>USAGELIST</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/AttributePreview_view/AttributePreview_view.aod b/neonView/AttributePreview_view/AttributePreview_view.aod
index 17503eac3db6f7b892a08e923a7b91225fcef5de..76f724ec39fb88651834497bf554e5a77663b2fd 100644
--- a/neonView/AttributePreview_view/AttributePreview_view.aod
+++ b/neonView/AttributePreview_view/AttributePreview_view.aod
@@ -12,7 +12,7 @@
<cardViewTemplate>
<name>Head</name>
<iconField>ICON</iconField>
- <titleField>FULL_ATTRIBUTE_NAME</titleField>
+ <titleField>attributeName</titleField>
<subtitleField>ATTRIBUTE_TYPE</subtitleField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
diff --git a/neonView/AttributeRelationTreeDrawer_view/AttributeRelationTreeDrawer_view.aod b/neonView/AttributeRelationTreeDrawer_view/AttributeRelationTreeDrawer_view.aod
index 9e8cd7121ad9a573c978a700dca784fa9c56f7ff..3d621165775566e0c6861d2b6429dbabd47c20b5 100644
--- a/neonView/AttributeRelationTreeDrawer_view/AttributeRelationTreeDrawer_view.aod
+++ b/neonView/AttributeRelationTreeDrawer_view/AttributeRelationTreeDrawer_view.aod
@@ -6,6 +6,7 @@
<drawerLayout>
<name>layout</name>
<layoutCaption>Attributes</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index 5ce8d663976d2bd5689c8336962d2c65947fe4c1..1eee2f28de6b9b5b3cc9b459b211176b261aa5ef 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -1,29 +1,28 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>AttributeRelationTree_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <treeTableViewTemplate>
- <name>TreeTable</name>
- <parentField>PARENT_ID</parentField>
- <favoriteActionGroup1>alter</favoriteActionGroup1>
- <showChildrenCount v="false" />
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>840551af-5a99-4965-a96a-ed134efb28a9</name>
- <entityField>AB_ATTRIBUTE_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>7844082c-fd31-4878-9e57-024cb2b2b627</name>
- <entityField>VALUE</entityField>
- </neonTableColumn>
- </columns>
- </treeTableViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>AttributeRelationTree_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <treeTableViewTemplate>
+ <name>TreeTable</name>
+ <parentField>PARENT_ID</parentField>
+ <showChildrenCount v="false" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>840551af-5a99-4965-a96a-ed134efb28a9</name>
+ <entityField>AB_ATTRIBUTE_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7844082c-fd31-4878-9e57-024cb2b2b627</name>
+ <entityField>VALUE</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..cb799d087782807ae075e4b5cec63c5f025e7175
--- /dev/null
+++ b/neonView/BulkMailAddRecipientsEdit_view/BulkMailAddRecipientsEdit_view.aod
@@ -0,0 +1,24 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>BulkMailAddRecipientsEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>96932894-43f2-471f-b511-3b38bd5f93cb</name>
+ <entityField>BULKMAIL_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/BulkMailEdit_view/BulkMailEdit_view.aod b/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
index 31576a804c694002745b9516b683025ade29786e..fa4ece93b65ff37c3fb38c7105bbe9d5db336d36 100644
--- a/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
+++ b/neonView/BulkMailEdit_view/BulkMailEdit_view.aod
@@ -13,6 +13,14 @@
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>b68c65de-4ecd-4a23-9242-f85e7b708b1e</name>
+ <entityField>DOCUMENTTEMPLATE_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f040d032-823c-4199-8314-01d784fdc167</name>
+ <entityField>BINDATA</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>e363bda2-d8bf-456e-bcae-d1870408022a</name>
<entityField>NAME</entityField>
@@ -25,10 +33,6 @@
<name>c73d0fb7-b740-48ac-8f3e-fd4199f169da</name>
<entityField>SUBJECT</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>b68c65de-4ecd-4a23-9242-f85e7b708b1e</name>
- <entityField>DOCUMENTTEMPLATE_ID</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>e4ec09c2-3815-4a3b-bce8-c12d5b919b04</name>
<entityField>SENDER</entityField>
diff --git a/neonView/BulkMailFilter_view/BulkMailFilter_view.aod b/neonView/BulkMailFilter_view/BulkMailFilter_view.aod
index a9691dae520b369f613e1e946922dff754cfb7d4..1f07968102c5c5cf47c41b4224fe72ad74885c81 100644
--- a/neonView/BulkMailFilter_view/BulkMailFilter_view.aod
+++ b/neonView/BulkMailFilter_view/BulkMailFilter_view.aod
@@ -2,6 +2,7 @@
<neonView 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/neonView/1.1.1">
<name>BulkMailFilter_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
<layout>
<boxLayout>
<name>layout</name>
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index b13921e7858eb60a0b3df9c0ae8eeb3b247df45c..d95de24eecea5c322aae2a0490112c1c92f3590c 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -19,5 +19,10 @@
<entityField>Recipients</entityField>
<view>BulkMailRecipientFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>3222ace8-c6d6-4dab-ada1-1f50b983e7e7</name>
+ <entityField>#ENTITY</entityField>
+ <view>BulkMailTest_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
index 3dccf5d10875567a517e5500e08c211e382bc85a..d04a9df95690a3a24933127b028b23fdc96bcbe4 100644
--- a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
+++ b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
@@ -13,22 +13,34 @@
<name>Card</name>
<iconField>ICON</iconField>
<titleField>NAME</titleField>
- <subtitleField>STATUS</subtitleField>
- <descriptionField>SUBJECT</descriptionField>
+ <descriptionField>STATUS</descriptionField>
<entityField>#ENTITY</entityField>
</cardViewTemplate>
<genericViewTemplate>
<name>Generic</name>
+ <showDrawer v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>edbeea4d-019f-4661-b0d7-c07468e747cc</name>
- <entityField>DOCUMENTTEMPLATE_ID</entityField>
+ <name>524c32f8-99d8-453d-afe5-b72a322a4555</name>
+ <entityField>SUBJECT</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9ef1ecd4-063a-4c18-9def-d395f59a64dc</name>
<entityField>SENDER</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>28c1e091-0fea-4324-8fb8-1893388354b7</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>edbeea4d-019f-4661-b0d7-c07468e747cc</name>
+ <entityField>DOCUMENTTEMPLATE_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>8bb72d39-3348-4bd6-b57d-f7f5ae573e73</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/BulkMailRecipientFilter_view/BulkMailRecipientFilter_view.aod b/neonView/BulkMailRecipientFilter_view/BulkMailRecipientFilter_view.aod
index fd50cbf50aa7e0ec334d09cbf4fe5fa69d573017..bf66785ec9cb07dfacd6dc07fc9d4e24ccb36d41 100644
--- a/neonView/BulkMailRecipientFilter_view/BulkMailRecipientFilter_view.aod
+++ b/neonView/BulkMailRecipientFilter_view/BulkMailRecipientFilter_view.aod
@@ -28,6 +28,10 @@
<name>f311e8da-4139-48bd-a792-6df572dce7ad</name>
<entityField>STATUS</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>ef020654-6f4e-4ef8-9597-10062fc3f5bd</name>
+ <entityField>SENTDATE</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/BulkMailTest_view/BulkMailTest_view.aod b/neonView/BulkMailTest_view/BulkMailTest_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c6442e56b066bfb47f58b9154ef3e9fa9d2a2fcb
--- /dev/null
+++ b/neonView/BulkMailTest_view/BulkMailTest_view.aod
@@ -0,0 +1,41 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>BulkMailTest_view</name>
+ <title>Preview</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Subject</name>
+ <showDrawer v="true" />
+ <drawerCaption>Subject</drawerCaption>
+ <fixedDrawer v="true" />
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d85c2b49-3a32-4261-95aa-6e13d9debe46</name>
+ <entityField>subjectPreview</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Body</name>
+ <showDrawer v="true" />
+ <drawerCaption>Content</drawerCaption>
+ <fixedDrawer v="true" />
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>13d21d66-6f52-4535-9cb9-3b26db11dfbf</name>
+ <entityField>preview</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod b/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4f26cdda56cf4c521841a413e1275ad54fe74a1e
--- /dev/null
+++ b/neonView/ClassificationGroupAnalysesChart_view/ClassificationGroupAnalysesChart_view.aod
@@ -0,0 +1,20 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ClassificationGroupAnalysesChart_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <singleDataChartViewTemplate>
+ <name>Groups</name>
+ <chartTitle></chartTitle>
+ <chartType>PIE</chartType>
+ <xAxis>GROUP</xAxis>
+ <yAxis>SCORE</yAxis>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod b/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
index c4e1ca3f84f61ae10f92174176bfe28c5405c99b..25d1fed0d9ade297137b539faca321823955b3c1 100644
--- a/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
+++ b/neonView/CompetitionDrawer_view/CompetitionDrawer_view.aod
@@ -6,6 +6,7 @@
<drawerLayout>
<name>layout</name>
<layoutCaption>Competitors</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
diff --git a/neonView/ContractEdit_view/ContractEdit_view.aod b/neonView/ContractEdit_view/ContractEdit_view.aod
index f7cfb473bae2ddda0e2929c3f2de10c18973c417..305051621158363a459290695f4bccb398ec38e1 100644
--- a/neonView/ContractEdit_view/ContractEdit_view.aod
+++ b/neonView/ContractEdit_view/ContractEdit_view.aod
@@ -1,60 +1,60 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ContractEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>5f2ef7a7-d7b5-49a8-86f3-3644036232fb</name>
- <entityField>CONTRACTCODE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3177f8e9-24e9-441f-8c19-b004935a86a9</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ac160ded-1a06-4664-b8bd-333e01468f61</name>
- <entityField>CONTRACTTYPE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f741bfda-5434-42ab-a5e9-ea1f7e4aaf79</name>
- <entityField>CONTRACTSTATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b4a51794-f04c-4cc5-b0bd-ff89d8f5ada9</name>
- <entityField>CONTRACTSTART</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2fb49607-d34c-4a19-8c4e-2ec3db395fa9</name>
- <entityField>CONTRACTEND</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>02d4e542-f7ed-4900-82b3-b096958e1473</name>
- <entityField>PAYMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e66d7b82-5b48-46f3-b780-06a5f107faca</name>
- <entityField>CONTRACTDUE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4390abcd-d47e-40b2-85a9-655d39b17e82</name>
- <entityField>REMARK</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>49eafd04-4d72-4a11-8818-97407e0fe154</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ContractEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>5f2ef7a7-d7b5-49a8-86f3-3644036232fb</name>
+ <entityField>CONTRACTCODE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3177f8e9-24e9-441f-8c19-b004935a86a9</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ac160ded-1a06-4664-b8bd-333e01468f61</name>
+ <entityField>CONTRACTTYPE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f741bfda-5434-42ab-a5e9-ea1f7e4aaf79</name>
+ <entityField>CONTRACTSTATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b4a51794-f04c-4cc5-b0bd-ff89d8f5ada9</name>
+ <entityField>CONTRACTSTART</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2fb49607-d34c-4a19-8c4e-2ec3db395fa9</name>
+ <entityField>CONTRACTEND</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>02d4e542-f7ed-4900-82b3-b096958e1473</name>
+ <entityField>PAYMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e66d7b82-5b48-46f3-b780-06a5f107faca</name>
+ <entityField>CONTRACTDUE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4390abcd-d47e-40b2-85a9-655d39b17e82</name>
+ <entityField>REMARK</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>49eafd04-4d72-4a11-8818-97407e0fe154</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ContractPreview_view/ContractPreview_view.aod b/neonView/ContractPreview_view/ContractPreview_view.aod
index 1381f3f41059df31d3b47b318dbb8c5250c85abb..a286355326691c6a522cb28046eafed94fb0e90b 100644
--- a/neonView/ContractPreview_view/ContractPreview_view.aod
+++ b/neonView/ContractPreview_view/ContractPreview_view.aod
@@ -1,66 +1,67 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ContractPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
- <descriptionField>CONTACT_ID</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>b0ced77c-bd97-4318-8c0b-ad028111f039</name>
- <entityField>CONTRACTSTATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9101eee8-57b1-4bcf-a271-2501b7a3b842</name>
- <entityField>CONTRACTSTART</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9cc46e86-0f4b-406a-a702-77e840fc3988</name>
- <entityField>CONTRACTEND</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>aa310f7a-d66b-4128-8af0-3619099605ce</name>
- <entityField>PAYMENT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>6529a64b-4249-434a-8692-45daad5264e3</name>
- <entityField>CONTRACTDUE</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Further informations</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>546ff394-e0bd-4dce-82a4-8341bcd92243</name>
- <entityField>REMARK</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>90de7332-5d4c-4d72-a93a-1bd2c06d12a4</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ContractPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>IMAGE</iconField>
+ <titleField>CONTRACTCODE_DISPLAY_fieldGroup</titleField>
+ <descriptionField>CONTACT_ID</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>b0ced77c-bd97-4318-8c0b-ad028111f039</name>
+ <entityField>CONTRACTSTATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9101eee8-57b1-4bcf-a271-2501b7a3b842</name>
+ <entityField>CONTRACTSTART</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9cc46e86-0f4b-406a-a702-77e840fc3988</name>
+ <entityField>CONTRACTEND</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>aa310f7a-d66b-4128-8af0-3619099605ce</name>
+ <entityField>PAYMENT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6529a64b-4249-434a-8692-45daad5264e3</name>
+ <entityField>CONTRACTDUE</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>546ff394-e0bd-4dce-82a4-8341bcd92243</name>
+ <entityField>REMARK</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>90de7332-5d4c-4d72-a93a-1bd2c06d12a4</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ProductDescription_view/ProductDescription_view.aod b/neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod
similarity index 54%
rename from neonView/ProductDescription_view/ProductDescription_view.aod
rename to neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod
index b5f0f9e807ae07a33d7f8f3eca82c6a53086666b..44fba1be91feaba1ce899969b851edad69e5ed85 100644
--- a/neonView/ProductDescription_view/ProductDescription_view.aod
+++ b/neonView/DescriptionTranslationEdit_view/DescriptionTranslationEdit_view.aod
@@ -1,29 +1,38 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ProductDescription_view</name>
- <title>Description</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Description</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f0743860-a2f8-4c9c-998f-200ad1e67bb2</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cd7cd596-0f25-4067-9aac-5ee188a3af64</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DescriptionTranslationEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <autoHeight v="true" />
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>translationData</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9f8ad216-e4da-4973-bf3f-1d24dca765f3</name>
+ <entityField>LANG</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Description</name>
+ <editMode v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>aacd9212-d267-4ff2-ac4c-b0362bd9b09c</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DescriptionTranslationFilter_view/DescriptionTranslationFilter_view.aod b/neonView/DescriptionTranslationFilter_view/DescriptionTranslationFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..043efc0bd39b67534eb63122bcf14f71c6a5e293
--- /dev/null
+++ b/neonView/DescriptionTranslationFilter_view/DescriptionTranslationFilter_view.aod
@@ -0,0 +1,26 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DescriptionTranslationFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>translation</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>4bdaf352-d5f1-44a1-9cca-7cb877928ba5</name>
+ <entityField>LANG</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e00000eb-c883-4fd4-854e-c985938392aa</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod b/neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..439e733d6646895528b2d49ca5c8bbb3b29c015a
--- /dev/null
+++ b/neonView/DescriptionTranslationPreview_view/DescriptionTranslationPreview_view.aod
@@ -0,0 +1,40 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>DescriptionTranslationPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <autoHeight v="true" />
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>TranslationInfo</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>5e432839-ca9a-4a29-8006-0a1673d94c92</name>
+ <entityField>LANG</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Description</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d7b004c9-354a-4648-9e41-ed18335370ad</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
index f4644fdd94916d3a1424ab62bae534d47d3ed201..0aace42766f5597dee08d2a5830f832a9de7faf5 100644
--- a/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
+++ b/neonView/EmployeeFilter_view/EmployeeFilter_view.aod
@@ -33,6 +33,22 @@
<name>27c4199c-157a-4c3e-a851-01aa1d82dfd2</name>
<entityField>LASTNAME</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>dd2d35d1-b418-4ee5-ba37-85d22f574ee7</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f14b2144-bfd4-4016-a6e8-e7a7c7668d6f</name>
+ <entityField>DEPARTMENT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>acf1037c-e198-4b2d-9c7f-a2438fa70089</name>
+ <entityField>EMAIL_ADDRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5acac530-7ff7-4fd1-ac48-4a9c441a8b13</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
index e18ac930066433f9273a6bbb2ba2574e89b5a702..80bd7d7db518f8abd5fc91de286f86d5394f6c81 100644
--- a/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
+++ b/neonView/KeywordEntryFilter_view/KeywordEntryFilter_view.aod
@@ -11,6 +11,7 @@
<children>
<treeTableViewTemplate>
<name>EntriesTreeTable</name>
+ <nodeExpandedField>expanded</nodeExpandedField>
<defaultGroupFields>
<element>CONTAINER</element>
</defaultGroupFields>
diff --git a/neonView/MemberDrawer_view/MemberDrawer_view.aod b/neonView/MemberDrawer_view/MemberDrawer_view.aod
index 9f540b690679e26cecec5e401337be0754b4da0e..778c5da8d501f1b2f02c99f0aab351052d91a38f 100644
--- a/neonView/MemberDrawer_view/MemberDrawer_view.aod
+++ b/neonView/MemberDrawer_view/MemberDrawer_view.aod
@@ -6,6 +6,7 @@
<drawerLayout>
<name>layout</name>
<layoutCaption>Salesproject member</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
diff --git a/neonView/MemberEdit_view/MemberEdit_view.aod b/neonView/MemberEdit_view/MemberEdit_view.aod
index 7ba83ec9914c8d975d3731e20fe0c754586b2ddc..bd5630c0211b9a72fa7ab3a21f01710118527dc6 100644
--- a/neonView/MemberEdit_view/MemberEdit_view.aod
+++ b/neonView/MemberEdit_view/MemberEdit_view.aod
@@ -1,28 +1,32 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>MemberEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>2cdccd07-43f2-45c9-afcc-498ff2d36d47</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>188da6f5-4e65-4918-ba4c-379887d51449</name>
- <entityField>DECIDER</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>MemberEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>2cdccd07-43f2-45c9-afcc-498ff2d36d47</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b59bebf0-ea9b-4773-90cd-01adeb21814a</name>
+ <entityField>ROLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>188da6f5-4e65-4918-ba4c-379887d51449</name>
+ <entityField>DECIDER</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/NotificationFilter_view/NotificationFilter_view.aod b/neonView/NotificationFilter_view/NotificationFilter_view.aod
index 013dec87c327a5bc4150e79f87d91ba5bc236441..43ab0c020d3e92e6f85752856b04c2010e35a013 100644
--- a/neonView/NotificationFilter_view/NotificationFilter_view.aod
+++ b/neonView/NotificationFilter_view/NotificationFilter_view.aod
@@ -1,48 +1,49 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>NotificationFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Table</name>
- <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
- <entryAction>rowClickAction</entryAction>
- <entityField>#ENTITY</entityField>
- <isEditable v="false" />
- <showHeader v="true" />
- <isSaveable v="false" />
- <columns>
- <neonTableColumn>
- <name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
- <entityField>ICON</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ebf8b6d5-1057-425d-a57b-d02e25dbd2a4</name>
- <entityField>TYPECODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
- <entityField>CREATIONDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
- <entityField>CAPTION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>ff33a6c1-7ac6-4acd-a083-e56a36f89977</name>
- <entityField>DESCRIPTION</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>5cb09de4-4413-41e5-8a7c-4970a3cf6a62</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>NotificationFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Table</name>
+ <favoriteActionGroup1>setNotificationState</favoriteActionGroup1>
+ <inlineEdit v="true" />
+ <entryAction>rowClickAction</entryAction>
+ <entityField>#ENTITY</entityField>
+ <isEditable v="false" />
+ <showHeader v="true" />
+ <isSaveable v="false" />
+ <columns>
+ <neonTableColumn>
+ <name>1cff3be1-523d-4a5a-b7d1-389d7cbb726f</name>
+ <entityField>ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ebf8b6d5-1057-425d-a57b-d02e25dbd2a4</name>
+ <entityField>TYPECODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>0ed20b46-be6a-424c-a583-a3f7496ec3f9</name>
+ <entityField>CREATIONDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3bf425ed-227c-4768-b339-4794aa0d6063</name>
+ <entityField>CAPTION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ff33a6c1-7ac6-4acd-a083-e56a36f89977</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5cb09de4-4413-41e5-8a7c-4970a3cf6a62</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferDrawer_view/OfferDrawer_view.aod b/neonView/OfferDrawer_view/OfferDrawer_view.aod
index 26c58377bbdf76ef991b55265e93046b1ce3398c..137b782513eeb20135d5a4de9055c150ddbe8b34 100644
--- a/neonView/OfferDrawer_view/OfferDrawer_view.aod
+++ b/neonView/OfferDrawer_view/OfferDrawer_view.aod
@@ -6,6 +6,7 @@
<drawerLayout>
<name>layout</name>
<layoutCaption>Offers</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
diff --git a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
index 8d5833c4b69b022ba37ee780ec864e186308b6fc..340e2df4434698665395b96077adfe4dbb2be52b 100644
--- a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
+++ b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
@@ -1,67 +1,71 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>OfferitemEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="true" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Info</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>a1d02350-10ed-4189-ab65-e750121a7efd</name>
- <entityField>ITEMPOSITION</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>18f778d3-5672-48c5-b0f7-2c062662f9d1</name>
- <entityField>PRODUCT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e280db0c-0ac2-40d4-95c2-b59268c4f663</name>
- <entityField>QUANTITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f7bb223a-ab77-45b5-b6c0-9c8f4d478999</name>
- <entityField>UNIT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
- <entityField>PRICE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4f339738-6358-463e-b941-3b2693ab115a</name>
- <entityField>DISCOUNT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c0a22aa4-b09d-4d8b-8d24-1750eb7ba5ca</name>
- <entityField>VAT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e40aa70c-2a6a-4ff4-818f-0a56bc4c63f4</name>
- <entityField>OPTIONAL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>8df0d334-f0d8-4905-a7b1-e71576f3b24f</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Price</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9200df17-11e2-4a1a-babb-ea48c6f88a93</name>
- <entityField>TotalPrice</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OfferitemEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>VERTICAL</direction>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>a1d02350-10ed-4189-ab65-e750121a7efd</name>
+ <entityField>ITEMPOSITION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>18f778d3-5672-48c5-b0f7-2c062662f9d1</name>
+ <entityField>PRODUCT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e280db0c-0ac2-40d4-95c2-b59268c4f663</name>
+ <entityField>QUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f7bb223a-ab77-45b5-b6c0-9c8f4d478999</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
+ <entityField>PRICE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4f339738-6358-463e-b941-3b2693ab115a</name>
+ <entityField>DISCOUNT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c0a22aa4-b09d-4d8b-8d24-1750eb7ba5ca</name>
+ <entityField>VAT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e40aa70c-2a6a-4ff4-818f-0a56bc4c63f4</name>
+ <entityField>OPTIONAL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0b26591b-e97b-4c09-9584-3bdd6dc2740c</name>
+ <entityField>TotalPrice</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Description</name>
+ <editMode v="true" />
+ <showDrawer v="false" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>5cc8a2cb-92aa-4365-a3dc-2471a6828cae</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index 4a13f1d9332f23905e9790a127a9185844b178fb..05707c2600927abbd54dab462661ceab3d775da8 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -1,63 +1,74 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>OfferitemPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>IMAGE</iconField>
- <titleField>ITEMNAME</titleField>
- <subtitleField>PRODUCT_ID</subtitleField>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>3b207cf2-c621-4e7d-b7aa-32feace5fe04</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>c0c04d1c-90a7-4c0b-9323-1f0783757987</name>
- <entityField>GROUPCODEID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e792d720-187f-4aa1-917c-1c8065222b72</name>
- <entityField>QUANTITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9e25804b-198d-4505-b276-62bf58482dc6</name>
- <entityField>UNIT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>b503187b-db64-4d2f-839f-9e812ee5163e</name>
- <entityField>PRICE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f8043352-f756-4854-9caa-a9aea073e4fe</name>
- <entityField>DISCOUNT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>89b426b0-962f-4483-87c3-e6c0e0d0d651</name>
- <entityField>VAT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
- <entityField>OPTIONAL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>9868560c-41c7-4641-b0f1-627a61b796b3</name>
- <entityField>TotalPrice</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OfferitemPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>171901d8-32a2-4689-aeb3-e00936172330</name>
+ <entityField>ITEMPOSITION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>335b6954-46ab-4235-9681-3ebd261af72a</name>
+ <entityField>PRODUCT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e792d720-187f-4aa1-917c-1c8065222b72</name>
+ <entityField>QUANTITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9e25804b-198d-4505-b276-62bf58482dc6</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>b503187b-db64-4d2f-839f-9e812ee5163e</name>
+ <entityField>PRICE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f8043352-f756-4854-9caa-a9aea073e4fe</name>
+ <entityField>DISCOUNT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>89b426b0-962f-4483-87c3-e6c0e0d0d651</name>
+ <entityField>VAT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e25386dc-a740-4f93-a1f0-32317cf5a36a</name>
+ <entityField>OPTIONAL</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Price</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4ced54f6-0d81-489b-b57b-432a75b77481</name>
+ <entityField>TotalPrice</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Description</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7386aee0-c1b2-4319-8ef8-1f1f75032c03</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationCondition_view/OrganisationCondition_view.aod b/neonView/OrganisationCondition_view/OrganisationCondition_view.aod
index 551bdaa1facc542448219e9e16db17339cd30c15..3c6069f4de3be1822458a2a4f20ef16f4d856aa3 100644
--- a/neonView/OrganisationCondition_view/OrganisationCondition_view.aod
+++ b/neonView/OrganisationCondition_view/OrganisationCondition_view.aod
@@ -21,7 +21,7 @@
<name>Information</name>
<showDrawer v="true" />
<drawerCaption>Information</drawerCaption>
- <fixedDrawer v="true" />
+ <fixedDrawer v="false" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
diff --git a/neonView/OrganisationMain_view/OrganisationMain_view.aod b/neonView/OrganisationMain_view/OrganisationMain_view.aod
index 7e350fef46a0fe26be10557adf21abb8a525f94c..02cd976b495963ecbced53bf9bca6b0da3e04b07 100644
--- a/neonView/OrganisationMain_view/OrganisationMain_view.aod
+++ b/neonView/OrganisationMain_view/OrganisationMain_view.aod
@@ -1,64 +1,64 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>OrganisationMain_view</name>
- <title>Attribute</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>b29471bb-a6d0-4730-90ef-191f76756fcb</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>b29471bb-a6d0-4730-90ef-191f76756fcb</name>
- <entityField>#ENTITY</entityField>
- <view>OrganisationPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
- <entityField>Activities</entityField>
- <view>ActivityFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
- <entityField>Contact</entityField>
- <view>PersonSimpleList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ae34787c-dcaf-4fe2-a4e2-35219f138b03</name>
- <entityField>360DegreeObjects</entityField>
- <view>360DegreeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0728e9d5-3b38-4b53-9f13-ebf3f4a9518e</name>
- <entityField>#ENTITY</entityField>
- <view>OrganisationConditionPricelist_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>55e04574-bc55-4c9a-a4c4-9ebd287f8ae6</name>
- <entityField>Tasks</entityField>
- <view>TaskFilter_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>ba50e069-06da-440e-b04a-5a686fcf5303</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
- <entityField>LogHistoryConsumer</entityField>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OrganisationMain_view</name>
+ <title>Attribute</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>b29471bb-a6d0-4730-90ef-191f76756fcb</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>b29471bb-a6d0-4730-90ef-191f76756fcb</name>
+ <entityField>#ENTITY</entityField>
+ <view>OrganisationPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>14bb5a70-fec1-4346-a8c2-2dde6fb32822</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ae34787c-dcaf-4fe2-a4e2-35219f138b03</name>
+ <entityField>360DegreeObjects</entityField>
+ <view>360DegreeFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c10533a6-d185-4b13-84ee-53a468544c03</name>
+ <entityField>Contact</entityField>
+ <view>PersonSimpleList_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>
+ <view>OrganisationTaskAppointment_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ba50e069-06da-440e-b04a-5a686fcf5303</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>eba90ed2-5e55-4cdb-9e0b-5a09feeb7536</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0686ad7e-8dc7-4b10-9df2-bf066ae3a310</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_view.aod b/neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..56c1e5fa1880abee928e24d741a83c477c2361d5
--- /dev/null
+++ b/neonView/OrganisationTaskAppointment_view/OrganisationTaskAppointment_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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>OrganisationTaskAppointment_view</name>
+ <title>Tasks</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>b3dc5170-7215-453a-8902-4a17c518de27</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f452533f-d5ce-45f1-9bbd-583afd1857a3</name>
+ <entityField>LinkedAppointments</entityField>
+ <view>AppointmentFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
index 456775fc326f8a86aa8b75b67e3b1e01bde00649..bd439feec7fa9b3cb042e9eb0392f532ea280258 100644
--- a/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
+++ b/neonView/PermissionOverviewFilter_view/PermissionOverviewFilter_view.aod
@@ -36,7 +36,7 @@
</neonTableColumn>
<neonTableColumn>
<name>0699fd7b-d4ac-4ef8-ac19-1cd249ce3251</name>
- <entityField>ACTION_EDIT</entityField>
+ <entityField>ACTION_UPDATE</entityField>
</neonTableColumn>
<neonTableColumn>
<name>f7c3479e-e635-44f1-afc0-45570c4fffe9</name>
diff --git a/neonView/PersonMain_view/PersonMain_view.aod b/neonView/PersonMain_view/PersonMain_view.aod
index d7b85d058b7e60ea08089e418d8fedc3743ae0b5..17dec663a6f78d3c189e98630e0b57c1df0db7c2 100644
--- a/neonView/PersonMain_view/PersonMain_view.aod
+++ b/neonView/PersonMain_view/PersonMain_view.aod
@@ -1,63 +1,63 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>PersonMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>12865531-5e68-4760-a846-8af7b97f9561</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>12865531-5e68-4760-a846-8af7b97f9561</name>
- <entityField>#ENTITY</entityField>
- <view>PersonPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>d674b32c-0493-47ea-a51f-dff5d13d237d</name>
- <entityField>Activities</entityField>
- <view>ActivityFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
- <entityField>360DegreeObjects</entityField>
- <view>360DegreeFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>573d2b77-f948-47bc-bac1-621dd824c697</name>
- <entityField>Tasks</entityField>
- <view>TaskFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
- <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>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
- <entityField>OtherContacts</entityField>
- <view>ContactList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>265efe97-d759-476c-9546-0f339d56474d</name>
- <entityField>CommRestrictions</entityField>
- <view>CommRestrictionFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
- <entityField>LogHistoryConsumer</entityField>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>PersonMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>12865531-5e68-4760-a846-8af7b97f9561</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>12865531-5e68-4760-a846-8af7b97f9561</name>
+ <entityField>#ENTITY</entityField>
+ <view>PersonPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e2f4e721-0a3e-49d6-8873-6ac34ae30002</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e7b8c90f-dc8d-40f1-b4db-1493f845026f</name>
+ <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>265efe97-d759-476c-9546-0f339d56474d</name>
+ <entityField>CommRestrictions</entityField>
+ <view>CommRestrictionFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c2606a8b-eac1-412e-893d-bb788d4a5b5c</name>
+ <entityField>OtherContacts</entityField>
+ <view>ContactList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b531300d-eb3c-4a87-bd46-486e77d12e6c</name>
+ <entityField>#ENTITY</entityField>
+ <view>PersonTaskAppointment_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>cf989bf6-3e49-44fc-ba98-322aae377da3</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>4b50b784-484f-4cdf-a705-4c356da763fa</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5754fc3a-c81c-42ba-90ea-2859b10bb391</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/PersonTaskAppointment_view/PersonTaskAppointment_view.aod b/neonView/PersonTaskAppointment_view/PersonTaskAppointment_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..92d3e6fad9bca6817e892ce32b61afd396714ef8
--- /dev/null
+++ b/neonView/PersonTaskAppointment_view/PersonTaskAppointment_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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>PersonTaskAppointment_view</name>
+ <title>Tasks</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>1687572b-b1cc-443e-bcce-89da55281767</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>07a80d30-8ff8-4645-a882-081c351e9b41</name>
+ <entityField>Appointments</entityField>
+ <view>AppointmentFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ProductEdit_view/ProductEdit_view.aod b/neonView/ProductEdit_view/ProductEdit_view.aod
index 20027b6e81447837ee9425792d3954214e92a3b6..d4a5ea781da01966d342115ef24990cb144f8485 100644
--- a/neonView/ProductEdit_view/ProductEdit_view.aod
+++ b/neonView/ProductEdit_view/ProductEdit_view.aod
@@ -1,68 +1,60 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ProductEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericViewTemplate>
- <name>Edit</name>
- <editMode v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>d5cfa031-1bce-43b3-b1c1-d79a4c1205dc</name>
- <entityField>ADVERTISING</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>950b57a7-df15-42a3-9f94-3377ed757ba3</name>
- <entityField>GROUPCODEID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
- <entityField>MINSTOCK</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
- <entityField>ORGANISATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
- <entityField>PRODUCTCODE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0019c5bd-368f-457a-b6e3-dd1d12cbe19e</name>
- <entityField>PRODUCTNAME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>5882a13d-3f07-4017-ad5b-042ee49c67d4</name>
- <entityField>LANGUAGE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>07f4aa57-24e9-4ce2-8b81-c4a3e8bcbce6</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>49b07dd2-1ee1-4b80-88a7-daf4879848d2</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a068f12a-ed45-4997-9e94-c865ccffee2a</name>
- <entityField>UNIT</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0c921c3d-df1a-4794-862b-6d190d6ef04e</name>
- <entityField>CONTACT_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>34659538-e8a5-4f76-9710-a322548885ef</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationMultiEdit_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ProductEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d5cfa031-1bce-43b3-b1c1-d79a4c1205dc</name>
+ <entityField>ADVERTISING</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>950b57a7-df15-42a3-9f94-3377ed757ba3</name>
+ <entityField>GROUPCODEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>77197b19-54ea-493c-8d12-27391cd54a7a</name>
+ <entityField>MINSTOCK</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>472939e5-a69b-4eba-986f-0b47e72d0e9d</name>
+ <entityField>ORGANISATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>cefb3dc8-8d9b-47c4-a0f8-e78e66303ec7</name>
+ <entityField>PRODUCTCODE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0019c5bd-368f-457a-b6e3-dd1d12cbe19e</name>
+ <entityField>PRODUCTNAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>49b07dd2-1ee1-4b80-88a7-daf4879848d2</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a068f12a-ed45-4997-9e94-c865ccffee2a</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0c921c3d-df1a-4794-862b-6d190d6ef04e</name>
+ <entityField>CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>34659538-e8a5-4f76-9710-a322548885ef</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ProductMain_view/ProductMain_view.aod b/neonView/ProductMain_view/ProductMain_view.aod
index 44ff539d6aea525dd5b2f9653fd2b80d7b408649..170b358c21eb28a731ed5f1b6cded2ffc0b8d475 100644
--- a/neonView/ProductMain_view/ProductMain_view.aod
+++ b/neonView/ProductMain_view/ProductMain_view.aod
@@ -1,58 +1,58 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>ProductMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>9ff71d55-84be-411e-9637-5dc0eba6c79e</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>9ff71d55-84be-411e-9637-5dc0eba6c79e</name>
- <entityField>#ENTITY</entityField>
- <view>ProductPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>41887933-bb9a-48ce-818d-1db815021a36</name>
- <entityField>Activities</entityField>
- <view>ActivityFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>754b4efe-3ea7-42de-8e35-c85c3a0b4abf</name>
- <entityField>Tasks</entityField>
- <view>TaskFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>51f37fe5-91e1-4b76-83b3-be0319e871a4</name>
- <entityField>#ENTITY</entityField>
- <view>ProductDescription_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>7f416115-ff89-45ca-be10-ed568cac266c</name>
- <entityField>ProductLinks</entityField>
- <view>Prod2prodFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>11c4c5a0-27fa-4748-a6c6-3a667d2f3d8f</name>
- <entityField>Productprices</entityField>
- <view>ProductpriceFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>616f7cc3-93e7-41ee-8d38-027dd3d4b299</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6ee1258f-b571-45c1-b833-f292361b5a04</name>
- <entityField>AttributeTree</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>0faf6a9e-b1f3-452d-b7fd-d0c9e3fc25f8</name>
- <entityField>LogHistoryConsumer</entityField>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>ProductMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>9ff71d55-84be-411e-9637-5dc0eba6c79e</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>9ff71d55-84be-411e-9637-5dc0eba6c79e</name>
+ <entityField>#ENTITY</entityField>
+ <view>ProductPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>41887933-bb9a-48ce-818d-1db815021a36</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>754b4efe-3ea7-42de-8e35-c85c3a0b4abf</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>c647d35b-3535-4acf-b6cb-c9786a353b08</name>
+ <entityField>DescriptionTranslations</entityField>
+ <view>DescriptionTranslationFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>7f416115-ff89-45ca-be10-ed568cac266c</name>
+ <entityField>ProductLinks</entityField>
+ <view>Prod2prodFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>11c4c5a0-27fa-4748-a6c6-3a667d2f3d8f</name>
+ <entityField>Productprices</entityField>
+ <view>ProductpriceFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>616f7cc3-93e7-41ee-8d38-027dd3d4b299</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6ee1258f-b571-45c1-b833-f292361b5a04</name>
+ <entityField>AttributeTree</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>0faf6a9e-b1f3-452d-b7fd-d0c9e3fc25f8</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b4a5b75297c4951bc434b329f15f9a55bf5df877
--- /dev/null
+++ b/neonView/SaleprojectOverviewCharts_view/SaleprojectOverviewCharts_view.aod
@@ -0,0 +1,19 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SaleprojectOverviewCharts_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="3" />
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>5cb29574-2cca-44da-a987-a2be76032b27</name>
+ <entityField>SalesprojectForecastCharts</entityField>
+ <view>TurnoverChartForecast_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
index 9ceb8b366343ca0043e462b5367d008516712ad4..3437a1f9869dfcc937983a122184f5dd85882d1f 100644
--- a/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
+++ b/neonView/SalesprojectClassificationAttribute_view/SalesprojectClassificationAttribute_view.aod
@@ -7,6 +7,7 @@
<boxLayout>
<name>layout</name>
<direction>VERTICAL</direction>
+ <autoHeight v="false" />
</boxLayout>
</layout>
<children>
diff --git a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
index 5212ec664079724679b0e879a31ba1a9054974a5..d3b79f433097477fb80fd9ba79363d50dfdc8411 100644
--- a/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
+++ b/neonView/SalesprojectFilter_view/SalesprojectFilter_view.aod
@@ -1,96 +1,96 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>AllSalesprojectDashlet</name>
- <title>Salesprojects</title>
- <description>Show all salesprojects</description>
- <fragment>Salesproject/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- <neonDashletConfiguration>
- <name>OpenSalesprojectsDashlet</name>
- <title>Open salesprojects</title>
- <description>Show open salesprojects</description>
- <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiNDgzYmNhZWItMWU1Yi00NzcyLWI1NGUtN2Q3ZDhhYTY1NzEyIiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>vaadin:filter</icon>
- <categories>
- <neonDashletCategory>
- <name>sales</name>
- <title>Sales</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <tableViewTemplate>
- <name>Salesprojects</name>
- <entityField>#ENTITY</entityField>
- <title></title>
- <columns>
- <neonTableColumn>
- <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
- <entityField>IMAGE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>59001269-3ca3-4e13-9b8a-d62e2e602e29</name>
- <entityField>PROJECTCODE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
- <entityField>CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
- <entityField>PROJECTTITLE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
- <entityField>STARTDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
- <entityField>ENDDATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
- <entityField>PHASE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
- <entityField>STATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>90b7548a-afb0-4d77-9675-02572c31008b</name>
- <entityField>ClassificationResult</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>AllSalesprojectDashlet</name>
+ <title>Salesprojects</title>
+ <description>Show all salesprojects</description>
+ <fragment>Salesproject/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ <neonDashletConfiguration>
+ <name>OpenSalesprojectsDashlet</name>
+ <title>Open salesprojects</title>
+ <description>Show open salesprojects</description>
+ <fragment>Salesproject/filter?search=W3sibmFtZSI6IlNUQVRFIiwib3BlcmF0b3IiOiJFUVVBTCIsInZhbHVlIjoiU0FMUFJPSlNUQVRPUEVOICAgICAgICAgICAgICAgICAgICAgIiwiY29udGVudFR5cGUiOiJURVhUIn1d</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>vaadin:filter</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>sales</name>
+ <title>Sales</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>Salesprojects</name>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>2cbd6486-e1e4-4660-94f9-1b71e29b11ba</name>
+ <entityField>IMAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>59001269-3ca3-4e13-9b8a-d62e2e602e29</name>
+ <entityField>PROJECTCODE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6702bb75-1c57-42a7-9cf0-acd7cd8515f5</name>
+ <entityField>CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9f6b967e-5140-420f-84ca-2273920221bd</name>
+ <entityField>PROJECTTITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fec843c3-f7c0-42c7-8295-50386651edb2</name>
+ <entityField>STARTDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>4cc3c3f1-6f86-434d-8d1d-32a965aa76b2</name>
+ <entityField>ENDDATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2689fee8-bebb-4d7c-b11e-4a7310664977</name>
+ <entityField>PHASE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>52a851b0-9059-4d57-8ff5-335c819359e8</name>
+ <entityField>STATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>90b7548a-afb0-4d77-9675-02572c31008b</name>
+ <entityField>ClassificationResult</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
index dac320ceaa4cdea9868fa48d397be8415e898d7f..417b5820500118dab37b302d9eb113deaf5bf1b8 100644
--- a/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
+++ b/neonView/SalesprojectMain_view/SalesprojectMain_view.aod
@@ -1,53 +1,63 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <masterSlaveLayout>
- <name>layout</name>
- <master>04b5a305-b2a6-481a-83a5-1d94bee08143</master>
- </masterSlaveLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>04b5a305-b2a6-481a-83a5-1d94bee08143</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectPreview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>673a34c7-5781-4c72-b0c8-944f1e5de9c6</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectOverview_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>67659a20-068f-4522-ad33-2c35e29f929a</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectClassificationAttribute_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>8a83afee-e02c-4714-9641-13b62c95cea1</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectMilestoneSource_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>3da4532a-716f-4ff2-a8bc-c29d4f7cb9fb</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectOfferForecastChart_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>aa801bbd-df49-419b-959a-1664b2c31274</name>
- <entityField>#ENTITY</entityField>
- <view>SalesprojectFurtherInfo_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>ccdbb3f1-6b18-4cdd-a0cb-22d8bddd7150</name>
- <entityField>Documents</entityField>
- <view>DocumentFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>6ed5fc92-1056-418f-a0b7-3d55414efe3a</name>
- <entityField>LogHistoryConsumer</entityField>
- <view>LogHistoryFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>04b5a305-b2a6-481a-83a5-1d94bee08143</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>04b5a305-b2a6-481a-83a5-1d94bee08143</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>673a34c7-5781-4c72-b0c8-944f1e5de9c6</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectOverview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>d4daa13e-bf57-45e4-af43-d58c04f113f5</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectMemberActivity_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>67659a20-068f-4522-ad33-2c35e29f929a</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectClassificationAttribute_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>8a83afee-e02c-4714-9641-13b62c95cea1</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectMilestoneSource_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>3da4532a-716f-4ff2-a8bc-c29d4f7cb9fb</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectOfferForecastChart_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>aa801bbd-df49-419b-959a-1664b2c31274</name>
+ <entityField>#ENTITY</entityField>
+ <view>SalesprojectFurtherInfo_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>a5043042-e889-4a9e-9e69-bf727e35bddf</name>
+ <entityField>Tasks</entityField>
+ <view>TaskFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ccdbb3f1-6b18-4cdd-a0cb-22d8bddd7150</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6ed5fc92-1056-418f-a0b7-3d55414efe3a</name>
+ <entityField>LogHistoryConsumer</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6f3a13c89ffbe9f1fea523dda0aeba746afddff3
--- /dev/null
+++ b/neonView/SalesprojectMilestoneInfo_view/SalesprojectMilestoneInfo_view.aod
@@ -0,0 +1,19 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectMilestoneInfo_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ <direction>HORIZONTAL</direction>
+ <maxDirectionElements v="2" />
+ </boxLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>04fca7a3-55a5-44b6-9e35-9dbd34153128</name>
+ <entityField>SalesprojectPhaseMilestones</entityField>
+ <view>SalesprojectMilestoneChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
index a847b5dda281176a6109bac6b09b0a191282b87a..2e629e3ebd7d3c01ad173ca89250e5e99c9e7dd1 100644
--- a/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
+++ b/neonView/SalesprojectOverview_view/SalesprojectOverview_view.aod
@@ -16,9 +16,14 @@
<view>SalesprojectPhase_view</view>
</neonViewReference>
<neonViewReference>
- <name>23322723-b5a5-45ff-8cf7-1b85bf9ca3d4</name>
+ <name>176485e7-c79c-4fb4-8c59-26c2bfb29a46</name>
<entityField>#ENTITY</entityField>
- <view>SalesprojectMemberActivity_view</view>
+ <view>SalesprojectMilestoneInfo_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>dd0dd64f-1135-46c5-82d7-9d1e67cf4810</name>
+ <entityField>#ENTITY</entityField>
+ <view>SaleprojectOverviewCharts_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
index c4de8f137b681cd664e873800f2cafad6ce4c5ee..d902ff8f1ef411a43224704c8c994ca5281d57b4 100644
--- a/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
+++ b/neonView/SalesprojectPhases_view/SalesprojectPhases_view.aod
@@ -1,55 +1,55 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectPhases_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>Salesproject phases</name>
- <title>Salesproject phases</title>
- <description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
- <fragment>SalesprojectAnalyses/full</fragment>
- <singleton v="true" />
- <icon>VAADIN:FUNNEL</icon>
- <categories>
- <neonDashletCategory>
- <name>salesproject</name>
- <title>Salesproject</title>
- </neonDashletCategory>
- <neonDashletCategory>
- <name>chart</name>
- <title>Chart</title>
- </neonDashletCategory>
- </categories>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <groupLayout>
- <name>layout</name>
- </groupLayout>
- </layout>
- <children>
- <singleDataChartViewTemplate>
- <name>PhaseFunnelChart</name>
- <chartType>FUNNEL</chartType>
- <xAxis>X_PHASE</xAxis>
- <yAxis>Y_COUNT</yAxis>
- <parentField></parentField>
- <entityField>#ENTITY</entityField>
- </singleDataChartViewTemplate>
- <singleDataChartViewTemplate>
- <name>PhasePieChart</name>
- <chartType>PIE</chartType>
- <xAxis>X_PHASE</xAxis>
- <yAxis>Y_COUNT</yAxis>
- <parentField></parentField>
- <entityField>#ENTITY</entityField>
- </singleDataChartViewTemplate>
- <singleDataChartViewTemplate>
- <name>PhasePyramidChart</name>
- <chartType>PYRAMID</chartType>
- <xAxis>X_PHASE</xAxis>
- <yAxis>Y_COUNT</yAxis>
- <entityField>#ENTITY</entityField>
- </singleDataChartViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectPhases_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>SalesprojectPhases</name>
+ <title>Salesproject phases</title>
+ <description>Zeigt wie viele Vertriebsprojekte in den einzelnen Vertriebsphasen sind. </description>
+ <fragment>SalesprojectAnalyses/full</fragment>
+ <singleton v="true" />
+ <icon>VAADIN:FUNNEL</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>salesproject</name>
+ <title>Salesproject</title>
+ </neonDashletCategory>
+ <neonDashletCategory>
+ <name>chart</name>
+ <title>Chart</title>
+ </neonDashletCategory>
+ </categories>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <singleDataChartViewTemplate>
+ <name>PhaseFunnelChart</name>
+ <chartType>FUNNEL</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <parentField></parentField>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ <singleDataChartViewTemplate>
+ <name>PhasePieChart</name>
+ <chartType>PIE</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <parentField></parentField>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ <singleDataChartViewTemplate>
+ <name>PhasePyramidChart</name>
+ <chartType>PYRAMID</chartType>
+ <xAxis>X_PHASE</xAxis>
+ <yAxis>Y_COUNT</yAxis>
+ <entityField>#ENTITY</entityField>
+ </singleDataChartViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index 93d3fc2ee2cb3095455e208b639a8b16eeda80bc..096c7e442c82af77762354acd8a1dceb02b6168f 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -1,102 +1,103 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>SalesprojectPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Head</header>
- <footer>AdditionalInfo</footer>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Head</name>
- <iconField>IMAGE</iconField>
- <titleField>PROJECTTITLE</titleField>
- <subtitleField>CONTACT_ID</subtitleField>
- <descriptionField>PROJECTCODE</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Details</name>
- <showDrawer v="true" />
- <drawerCaption>Details</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
- <entityField>RELATION_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
- <entityField>STATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
- <entityField>REASONS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
- <entityField>PHASE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
- <entityField>STARTDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
- <entityField>ENDDATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
- <entityField>PROBABILITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
- <entityField>VOLUME</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
- <entityField>TIMETRACKINGSUM</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <drawerCaption>Further informations</drawerCaption>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
- <entityField>INFO</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- <scoreCardViewTemplate>
- <name>AdditionalInfo</name>
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>79490331-6be4-422f-9450-da0db56f0654</name>
- <entityField>InactiveTime</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>838cc7e2-6d6a-484a-92ad-d01adc2504df</name>
- <entityField>ClassificationResult</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
- <entityField>RemainingTime</entityField>
- </entityFieldLink>
- </fields>
- </scoreCardViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SalesprojectPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Head</header>
+ <footer>AdditionalInfo</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Head</name>
+ <iconField>IMAGE</iconField>
+ <titleField>PROJECTTITLE</titleField>
+ <subtitleField>CONTACT_ID</subtitleField>
+ <descriptionField>PROJECTCODE</descriptionField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Details</name>
+ <showDrawer v="true" />
+ <drawerCaption>Details</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
+ <entityField>RELATION_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
+ <entityField>STATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>2867e662-b824-4bbf-8eaf-bbd34f44598e</name>
+ <entityField>REASONS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ff0dcd67-56ec-4db1-8c53-531f22fda716</name>
+ <entityField>PHASE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3164fe37-8ca0-44c0-bebe-b9573346fb72</name>
+ <entityField>STARTDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>529e8b1f-014f-4b44-8bba-96869156ebf7</name>
+ <entityField>ENDDATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0ba7dcb5-9606-4d74-8455-3423a16fd98a</name>
+ <entityField>PROBABILITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
+ <entityField>VOLUME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
+ <entityField>TIMETRACKINGSUM</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>9fe11db5-ec66-4238-9c56-5ace055f1d90</name>
+ <entityField>INFO</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>f3542270-e7bd-4f9f-b7c0-f6c5210bb337</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <scoreCardViewTemplate>
+ <name>AdditionalInfo</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>79490331-6be4-422f-9450-da0db56f0654</name>
+ <entityField>InactiveTime</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>838cc7e2-6d6a-484a-92ad-d01adc2504df</name>
+ <entityField>ClassificationResult</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ce670b75-346e-4aeb-b72d-5ef68dd77e71</name>
+ <entityField>RemainingTime</entityField>
+ </entityFieldLink>
+ </fields>
+ </scoreCardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod b/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod
index 35f94f37719cbcba5ad3e05deb4e6b479e1447f1..281cae0b0b9508390a1e34f39b46e82db0501a0d 100644
--- a/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod
+++ b/neonView/SalesprojectSourceDrawer_view/SalesprojectSourceDrawer_view.aod
@@ -6,6 +6,7 @@
<drawerLayout>
<name>layout</name>
<layoutCaption>Touchpoints</layoutCaption>
+ <fixedDrawer v="true" />
</drawerLayout>
</layout>
<children>
diff --git a/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod b/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d6bfd4e83d8571abeb2f1f52e739c5c7fbc8548f
--- /dev/null
+++ b/neonView/SupportTicketEdit_view/SupportTicketEdit_view.aod
@@ -0,0 +1,65 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SupportTicketEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Edit</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>46ef8d86-47fc-495d-bd33-9cb43ea29b25</name>
+ <entityField>TASK_SUBJECT</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>60dc6a4c-78a0-4105-b679-e9ae280e9e9a</name>
+ <entityField>TASK_DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7bc8570c-4bb2-4e37-9dd3-5661adf88fcb</name>
+ <entityField>TASK_START_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e8fdd5ff-4edf-46c4-96fb-9900695f6ca0</name>
+ <entityField>TASK_MATURITY_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>a2eee9f8-a0fd-484f-b1ae-bc0f989a0e54</name>
+ <entityField>TASK_STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>05462ebf-04cb-407f-bc9e-56f016766ee1</name>
+ <entityField>TASK_PROGRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>677a46e7-a846-4b84-8c31-2a888e7dd7f3</name>
+ <entityField>TASK_PRIORITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>58eb48d2-1ee1-4f55-a5e0-28b05cf8b8bf</name>
+ <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c023e4ba-8779-4ca3-9bba-50bbc26b54f2</name>
+ <entityField>TASK_EDITOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>135e702d-aa52-4787-9f05-6e9fa1569567</name>
+ <entityField>Links</entityField>
+ <view>TaskLinkMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5a61eda9-d71b-4b15-83f6-f4580a214876</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4c982fe16e2ae41df4acf27a9555b59b28edae84
--- /dev/null
+++ b/neonView/SupportTicketFilter_view/SupportTicketFilter_view.aod
@@ -0,0 +1,121 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SupportTicketFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>mytickets</name>
+ <title>My tasks</title>
+ <description>Show tasks where I am editor</description>
+ <fragment>Ticket/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>VAADIN:TASKS</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>tickets</name>
+ <title>Tickets</title>
+ </neonDashletCategory>
+ </categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>FilterOnlyOwnTicket_param</name>
+ <value>true</value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <timelineViewTemplate>
+ <name>TicketsTimeline</name>
+ <favoriteActionGroup1>tableActions</favoriteActionGroup1>
+ <dateField>TASK_MATURITY_DATE</dateField>
+ <titleField>TASK_SUBJECT</titleField>
+ <descriptionField>TASK_DESCRIPTION</descriptionField>
+ <iconIdField>TASK_PRIORITY_ICON</iconIdField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
+ <tableViewTemplate>
+ <name>TicketsTable</name>
+ <favoriteActionGroup1>tableActions</favoriteActionGroup1>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>97c51024-1193-412a-a1e7-d5b4fe5ea1b3</name>
+ <entityField>TASK_PRIORITY_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>37366161-eeb1-4f2e-9e25-843e85f2c4b6</name>
+ <entityField>TASK_STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>077df121-a59b-48ab-9772-aa29fa0d7c1d</name>
+ <entityField>TASK_SUBJECT</entityField>
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7e2dca2a-6a53-41cc-8dd7-a8ee370ff4de</name>
+ <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fb4ad106-1d84-445b-ab4a-ac36b6e3b0c2</name>
+ <entityField>TASK_EDITOR_CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>cf98ce13-f3c4-4c6b-8964-a7a5d17b05c2</name>
+ <entityField>TASK_PRIORITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>38ac59d8-ad7e-4e0f-85b8-6cba129ffabf</name>
+ <entityField>TASK_MATURITY_DATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>7eb5fb76-7e83-4151-9364-28749712c58a</name>
+ <entityField>TASK_PROGRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2a20110d-0b42-4f47-9361-2256c5c5aad5</name>
+ <entityField>TASK_DESCRIPTION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ <treeTableViewTemplate>
+ <name>TicketsTreeTable</name>
+ <favoriteActionGroup1>tableActions</favoriteActionGroup1>
+ <defaultGroupFields>
+ <element>TYPE</element>
+ </defaultGroupFields>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>34e2d188-bf3e-4049-9094-2c68a2552fc9</name>
+ <entityField>TASK_PRIORITY_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>fce7d0f3-b045-4230-9adb-2c11716a1e39</name>
+ <entityField>TASK_SUBJECT</entityField>
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>32562679-18bb-4084-a2f5-eca18e0b91bb</name>
+ <entityField>TASK_PRIORITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>1be2b011-6759-4ba9-9ec1-6cc30db7f959</name>
+ <entityField>TASK_MATURITY_DATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>33319779-919b-4672-aa0a-0e94f0d8c640</name>
+ <entityField>TASK_STATUS</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/SupportTicketMain_view/SupportTicketMain_view.aod b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f8a2b93f796506b432000baee9ff2e8c3d258d28
--- /dev/null
+++ b/neonView/SupportTicketMain_view/SupportTicketMain_view.aod
@@ -0,0 +1,48 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SupportTicketMain_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <masterSlaveLayout>
+ <name>layout</name>
+ <master>bfecc398-890e-485f-afa0-74e24f41b019</master>
+ </masterSlaveLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>details</name>
+ <showDrawer v="true" />
+ <drawerCaption></drawerCaption>
+ <fixedDrawer v="true" />
+ <hideLabels v="false" />
+ <entityField>#ENTITY</entityField>
+ <title>details</title>
+ <fields>
+ <entityFieldLink>
+ <name>3f746e73-b8cd-4d08-b352-a2307e080410</name>
+ <entityField>TASK_DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>6846f680-84ef-46da-a0ea-6797044cf693</name>
+ <entityField>Documents</entityField>
+ <view>DocumentFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>ffa776bd-013c-4d4d-aedd-490625ef0fe1</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>bfecc398-890e-485f-afa0-74e24f41b019</name>
+ <entityField>#ENTITY</entityField>
+ <view>SupportTicketPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f45ff4cb-e469-46ee-808f-8c406eccbcd2</name>
+ <entityField>Attributes</entityField>
+ <view>AttributeRelationTree_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0d2560de1fa46660d94bd137fe7f67dbe9e85709
--- /dev/null
+++ b/neonView/SupportTicketPreview_view/SupportTicketPreview_view.aod
@@ -0,0 +1,79 @@
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>SupportTicketPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>TASK_PRIORITY_ICON</iconField>
+ <titleField>TASK_SUBJECT</titleField>
+ <subtitleField>CODE</subtitleField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>afbb79a4-418f-44ba-892d-c41843e57416</name>
+ <entityField>TASK_STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ffdd1606-4d33-4580-84bd-42b411d15168</name>
+ <entityField>TASK_START_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d419374d-e56b-40ce-9ded-e6214c8572f0</name>
+ <entityField>TASK_MATURITY_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f3d37da9-9104-4dff-9796-24ca81e26976</name>
+ <entityField>TASK_PROGRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f3d555e1-94f0-46d1-8d2e-0863c32f236c</name>
+ <entityField>TASK_PRIORITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>1f8a7860-d0f7-4f86-af23-382d82c062c2</name>
+ <entityField>TASK_REQUESTOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9e2ef777-209c-4ad7-91e7-8422896ebc08</name>
+ <entityField>TASK_EDITOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>0ad1cd97-a128-4b10-87f8-434fc72723bd</name>
+ <entityField>Links</entityField>
+ <view>TaskLinkPreviewList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>b3f080e0-a1fb-42bd-ac4a-3788fb077b9c</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>Description</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>4b4997bf-fb16-4669-9b47-7cbd279159c6</name>
+ <entityField>TASK_DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskEdit_view/TaskEdit_view.aod b/neonView/TaskEdit_view/TaskEdit_view.aod
index 023960237656f3496add81bac38131aab5d19f9f..11e5be41cb21ff7d265807345517101cf5124fb2 100644
--- a/neonView/TaskEdit_view/TaskEdit_view.aod
+++ b/neonView/TaskEdit_view/TaskEdit_view.aod
@@ -13,10 +13,6 @@
<editMode v="true" />
<entityField>#ENTITY</entityField>
<fields>
- <entityFieldLink>
- <name>f8dcc490-1b86-47c3-88fa-8005f8e0095b</name>
- <entityField>TYPE</entityField>
- </entityFieldLink>
<entityFieldLink>
<name>fb5768fe-2dd2-45cd-8d21-f20af279f409</name>
<entityField>SUBJECT</entityField>
@@ -64,10 +60,5 @@
<entityField>Links</entityField>
<view>TaskLinkMultiEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>74f3f70d-c25f-455c-a619-593f569360a6</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationMultiEdit_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/TaskFilter_view/TaskFilter_view.aod b/neonView/TaskFilter_view/TaskFilter_view.aod
index 5dfe13cecc7f1c189d96e6bd48a9a98fcca09e32..63ecfb8b086288bc12797e214df15397355b4be8 100644
--- a/neonView/TaskFilter_view/TaskFilter_view.aod
+++ b/neonView/TaskFilter_view/TaskFilter_view.aod
@@ -1,121 +1,118 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>TaskFilter_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <dashletConfigurations>
- <neonDashletConfiguration>
- <name>mytasks</name>
- <title>My tasks</title>
- <description>Show tasks where I am editor</description>
- <fragment>Task/filter</fragment>
- <singleton v="true" />
- <requiresConfiguration v="false" />
- <icon>VAADIN:TASKS</icon>
- <categories>
- <neonDashletCategory>
- <name>tasks</name>
- <title>Tasks</title>
- </neonDashletCategory>
- </categories>
- <parameters>
- <neonDashletParameter>
- <name>FilterOnlyOwnTask_param</name>
- <value>true</value>
- </neonDashletParameter>
- </parameters>
- </neonDashletConfiguration>
- </dashletConfigurations>
- <layout>
- <groupLayout>
- <name>layout</name>
- </groupLayout>
- </layout>
- <children>
- <timelineViewTemplate>
- <name>TasksTimeline</name>
- <favoriteActionGroup1>tableActions</favoriteActionGroup1>
- <dateField>MATURITY_DATE</dateField>
- <titleField>SUBJECT_DETAILS</titleField>
- <descriptionField>DESCRIPTION</descriptionField>
- <iconIdField>PRIORITY_ICON</iconIdField>
- <entityField>#ENTITY</entityField>
- </timelineViewTemplate>
- <tableViewTemplate>
- <name>TasksTable</name>
- <favoriteActionGroup1>tableActions</favoriteActionGroup1>
- <entityField>#ENTITY</entityField>
- <title></title>
- <columns>
- <neonTableColumn>
- <name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
- <entityField>PRIORITY_ICON</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
- <entityField>SUBJECT</entityField>
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>82e7cbba-d1b1-4b8c-b8e0-263d7a9d8077</name>
- <entityField>REQUESTOR_CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>958132c8-386b-4e0a-900c-acf99e551791</name>
- <entityField>EDITOR_CONTACT_ID</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>5d11add4-d939-4c8e-9633-efd0c2991837</name>
- <entityField>PRIORITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>154182d8-bc66-4901-a423-7d3a375d4154</name>
- <entityField>MATURITY_DATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>2db57789-12bc-4d23-a7b2-850a1a776306</name>
- <entityField>PROGRESS</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>e3059d13-cec9-4e49-8f1e-176508c0331a</name>
- <entityField>DESCRIPTION</entityField>
- </neonTableColumn>
- </columns>
- </tableViewTemplate>
- <treeTableViewTemplate>
- <name>TasksTreeTable</name>
- <favoriteActionGroup1>tableActions</favoriteActionGroup1>
- <defaultGroupFields>
- <element>TYPE</element>
- </defaultGroupFields>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
- <entityField>PRIORITY_ICON</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
- <entityField>SUBJECT</entityField>
- <expandRatio v="100" />
- </neonTableColumn>
- <neonTableColumn>
- <name>5d11add4-d939-4c8e-9633-efd0c2991837</name>
- <entityField>PRIORITY</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>abba0283-ace9-41f2-8b98-df149c2feaf9</name>
- <entityField>MATURITY_DATE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
- <entityField>STATUS</entityField>
- </neonTableColumn>
- </columns>
- </treeTableViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>TaskFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <dashletConfigurations>
+ <neonDashletConfiguration>
+ <name>mytasks</name>
+ <title>My tasks</title>
+ <description>Show tasks where I am editor</description>
+ <fragment>Task/filter</fragment>
+ <singleton v="true" />
+ <requiresConfiguration v="false" />
+ <icon>VAADIN:TASKS</icon>
+ <categories>
+ <neonDashletCategory>
+ <name>tasks</name>
+ <title>Tasks</title>
+ </neonDashletCategory>
+ </categories>
+ <parameters>
+ <neonDashletParameter>
+ <name>FilterOnlyOwnTask_param</name>
+ <value>true</value>
+ </neonDashletParameter>
+ </parameters>
+ </neonDashletConfiguration>
+ </dashletConfigurations>
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <timelineViewTemplate>
+ <name>TasksTimeline</name>
+ <dateField>MATURITY_DATE</dateField>
+ <titleField>SUBJECT_DETAILS</titleField>
+ <descriptionField>DESCRIPTION</descriptionField>
+ <iconIdField>PRIORITY_ICON</iconIdField>
+ <entityField>#ENTITY</entityField>
+ </timelineViewTemplate>
+ <tableViewTemplate>
+ <name>TasksTable</name>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ <columns>
+ <neonTableColumn>
+ <name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
+ <entityField>PRIORITY_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
+ <entityField>SUBJECT</entityField>
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>82e7cbba-d1b1-4b8c-b8e0-263d7a9d8077</name>
+ <entityField>REQUESTOR_CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>958132c8-386b-4e0a-900c-acf99e551791</name>
+ <entityField>EDITOR_CONTACT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5d11add4-d939-4c8e-9633-efd0c2991837</name>
+ <entityField>PRIORITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>154182d8-bc66-4901-a423-7d3a375d4154</name>
+ <entityField>MATURITY_DATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>2db57789-12bc-4d23-a7b2-850a1a776306</name>
+ <entityField>PROGRESS</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e3059d13-cec9-4e49-8f1e-176508c0331a</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ <treeTableViewTemplate>
+ <name>TasksTreeTable</name>
+ <defaultGroupFields>
+ <element>TYPE</element>
+ </defaultGroupFields>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>3cd319ea-5a06-409c-a7ce-1c87beff62d2</name>
+ <entityField>PRIORITY_ICON</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>591cd079-a8e9-49aa-8a2d-afb643aef079</name>
+ <entityField>SUBJECT</entityField>
+ <expandRatio v="100" />
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>5d11add4-d939-4c8e-9633-efd0c2991837</name>
+ <entityField>PRIORITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>abba0283-ace9-41f2-8b98-df149c2feaf9</name>
+ <entityField>MATURITY_DATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>b92dba41-58a2-4c95-aeb4-235c5eaffad7</name>
+ <entityField>STATUS</entityField>
+ </neonTableColumn>
+ </columns>
+ </treeTableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
index c1235f611ce6b500c34515ecc7a545a3df8143e6..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
+++ b/neonView/TaskMainPreview_view/TaskMainPreview_view.aod
@@ -1,58 +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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>TaskMainPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>PRIORITY_ICON</iconField>
- <titleField>SUBJECT</titleField>
- <subtitleField>CODE</subtitleField>
- <descriptionField>STATUS</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
- <entityField>START_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
- <entityField>MATURITY_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>a2c82cd5-6dcd-42aa-b650-85369f4e8d39</name>
- <entityField>PROGRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
- <entityField>PRIORITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
- <entityField>REQUESTOR_CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
- <entityField>EDITOR_CONTACT_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>c4f66270-1d64-4243-9561-fb5642cff3f1</name>
- <entityField>Links</entityField>
- <view>TaskLinkPreviewList_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/TaskMain_view/TaskMain_view.aod b/neonView/TaskMain_view/TaskMain_view.aod
index 4bb55b79b69a151ec0b1fb5be5f78096afd014b3..b2e0db985e81ea32b4f9d7db2ac295cb11d11015 100644
--- a/neonView/TaskMain_view/TaskMain_view.aod
+++ b/neonView/TaskMain_view/TaskMain_view.aod
@@ -48,10 +48,5 @@
<entityField>#ENTITY</entityField>
<view>TaskPreview_view</view>
</neonViewReference>
- <neonViewReference>
- <name>f45ff4cb-e469-46ee-808f-8c406eccbcd2</name>
- <entityField>Attributes</entityField>
- <view>AttributeRelationTree_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/TaskPreview_view/TaskPreview_view.aod b/neonView/TaskPreview_view/TaskPreview_view.aod
index 69bdd2e9d813852fe7565c4408398e3236969c03..b6c57674524f7e9f54ea7ce4dcb492d46fde62b6 100644
--- a/neonView/TaskPreview_view/TaskPreview_view.aod
+++ b/neonView/TaskPreview_view/TaskPreview_view.aod
@@ -1,84 +1,82 @@
-<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
- <name>TaskPreview_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <headerFooterLayout>
- <name>layout</name>
- <header>Header</header>
- </headerFooterLayout>
- </layout>
- <children>
- <cardViewTemplate>
- <name>Header</name>
- <iconField>PRIORITY_ICON</iconField>
- <titleField>SUBJECT</titleField>
- <subtitleField>CODE</subtitleField>
- <descriptionField>TYPE</descriptionField>
- <favoriteAction1>newActivity</favoriteAction1>
- <entityField>#ENTITY</entityField>
- </cardViewTemplate>
- <genericViewTemplate>
- <name>Info</name>
- <showDrawer v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>d054335b-7a54-4380-a543-54c4ffc643c4</name>
- <entityField>STATUS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
- <entityField>START_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
- <entityField>MATURITY_DATE</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>3c7f0603-f659-47ea-adbf-4a4b0b0c6b37</name>
- <entityField>PROGRESS</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
- <entityField>PRIORITY</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
- <entityField>PROTECTIONLEVEL</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
- <entityField>REQUESTOR_CONTACT_ID</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
- <entityField>EDITOR_CONTACT_ID</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- <neonViewReference>
- <name>8cf85386-d25f-459a-a2a1-991c9e3287b6</name>
- <entityField>Links</entityField>
- <view>TaskLinkPreviewList_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
- <entityField>MainDocuments</entityField>
- <view>DocumentList_view</view>
- </neonViewReference>
- <genericViewTemplate>
- <name>Description</name>
- <showDrawer v="true" />
- <drawerCaption>Description</drawerCaption>
- <hideLabels v="true" />
- <entityField>#ENTITY</entityField>
- <fields>
- <entityFieldLink>
- <name>65933f93-96fc-4bfe-9297-7e185868ec77</name>
- <entityField>DESCRIPTION</entityField>
- </entityFieldLink>
- </fields>
- </genericViewTemplate>
- </children>
-</neonView>
+<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.1">
+ <name>TaskPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Header</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Header</name>
+ <iconField>PRIORITY_ICON</iconField>
+ <titleField>SUBJECT</titleField>
+ <favoriteAction1>newActivity</favoriteAction1>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>Info</name>
+ <showDrawer v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d054335b-7a54-4380-a543-54c4ffc643c4</name>
+ <entityField>STATUS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f988850e-53ed-443d-bd3d-16946eba656e</name>
+ <entityField>START_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>dda6aefc-9d4f-4d93-9a45-bc97a278c050</name>
+ <entityField>MATURITY_DATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3c7f0603-f659-47ea-adbf-4a4b0b0c6b37</name>
+ <entityField>PROGRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ebdffed8-4999-4ec1-ac4d-c22514dfed0c</name>
+ <entityField>PRIORITY</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d9e4daef-84df-415c-9be7-3238c2760c07</name>
+ <entityField>PROTECTIONLEVEL</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>05de9afc-429e-46a8-8e3b-2ff689ed090e</name>
+ <entityField>REQUESTOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bbf1a736-acf9-4b41-9df9-5675fc6d8943</name>
+ <entityField>EDITOR_CONTACT_ID</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>8cf85386-d25f-459a-a2a1-991c9e3287b6</name>
+ <entityField>Links</entityField>
+ <view>TaskLinkPreviewList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>2941084f-b72c-4cb2-9d73-5e6827795be2</name>
+ <entityField>MainDocuments</entityField>
+ <view>DocumentList_view</view>
+ </neonViewReference>
+ <genericViewTemplate>
+ <name>Description</name>
+ <showDrawer v="true" />
+ <drawerCaption>Description</drawerCaption>
+ <hideLabels v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>65933f93-96fc-4bfe-9297-7e185868ec77</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod b/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod
index 73b0197c31dc7ad10cab5db81584d11943e72bee..6143767e824bf1a501b9263d6cd9bb458ec51ad6 100644
--- a/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod
+++ b/neonView/TimetrackingAnalyses_view/TimetrackingAnalyses_view.aod
@@ -15,12 +15,5 @@
<yAxis>MINUTES</yAxis>
<entityField>#ENTITY</entityField>
</singleDataChartViewTemplate>
- <multiDataChartViewTemplate>
- <name>MultiDataChart</name>
- <chartType>BAR</chartType>
- <xAxis>DATE</xAxis>
- <yAxis>MINUTES</yAxis>
- <entityField>#ENTITY</entityField>
- </multiDataChartViewTemplate>
</children>
</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index f5b0e9c5e7c5cace9db6bfb3ce15d52835c93142..13d39a2e6f4aef208ef318d0cdbc2f12adb829c2 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -1,104 +1,73 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
- <name>_____PREFERENCES_PROJECT</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <mailGlobalUserServerEnabled v="true" />
- <projectName>xRM-Basic2019</projectName>
- <jditoMaxContentSize v="57671680" />
- <mailDefaultMailserver>mailServerIMAP</mailDefaultMailserver>
- <mailRepositoryAlias>defaultDbRepository</mailRepositoryAlias>
- <calendarCategoriesEvent>
- <entry>
- <key>Meeting</key>
- <value></value>
- </entry>
- <entry>
- <key>Organisation</key>
- <value></value>
- </entry>
- <entry>
- <key>auswärts</key>
- <value></value>
- </entry>
- <entry>
- <key>Urlaub</key>
- <value></value>
- </entry>
- </calendarCategoriesEvent>
- <clientSearchOptimizedForSpeed v="true" />
- <clientSearchExcludeForIgnorecase v="true" />
- <neonClientPermissionsEnabled v="true" />
- <blobHandlingMethod>DATABASE</blobHandlingMethod>
- <databaseAuditGetOldValueLobs v="false" />
- <indexsearchGlobalEnabled v="true" />
- <indexsearchFullIndexerEnabled v="true" />
- <indexsearchFullIndexerInterval v="0" />
- <indexsearchIncrementingIndexerEnabled v="true" />
- <indexsearchIncrementingIndexerInterval v="1000" />
- <indexsearchIncrementingIndexerBunchSize v="250" />
- <indexsearchMaximumHits v="50000" />
- <customProperties>
- <customBooleanProperty>
- <name>addressValidation.enable</name>
- <property v="true" />
- </customBooleanProperty>
- <customStringProperty>
- <name>addressValidation.url</name>
- <property>https://services.aditosoftware.local/services/rest/ws_checkAddress</property>
- </customStringProperty>
- <customStringProperty>
- <name>addressValidation.user</name>
- <property>Admin</property>
- </customStringProperty>
- <customStringProperty>
- <name>addressValidation.pw</name>
- <property>a</property>
- </customStringProperty>
- <customStringProperty>
- <name>addressValidation.countryParamName</name>
- <property>country</property>
- </customStringProperty>
- <customBooleanProperty>
- <name>zipCityValidation.enable</name>
- <property v="true" />
- </customBooleanProperty>
- <customStringProperty>
- <name>zipCityValidation.url</name>
- <property>https://services.aditosoftware.local/services/rest/ws_checkZipCity</property>
- </customStringProperty>
- <customStringProperty>
- <name>zipCityValidation.user</name>
- <property>Admin</property>
- </customStringProperty>
- <customStringProperty>
- <name>zipCityValidation.pw</name>
- <property>a</property>
- </customStringProperty>
- <customStringProperty>
- <name>zipCityValidation.countryParamName</name>
- <property>country</property>
- </customStringProperty>
- <customBooleanProperty>
- <name>phoneValidation.enable</name>
- <description></description>
- <property v="true" />
- </customBooleanProperty>
- <customStringProperty>
- <name>phoneValidation.url</name>
- <description></description>
- <property>https://services.aditosoftware.local/services/rest/ws_checkPhoneNumber</property>
- </customStringProperty>
- <customStringProperty>
- <name>phoneValidation.user</name>
- <property>Admin</property>
- </customStringProperty>
- <customStringProperty>
- <name>phoneValidation.pw</name>
- <property>a</property>
- </customStringProperty>
- <customStringProperty>
- <name>phoneValidation.countryParamName</name>
- <property>Country</property>
- </customStringProperty>
- </customProperties>
-</preferences>
+<?xml version="1.0" encoding="UTF-8"?>
+<preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0">
+ <name>_____PREFERENCES_PROJECT</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <mailGlobalUserServerEnabled v="true" />
+ <projectName>xRM-Basic2019</projectName>
+ <jditoMaxContentSize v="57671680" />
+ <mailEnableUserDefault v="true" />
+ <mailDefaultMailserver>mailServerIMAP</mailDefaultMailserver>
+ <mailRepositoryAlias>defaultDbRepository</mailRepositoryAlias>
+ <calendarCategoriesEvent>
+ <entry>
+ <key>Meeting</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>Organisation</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>auswärts</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>Urlaub</key>
+ <value></value>
+ </entry>
+ </calendarCategoriesEvent>
+ <clientSearchOptimizedForSpeed v="true" />
+ <clientSearchExcludeForIgnorecase v="true" />
+ <neonClientPermissionsEnabled v="true" />
+ <blobHandlingMethod>DATABASE</blobHandlingMethod>
+ <databaseAuditGetOldValueLobs v="false" />
+ <indexsearchGlobalEnabled v="true" />
+ <indexsearchFullIndexerEnabled v="true" />
+ <indexsearchFullIndexerInterval v="0" />
+ <indexsearchIncrementingIndexerEnabled v="true" />
+ <indexsearchIncrementingIndexerInterval v="1000" />
+ <indexsearchIncrementingIndexerBunchSize v="250" />
+ <indexsearchMaximumHits v="50000" />
+ <customProperties>
+ <customBooleanProperty>
+ <name>phoneValidation.enable</name>
+ <description></description>
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>phoneValidation.url</name>
+ <description></description>
+ <property>https://services.aditosoftware.local/services/rest/ws_checkPhoneNumber</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>phoneValidation.user</name>
+ <property>Admin</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>phoneValidation.pw</name>
+ <property>a</property>
+ </customStringProperty>
+ <customStringProperty>
+ <name>phoneValidation.countryParamName</name>
+ <property>Country</property>
+ </customStringProperty>
+ <customBooleanProperty>
+ <name>nominatim.enable</name>
+ <property v="true" />
+ </customBooleanProperty>
+ <customStringProperty>
+ <name>nominatim.url</name>
+ <property>https://nominatim.openstreetmap.org/search</property>
+ </customStringProperty>
+ </customProperties>
+</preferences>
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 174dfc5ff20cada09eeae3c7f92fa5802f1907cc..6ba7d0f70939e7a9442990a186057dc5cbbf0627 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -102,48 +102,6 @@ TaskUtils.hasTasks = function(pRowId, pObjectType)
return true;
}
-/**
- * Sets the code of the given Task to the current max-code + 1
- */
-TaskUtils.setCode = function(pTaskId)
-{
- var max = db.cell("select max(CODE) from TASK");
- if (!max)
- max = -1;
-
- db.updateData("TASK", ["CODE"], null, [parseInt(max)+1], SqlCondition.equals("TASK.TASKID", pTaskId, "1=2"));
-}
-
-TaskUtils.getTypeGroup = function(pType)
-{
- return KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "group", "Task");
-}
-
-TaskUtils.typeHasAttributes = function(pType)
-{
- return TaskUtils.getTypeAttributes(pType).length > 0;
-}
-
-TaskUtils.getTypeAttributes = function(pType)
-{
- return JSON.parse(KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "attributes", "[]"));
-}
-
-TaskUtils.getAvailableStatus = function(pType)
-{
- return JSON.parse(KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "availableStatus", ""));
-}
-
-TaskUtils.getDefaultStatus = function(pType)
-{
- return KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "defaultStatus", "");
-}
-
-TaskUtils.getShowCode = function(pType)
-{
- return KeywordUtils.getAttributeRelation(pType, $KeywordRegistry.taskType(), "showCode", true);
-}
-
TaskUtils.getStatusIcon = function(pStatus)
{
return KeywordUtils.getAttributeRelation(pStatus, $KeywordRegistry.taskStatus(), "icon", "NEON:STATUS_NOT_STARTED");
diff --git a/process/Attribute_lib/process.js b/process/Attribute_lib/process.js
index 07375e5e5e697211bcaa5b96d23bbae459433932..36b69c7ea52e0544c18732c86b7b81f20019cdfd 100644
--- a/process/Attribute_lib/process.js
+++ b/process/Attribute_lib/process.js
@@ -66,8 +66,9 @@ AttributeUtil.getPossibleAttributes = function (pObjectType, pIncludeGroups, pFi
}
if (!pIncludeGroups)
- attrCond.and("ATTRIBUTE_TYPE != '" + $AttributeTypes.GROUP + "'");
+ attrCond.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.GROUP, "# != ?");
+ attrCond.andPrepare("AB_ATTRIBUTE.ATTRIBUTE_TYPE", $AttributeTypes.COMBOVALUE, "# != ?");
var attributes = db.array(db.COLUMN, attrCond.buildSql(attrSql));
return attributes;
@@ -161,7 +162,7 @@ AttributeUtil.getAllChildren = function (pAttributeIds)
while (pAttributeIds.length > 0)
{
pAttributeIds = db.array(db.COLUMN, SqlCondition.begin()
- .and("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID in ('" + pAttributeIds.join("','") + "')")
+ .andIn("AB_ATTRIBUTE.ATTRIBUTE_PARENT_ID", pAttributeIds)
.buildSql("select AB_ATTRIBUTEID from AB_ATTRIBUTE")
);
if (pAttributeIds.length > 0)
diff --git a/process/Bulkmail_lib/Bulkmail_lib.aod b/process/Bulkmail_lib/Bulkmail_lib.aod
index 508b769dece1de25c725b2ec0dc92527ff1f17a7..0befb2a734840466905596858a7e558a4052f232 100644
--- a/process/Bulkmail_lib/Bulkmail_lib.aod
+++ b/process/Bulkmail_lib/Bulkmail_lib.aod
@@ -1,6 +1,6 @@
<?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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
- <name>BulkMail_lib</name>
+ <name>Bulkmail_lib</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<process>%aditoprj%/process/Bulkmail_lib/process.js</process>
<alias>Data_alias</alias>
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index 49290ffaef9ab4092b94476882052e1aaf7b0865..0f60eb164cb65562896e41009d5f0cc57ee09e7e 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -1,52 +1,128 @@
+import("system.datetime");
+import("system.neon");
+import("Employee_lib");
+import("system.vars");
import("KeywordRegistry_basic");
import("Sql_lib");
import("system.db");
import("DocumentTemplate_lib");
import("Email_lib");
-
+import("system.process");
function BulkMailUtils () {}
+/**
+ * Executes a process to send bulk mails on the server and creates a notification when finished.
+ *
+ * @param {String} pBulkMailId id of the bulk mail
+ * @param {String} [pUser=currentUser] User that will get the notification, if null (not undefined!), no notification
+ * will be created.
+ */
+BulkMailUtils.sendBulkMailOnServer = function (pBulkMailId, pUser)
+{
+ if (pUser === undefined)
+ pUser = EmployeeUtils.getCurrentUserId();
+ process.execute("sendBulkMail_serverProcess",
+ {
+ bulkMailId : pBulkMailId,
+ user : pUser || ""
+ }
+ );
+}
+
+/**
+ * Sends a bulk mail. You should only call this function on the server because it
+ * can take some time to execute, use BulkMailUtils.sendBulkMailOnServer instead.
+ *
+ * @param {String} pBulkMailId id of the bulk mail
+ *
+ * @return {Object} count of sucessful and failed mails
+ */
BulkMailUtils.sendBulkMail = function (pBulkMailId)
{
- var templateId = db.cell(SqlCondition.begin()
+ //TODO: Mailbridge, Werbesperre beachten
+
+ var [templateId, subject, sender] = db.array(db.ROW, SqlCondition.begin()
.andPrepare("BULKMAIL.BULKMAILID", pBulkMailId)
- .buildSql("select DOCUMENTTEMPLATE_ID from BULKMAIL", "1=2")
+ .buildSql("select DOCUMENTTEMPLATE_ID, SUBJECT, SENDER from BULKMAIL", "1=2")
);
- var template = DocumentTemplate.loadTemplate(templateId);
+ var template = DocumentTemplate.loadTemplate(templateId); //TODO: check if the bulk mail itself has a document and prefer this
var emailSender;
var recipientData = db.table(SqlCondition.begin()
.andPrepare("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
- //TODO: more condition
+ .andPrepare("BULKMAILRECIPIENT.STATUS", $KeywordRegistry.bulkMailRecipientStatus$sent(), "# != ?")
+ //and no advertising ban
.buildSql("select BULKMAILRECIPIENTID, CONTACT_ID, '' from BULKMAILRECIPIENT", "1=2")
);
-
+ var contactIds = recipientData.map(function (e) {return e[1];});
var successIds = [];
var failedIds = [];
- var mails = template.getReplacedEmailsByContactIds(recipientData.map(function (e) {return e[0];}));
+ var sentDate = vars.get("$sys.date");
+ var mails = template.getReplacedEmailsByContactIds(contactIds);
+
+ var subjectTemplate = new DocumentTemplate(subject, DocumentTemplate.types.PLAIN);
+ var subjects = subjectTemplate.getReplacedContentByContactIds(contactIds);
+
for (let i = 0, l = recipientData.length; i < l; i++)
{
+ let isSuccess = false;
let contactId = recipientData[i][1];
let email = mails[contactId];
- email.toRecipients = [recipientData[i][1]];
- email.sender = emailSender;
-
- let isSuccess = email.send();
+ if (email !== undefined)
+ {
+ email.toRecipients = [recipientData[i][2]]; //TODO: email address missing
+ email.sender = emailSender;
+ email.subject = subjects[contactId];
+ email.sender = sender;
+
+ isSuccess = email.send();
+ }
if (isSuccess)
successIds.push(recipientData[i][0]); //set the recipient status to 'sent'
else
failedIds.push(recipientData[i][0]); //set the recipient status to 'failed'
}
- db.updateData("BULKMAILRECIPIENT", ["STATUS"], null, [$KeywordRegistry.bulkMailSentStatus$sent()],
+ db.updateData("BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$sent(), sentDate],
SqlCondition.begin()
.andIn("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", successIds)
.build("1=2")
);
- db.updateData("BULKMAILRECIPIENT", ["STATUS"], null, [$KeywordRegistry.bulkMailSentStatus$failed()],
+ db.updateData("BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$failed(), sentDate],
SqlCondition.begin()
.andIn("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", failedIds)
.build("1=2")
);
+
+ db.updateData("BULKMAIL", ["STATUS"], null, [$KeywordRegistry.bulkMailStatus$sent()],
+ SqlCondition.equals("BULKMAIL.BULKMAILID", pBulkMailId, "1=2"));
+
+ return {
+ sucessful : successIds.length,
+ failed : failedIds.length
+ };
+}
+
+BulkMailUtils.openAddRecipientView = function (pContactIds)
+{
+ var params = {
+ "ContactIds_param" : pContactIds
+ };
+ neon.openContext("BulkMailAddRecipients", null, null, neon.OPERATINGSTATE_NEW, params);
+}
+
+
+BulkMailUtils.getCommRestrictionCondition = function (pPositive)
+{
+ var currentDate = datetime.date();
+ var existsQuery = SqlCondition.begin()
+ .andPrepare("COMMRESTRICTION.MEDIUM", $KeywordRegistry.communicationMediumCampaign$mail())
+ .andPrepare("COMMRESTRICTION.STARTDATE", currentDate, "# <= ?")
+ .and("COMMRESTRICTION.CONTACT_ID = CONTACT.CONTACTID or COMMRESTRICTION.CONTACT_ID = CONTACT.PERSON_ID")
+ .buildSql("exists(select COMMRESTRICTIONID from COMMRESTRICTION", "1=2", ")");
+ existsQuery = db.translateCondition(existsQuery);
+ if (!pPositive)
+ existsQuery = "not " + existsQuery;
+ return SqlCondition.begin().and(existsQuery);
}
\ No newline at end of file
diff --git a/process/Classification_lib/process.js b/process/Classification_lib/process.js
index cb22a4d300ddb1e1f827dbcde5a0c0d04eb1cb3a..40778a43d2f04f90f496c5edf6f682bb97815550 100644
--- a/process/Classification_lib/process.js
+++ b/process/Classification_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.db");
import("Sql_lib");
@@ -18,7 +19,7 @@ function ClassificationUtils() {}
* @param {String} pObjectRowid the rowid
* @param {String} [pClassificationGroup=undefined] the classification group. If it is undefined, the classification for all groups are returned as Object(-map)
*
- * @return {Object} return all scores as Object-map. E.g. {"scoreGroup1": "A", "scoreGroup2": "C"}
+ * @return {Object} return all scores as Object-map. E.g. {"scoreGroup1": 0, "scoreGroup2": 20}
*/
ClassificationUtils.getScore = function(pClassificationType, pObjectType, pObjectRowid, pClassificationGroup)
{
diff --git a/process/Communication_lib/process.js b/process/Communication_lib/process.js
index 6ca87445428065c65c1cd1f95ccbba05b15e731e..a22c886fc5f2c8c30ad92dc1c01f14e2011a0b7c 100644
--- a/process/Communication_lib/process.js
+++ b/process/Communication_lib/process.js
@@ -202,14 +202,14 @@ CommValidationUtil.makeValidationFn = function (commCategory)
switch (commCategory) {
case "EMAIL":
callbackFn = function (addrValue){
- if (!mail.isValidMailAddress(addrValue, true)) //TODO: enable JDito-methods
+ if (!mail.isValidMailAddress(addrValue, true))
return translate.text("no valid mail-address format");
return null;
}
break;
case "LINK":
callbackFn = function (addrValue){
- if (!net.isValidUrl(addrValue, ["http", "https"]))//TODO: enable JDito-methods
+ if (!net.isValidUrl(addrValue, ["http", "https"]))
return translate.text("no valid format");
return null;
}
diff --git a/process/Contact_lib/process.js b/process/Contact_lib/process.js
index 5cca68dfd2b81d5023746b9596a1ca2a1a78baa1..3ea1aece0b5db28903cd7bb956432c8dff4d2e4a 100644
--- a/process/Contact_lib/process.js
+++ b/process/Contact_lib/process.js
@@ -292,6 +292,24 @@ ContactUtils.getPersOrgIds = function(pContactId)
return [];
}
+/**
+ * get the contactId from the OrganisationId
+ *
+ * @param {String} pOrgId
+ * @return {String} the contactId or ""
+ */
+ContactUtils.getOrgContactId = function(pOrgId)
+{
+ if (pOrgId) {
+ return db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.ORGANISATION_ID", pOrgId)
+ .and("CONTACT.PERSON_ID is null")
+ .buildSql("select CONTACTID from CONTACT", "1=0"));
+ }
+
+ return "";
+}
+
/**
* get the name of the person or organisation
*
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index f07f6a3eee6cb52af5e36d193f7bce48bc32d646..eb26eb95de977fa00f1f05bb991aa7468358111b 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -8,6 +8,7 @@ import("Keyword_lib");
import("Sql_lib");
import("Proto_lib");
import("Contact_lib");
+import("KeywordRegistry_basic");
/**
* Methods to manage contexts.
@@ -25,15 +26,17 @@ function ContextUtils() {}
*/
ContextUtils.getCurrentContextId = function()
{
- var entityName = vars.getString("$sys.currententityname");
- // TODO: replace with Core-method instead of switch-case!!!
-
- // TODO: workaround: remove "entity" and add "context". This is a Workaround and has to be changed (see above todo)!
- return entityName.substr(0, entityName.length-7);
+ return vars.getString("$sys.currentcontextname");
+}
+ContextUtils.getTitle = function(pContextId)
+{
+ return project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId)[1];
+}
-
- // return vars.getString("$sys.currentcontextname");
+ContextUtils.getIcon = function(pContextId)
+{
+ return project.getDataModel(project.DATAMODEL_KIND_CONTEXT, pContextId)[5];
}
/**
@@ -378,7 +381,7 @@ ContextUtils.getSelectMap = function()
.setJoinExpression("join CONTACT on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null")
.setCondition(SqlCondition.begin().and("ORGANISATION.ORGANISATIONID != '0'"))
.setSubContexts({
- "Person": ["select CONTACTID from CONTACT where PERSON_ID is not null and", "CONTACT.ORGANISATION_ID", '', ["Offer", "Contract"]]
+ "Person": ["select CONTACTID from CONTACT where PERSON_ID is not null and", "CONTACT.ORGANISATION_ID", '', ["Offer", "Order", "Contract", "SupportTicket"]]
})
,"Person": ContextSelector.create("CONTACT", "CONTACTID")
.setTitleExpression(maskingUtils.concat([
@@ -403,7 +406,7 @@ ContextUtils.getSelectMap = function()
.setContactIdField("CONTACT_ID")
.setCreationDateField("STARTDATE")
.setStateField("STATE")
- .setActiveStates(["483bcaeb-1e5b-4772-b54e-7d7d8aa65712", "23d38486-4cce-41ce-a8df-164ad44df706"])
+ .setActiveStates([$KeywordRegistry.salesprojectState$open(), $KeywordRegistry.salesprojectState$postponed()])
,"Contract": ContextSelector.create("CONTRACT", "CONTRACTID")
.setTitleExpression(maskingUtils.concat([
KeywordUtils.getResolvedTitleSqlPart("ContractType", "CONTRACTTYPE"),
@@ -412,7 +415,7 @@ ContextUtils.getSelectMap = function()
.setContactIdField("CONTACT_ID")
.setCreationDateField("CONTRACTSTART")
.setStateField("CONTRACTSTATUS")
- .setActiveStates(["e12d37e9-3429-40b5-973b-c1569843ca46", "3579eb0c-d8ca-4b6b-85ee-f1800a9301eb", "4c63c82d-0276-4c12-9937-13fd361ad786"])
+ .setActiveStates([$KeywordRegistry.contractState$validLimited(), $KeywordRegistry.contractState$validUnlimited(), $KeywordRegistry.contractState$notSigned()])
,"Offer": ContextSelector.create("OFFER", "OFFERID")
.setTitleExpression(maskingUtils.concat([
"'" + translate.text("Offer") + "'",
@@ -434,7 +437,9 @@ ContextUtils.getSelectMap = function()
maskingUtils.cast("VERSNR", SQLTYPES.VARCHAR, 10)
], "", false))
.setContactIdField("CONTACT_ID")
- .setCreationDateField("ORDERDATE")
+ .setCreationDateField("SALESORDERDATE")
+ .setStateField("STATUS")
+ .setActiveStates([])
,"Product": ContextSelector.create("PRODUCT", "PRODUCTID")
.setTitleExpression(maskingUtils.concat([
"PRODUCTCODE",
@@ -449,9 +454,22 @@ ContextUtils.getSelectMap = function()
"left join CAMPAIGNSTEP on CAMPAIGNSTEP.CAMPAIGNSTEPID = CAMPAIGNPARTICIPANT.CAMPAIGNSTEP_ID")
.setCreationDateField("CAMPAIGNSTEP.DATE_START")
.setStateField("CAMPAIGN.STATE")
- .setActiveStates(["e04c9c59-0590-463c-a10e-e25c583e9cf2", "42e1ee2b-0108-4ccf-ab43-29cbcb0377bf"])
+ .setActiveStates([$KeywordRegistry.campaignState$planning(), $KeywordRegistry.campaignState$approved()])
,"CampaignStep" : ContextSelector.create("CAMPAIGNSTEP", "CAMPAIGNSTEPID", "NAME")
-
+ ,"SupportTicket": ContextSelector.create("TICKET", "TICKETID", "TASK.SUBJECT")
+ .setJoinExpression("left join TASK on TASK.TASKID = TICKET.TASK_ID")
+ .setCondition(SqlCondition.begin().andPrepare("TICKET.TICKETTYPE", $KeywordRegistry.ticketType$supportTicket()))
+ .setContactIdField("TASK.REQUESTOR_CONTACT_ID")
+ .setStateField("TASK.STATUS")
+ .setActiveStates([
+ $KeywordRegistry.taskStatus$new(),
+ $KeywordRegistry.taskStatus$unassigned(),
+ $KeywordRegistry.taskStatus$assigned(),
+ $KeywordRegistry.taskStatus$inProgress(),
+ $KeywordRegistry.taskStatus$waiting(),
+ $KeywordRegistry.taskStatus$customerChecks(),
+ ])
+ .setCreationDateField("TASK.START_DATE")
}
}
@@ -517,6 +535,7 @@ ContextUtils.getContextDataSql = function(pContextId, pContactId, pWithDate, pAc
var cond = SqlCondition.begin();
if (pContactId)
{
+ logging.log(JSON.stringify(ownContextSelector, null, "\t"))
cond.andPrepare(ownContextSelector.getFullField(ownContextSelector.contactIdField), pContactId)
}
diff --git a/process/DSGVO_lib/process.js b/process/DSGVO_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e7b8df70ea110892c5b043df6b2059da835b4cf
--- /dev/null
+++ b/process/DSGVO_lib/process.js
@@ -0,0 +1,374 @@
+import("Attribute_lib");
+import("system.logging");
+import("Keyword_lib")
+import("KeywordRegistry_basic");
+import("system.translate");
+import("Sql_lib");
+import("system.util");
+import("system.vars");
+import("system.db");
+import("system.neon");
+import("system.result");
+import("Report_lib");
+
+// TODO Funktionen aus Adito5 übernehmen und anpassen
+
+
+function getDSGVOTypes (pPerson, pTablename)
+{
+ var res = [];
+
+ var tablename = KeywordUtils.getViewValue($KeywordRegistry.DSGVOTablename(), pTablename);
+
+ if (tablename == "Adressen")
+ {
+ // TODO liefert aktuell nur eine Privatadresse, wenn mehrere Vorhanden und keine Firmenadresse
+ // Bsp Birgit Leicht
+
+ var addr = db.table(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPerson)
+ .buildSql("select ADDR_TYPE from ADDRESS join CONTACT on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID ",
+ "1 = 1", "group by ADDR_TYPE"));
+
+ addr.forEach(function (row)
+ {
+ res.push([row[0], KeywordUtils.getViewValue($KeywordRegistry.addressType(), row)]);
+ });
+ return res;
+ } else if(tablename == "Kommunikationsdaten")
+ {
+ var comm = db.table(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPerson)
+ .buildSql("select MEDIUM_ID from COMMUNICATION join CONTACT on COMMUNICATION.CONTACT_ID = CONTACTID",
+ "1 = 1", "group by MEDIUM_ID"));
+
+ comm.forEach(function (row)
+ {
+ res.push([row[0], KeywordUtils.getViewValue($KeywordRegistry.communicationMedium(), row)]);
+ });
+ return res;
+ }else if(tablename == "Eigenschaft")
+ {
+ res.push(["34c2ddb4-97ce-4683-a067-89a38643ecae", KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), "34c2ddb4-97ce-4683-a067-89a38643ecae")]);
+ return res;
+ }else if(tablename == "Persönliche Daten")
+ {
+ res.push(["dcc34a11-c86b-4acd-9987-e88c98b5b4c5", KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), "dcc34a11-c86b-4acd-9987-e88c98b5b4c5")]);
+ res.push(["c626726a-a696-4926-9b0f-c320c410463e", KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), "c626726a-a696-4926-9b0f-c320c410463e")]);
+ return res;
+ }
+
+ return res;
+}
+
+function getDSGVOValues(pPerson, pTablename, pType)
+{
+ var res = [];
+ var tablename = KeywordUtils.getViewValue($KeywordRegistry.DSGVOTablename(), pTablename);
+
+ if (tablename == "Adressen")
+ {
+ var addr = db.table(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPerson)
+ .buildSql("select ADDRESSID, ADDRESS, ADDRESSADDITION, ADDRIDENTIFIER, "
+ + "BUILDINGNO, CITY, COUNTRY, DISTRICT, REGION, STATE, ZIP, ADDR_TYPE "
+ + "from ADDRESS join CONTACT on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID", "1 = 1"));
+
+ var addrVal = "";
+
+ addr.forEach(function (addrRow)
+ {
+ if(pType == addrRow[11])
+ addrVal = addrRow[1] + " " + addrRow[2] + " " + addrRow[3] + " "+ addrRow[4] + " " +
+ addrRow[5] + " " + addrRow[6] + " " + addrRow[7] + " " +
+ addrRow[8] + " " + addrRow[9] + " " + addrRow[10];
+ res.push([addrRow[0], addrVal]);
+ });
+ return res;
+ }else if(tablename == "Kommunikationsdaten")
+ {
+ var comm = db.table(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPerson)
+ .buildSql("select COMMUNICATIONID, ADDR, MEDIUM_ID "
+ + "from COMMUNICATION join CONTACT on COMMUNICATION.CONTACT_ID = CONTACTID", "1 = 1"));
+
+ comm.forEach(function (entry)
+ {
+ if(pType == entry[2])
+ res.push([entry[2], entry[1]]);
+ });
+ }else if(tablename == "Eigenschaft")
+ {
+ var attr = AttributeRelationUtils.getAllAttributes(pPerson, "Person");
+ logging.log(attr);
+ /*attr.forEach(function (entry)
+ {
+ // TODO muss erst attr was liefern, --> leer
+ res.push(["", ""]);
+ })*/
+
+ // Keyword KeyId: ["34c2ddb4-97ce-4683-a067-89a38643ecae", KeywordUtils.getViewValue($KeywordRegistry.DSGVOType(), "34c2ddb4-97ce-4683-a067-89a38643ecae")]);
+
+ return res;
+ }else if(tablename == "Persönliche Daten")
+ {
+
+ var pers = db.table(SqlCondition.begin()
+ .andPrepare("PERSON.PERSONID", pPerson)
+ .buildSql("select PERSONID, DATEOFBIRTH, FIRSTNAME, MIDDLENAME, LASTNAME, "
+ + "GENDER, SALUTATION, TITLE, TITLESUFFIX, PICTURE "
+ + "from PERSON", "1 = 1"));
+
+ switch (pType)
+ {
+ case "dcc34a11-c86b-4acd-9987-e88c98b5b4c5": // names
+ res.push(["dcc34a11-c86b-4acd-9987-e88c98b5b4c5", (pers[0][6] + " " + pers[0][7] + " " + pers[0][8] + " " + pers[0][2] + " " + pers[0][3] + " " + pers[0][4])]);
+ return res;
+ case "c626726a-a696-4926-9b0f-c320c410463e": // Sonstige Persönliche Daten
+ res.push(["c626726a-a696-4926-9b0f-c320c410463e", (pers[0][9] + pers[0][1] + ", " + pers[0][5])]);
+ return res;
+ }
+ }
+ return res;
+
+}
+
+function getSpecificRowId(pPerson, pTablename)
+{
+ var tablename = KeywordUtils.getViewValue($KeywordRegistry.DSGVOTablename(), pTablename);
+
+ if (tablename == "Adressen")
+ {
+ return db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPerson)
+ .buildSql("select ADDRESSID from ADDRESS join CONTACT on ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID", "1 = 1"));
+ }else if(tablename == "Kommunikationsdaten")
+ {
+ return db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPerson)
+ .buildSql("select COMMUNICATIONID from COMMUNICATION join CONTACT on COMMUNICATION.CONTACT_ID = CONTACTID", "1 = 1"));
+ }else if(tablename == "Eigenschaft")
+ {
+ // TODO attribute
+ return "";
+ }else if(tablename == "Persönliche Daten")
+ {
+ return pPerson;
+ }
+ else
+ return null;
+}
+
+function openDSGVOReport(pPerson, pReportName)
+{
+ var DSGVOReport = new Report(pReportName);
+
+ // TODO: get Images implementieren
+ var imgData = ["meineFirma | Konrad-Zuse-Straße 4 | DE 84144 Geisenhausen",
+ "base64:iVBORw0KGgoAAAANSUhEUgAAAM4AAABRCAYAAACaL5lSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDA4QzAyM0IwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDA4QzAyM0MwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDhDMDIzOTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDhDMDIzQTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhF3nYoAAAlvSURBVHja7J1fjBXVHcfPJQJRoe1urQYJRBYlMUJisqwvGNjY3WgEUtN2CeWBIGb3Ju6LElsW+gA8AHe1UfuwTcBASB/Q7CZNG0tjw2pWU15kNzEBJFnLqmvQBNEbU0pbX+jve+9vlrOzM/fOnTtz78zs95P8cv/MOTPnzJzvnN/5zZ+Tu3XrliGE1MYC7gJCKBxCKBxCKBxCKBxCKBxCCIVDCIVDCIVDCIVDyDzmDq8/d+1/PY5trRB7VGyt2BqxVWLLxe4RW6JpbohdF7sq9qnYpNhFsY/Evoi6QKeOvMAWQKITToQ8LPaEWKfYBrFlVdL/SO1BsU3W/1+JnRMbE3tP7DIPHcmicLrFfia2VWxlBOuD4H6pNi32tthfxM7yEJIsCAc9yw6x7WJLYyozhNgvtlPsLbHT2hMRkjrhYPzynNhu/d4IIMxesafEToqdiGMcREhcwnlKe4AtTaoDhHpArF1sSOwdHlYSN/WGo/Niv2+iaGy2aFnyPKwkqT1OTmyf2pIE1Qdh7t+J/VjsqBgfbyWJEU5OXaMDCa0ThHxYbJHYIYqHJMVV25dg0dgc0LIS0nTh5FPWGPdxzEOaLRxEz/YkbEwTxG3bo2UnpOHCQci3XwffaWONln0FDzdptHBwcXNLiuu5RetASMOE02nKdwSknd1aF0IaIpwdGXFzVmhdCIldOLjLeXuG6rtd60RIrMLBowFLM1TfpVonQmITDh5C25rBOm/VuhESi3Dw5ObKDNZ5pdaNkFiE05nhenfy0JM4hIMI1IYM13uD4QVREoNw8DaaZRmu9zKtIyGh8HusYG3UG/pJ6w/NKy89O/P70j+nzSsn/zTz+5EHV5oHlt9rep58fFa+sQ8vmEtXps35C5/4+12PrTMP3H9v6dMGeZAX6/Cp49tsAiRK4TTsnrS771xsdj3TZTrWPeQrCtiljmnzhzfPmH//538zyyC0/l9tLonSC6wT1tmxzgxJ3q+//a4pdSTzx1Vb1SjR/Hr3L3xFY4MeCWnt3wf7d/iKxgYC+83un7vTruLhJ1H3OMsbsfHnpbdAo0Yv8rcPzpsz74/P6i3QU0AgtgA2b1pvPhQXDHltd+7MB+MzPQrSIa/tukE0mzeuN6f+/O6cOuZyubrr0tvb12bK73nDZ/cbbxwfzWKD2Tnw2l75KIiN/rHwYibvwggyobSfcO6Ju3COINDYX5axjsuNKo1PYLue+eksATy9scN0rF1T6q0AxkkYL9l8dvWaOXX1XfPZl9dK+W23zxJY1HXsUtEANK7RBDf+s1reakyJOFa7/utz6ivr6ZLlmTxBhHXVGvawmsfYYxYjf//HrHENBIMexVnmFs2cwIJr+WO33cKo64gGNKXfBzPcZo479Z2voqnU4zQENGz0DpWAaJAOLpoNxGa7dn6cv/jJbHfv/vtiqYu4ZhDN6pQd/5rdLUk/mPETQ109zo2GCOf8hUDpPr4yHTqvu8exAgQ3DCERC+d63BtGT1Ktt3G45uHK+VybmYPbDbSEc52Hn0QtnKtxb7jSuKZaWojOHvfUkt8JKjSijmT+jXEwqdOmeHuc/4bOe7OOvK46etLb24eoWI8pv4/aHhSP+IWZNRx9RX/mJd3xasvlP2wDUSo7wlUaQ8jyYrUKhClnvewceO2Yltkr4maHq0vLEXkz5SijU8duJ6jgXpf8btPfe937Q5YXNU+LpilYaSY0zUiVsrdrObD+FmsR8o1Uyx+kx5mcByeNSa/GLzauB6XdtRgH66w21rqR9aDRDJu5YWGsf1yF5pe3YeWsU2QoW6DQt6a94hLNzP6AYFRY4y7RGN0Hwypav/UXrLwtrsU91fIHFc7FeSCci67G2KIHGQehqL1CDmbK0TLnbFSQtH11brtPbdDaRqu5Hept82hAzShnveDEgN5ltZzNc2pePaFTJ5S9Fel89sewfs876zPlR+GdywAFFZcX7VYPtj5E/kCuGubcxPSBWb1D+iuto01BDwp2YreGl0vo923SEIf17LTXOqhhaHe7c+qa5VUYJRdOvg94uGxRlhMXMStdJu+u41oNyjgRMNzdoq7SNucPdc3y2pC7rBPJNtulQvkkTd7cnp2vx3iHyydUcFP2nzXkD9TjYIKmcxnubc4ZaxIqbazO2XnQbowunB0KV6m9ju2PusdALn/bfZZsVjnrZTCCtPZ+8hyHqLinLMEajzQDbtG48hcr5Q/a44AxU55zM4uMefi4Xg13FtJQJ6Qh2o16IqxwAi5ri7mcsd5vVsNguyhp/co44fPdzZTur7aQxZ0wwW5DqioczO6Mq4dZfO/Aex5uhcO3VqOr5l6EpVih0RcrbL/R5ayHqSj2RwURhdqeFZWzx5s1i62ScDAlOh706s+gcC4npHHVSoshoRDB9Fjjw7qpdq8apkTH7M5LM75fnTNeUc74rSxn5kTjXFtyGLDHUAhE1HDHeCDhYGWYEr13nginBQPwIBcfWc5UsdcKLmyLYoVB3h192mR/GvRRnwE4y5n+3qbdcnErBSvaoxbOmNjJLO9cRKGsgWehylX7rmZdlU9LOdM2RtS7ClqiFg44IfbXtO6thQvvuBkgWd7auePuRqcN8Zi5faGsWaSlnIlAw9yOS1vQIIEjmDb7frkogwMOcNWGTPnNMGl7O8zknYsX/UA+76p2NpcGB/93WBslzugFn+QTzapMWsqZMPLW/sI9ae7l3ToOChxxq2UO0HfEXjXpegAMZX118aKFNwM2SvjAqzXqUvRohPi/tdkv4khLORPU64yoONxjHNyVsD7MbUU5rzd67Nr/eqU8+8UOp2Sf/VbsiN/CU0deYKsioVgQIs9RsUMpqNshLSshkRPmZR23tFF+L7bPJG/69hsqmKNaVkISIRxHPHCBvhHbk6CAwaSOw47x0JIkCscBDfRzU76frdnTuSNcPqRBDEISLRyjDfWSKUdzMCV6o+edQagcF2hPmOzf4UAyJByn8R405bsMMCU6ZneO+8bQf5nyfXSnzdznawhJhXAcxtQQL8fszpioNurnefCMEB53wJ3bvDpOMiEch7NqGHNgotpOU54+MOw7DPCOgHMqSjyEdpmHjmRROA6X1YZ07IPpAzETGqJwmJ8GU21g1gAnpI1QMt6wiZcF4r1niJLhbTQfcfxCkkQuyFwghJDZLOAuIITCIYTCIYTCIYTCIYTCIYRQOIRQOIRQOIRQOIRQOISQWvi/AAMA9UczDEaG0p8AAAAASUVORK5CYII="]
+
+ var dsgvo = SQLCondition.begin().andPrepareValue("DSGVO.CONTACT_ID", pPerson)
+ .buildSql("select DSGVOID, ROW_ID, STATUORITYSOURCE, PURPOSE, TABLENAME, VALID_TO, CONTACT_ID "
+ + "from DSGVO", "1 = 1")
+ // getDSGVOTypes / -Values
+
+ // TODO Parameter und Felder
+ // params: adito.image.myLogo, myAddress, address, salutation, dateRequest, deadline, dateSaveTill, transmission, fromOther
+ // Felder PURPOSE, STATUORITYSOURCE, VALID_TO, TYPE, VALUE
+
+ var params = {
+ "adito.image.myLogo" : "",
+ "myAddress" : "",
+ "address" : "",
+ "salutation" : "", // ggf. lettersalutation -> Contact
+ "dateRequest" : "",
+ "deadline" : "",
+ "dateSaveTill" : "",
+ "transmission" : "",
+ "fromOther" : ""
+ };
+
+ DSGVOReport.setReportData(ReportData.begin([
+ "PURPOSE",
+ "STATUORITYSOURCE",
+ "VALID_TO",
+ "TYPE",
+ "VALUE"
+ ]));
+ DSGVOReport.addImage("myLogo", imgData[1]);
+ DSGVOReport.addReportParams(params);
+ DSGVOReport.openReport();
+}
+
+
+/**
+ * makes selected data from a private contact anonymous
+ *
+ * @param pPersId
+ * @param pContactId
+ */
+function dsgvoMkDataAnonymous(pPersId, pContactId)
+{
+ // TODO Only Data that comes from private contacts
+ // TODO ggf. nur ein Param notwendig? oder pRowId statt pPersId
+
+ //Hat die Privat-Person auch eine Funktion an einer Firma
+ var hasFunction = db.cell(SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPersId)
+ .andPrepare("CONTACT.ORGANISATION_ID", "0", "# != ?") // TODO ungleich 0, stimmt das so?
+ .build(" select count(*) from CONTACT", "1=2"));
+ // db.cell(" select count(*) from RELATION where PERS_ID = '" + pPersId + "' and ORGANISATION != '0' ");
+
+ var prompts = new Array();
+ prompts["PERSREL"] = hasFunction;
+ var jsonResult = openOkCancelDialog("DLG_CHOOSE_DATA_PRIVACY_ANONYMISATION", prompts);
+ var newAnonymCategories = new Array();
+ var updArray = [];
+
+ if (jsonResult["button"] != "ok")
+ return;
+
+ var data, values, columns, columnTypes, condition;
+
+ //Namen
+ if ((jsonResult["comp.chb_Names"] == "true"))
+ {
+ data = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPersId)
+ .build("select SALUTATION, TITLE, FIRSTNAME, MIDDLENAME, LASTNAME from PERS ", "1=2")
+ );
+ /*data = db.array(db.ROW, "select SALUTATION, TITLE, FIRSTNAME, MIDDLENAME, LASTNAME "
+ + " from PERS "
+ + " where PERSID = '" + pPersId + "'");*/
+
+ values = [dsgvoMkTextAnonymous(data[0]), dsgvoMkTextAnonymous(data[1]), dsgvoMkTextAnonymous(data[2]), dsgvoMkTextAnonymous(data[3]), dsgvoMkTextAnonymous(data[4])];
+ columns = ["SALUTATION", "TITLE", "FIRSTNAME", "MIDDLENAME", "LASTNAME"];
+ columnTypes = db.getColumnTypes("PERSON", columns);
+ condition = SqlCondition.andPrepare("PERSONID", pPersId)
+ .and("1=2");
+ //condition = "PERSONID = '" + pPersId + "'";
+ updArray.push(["PERSON", columns, columnTypes, values, condition])
+
+ newAnonymCategories.push(translate.text("Namen"));
+ }
+
+ //sonstige personenbezogene Daten
+ if (jsonResult["comp.chb_others"] == "true")
+ {
+ data = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("CONTACT.PERSON_ID", pPersId)
+ .build("select DOB, GENDER, SUFFIX, PERSINFO from PERS ", "1=2"));
+
+ /*, "select DOB, GENDER, SUFFIX, PERSINFO "
+ + " from PERS "
+ + " where PERSID = '" + pPersId + "' ")
+ */
+ values = ["", "", "", ""];
+ columns = ["DOB", "GENDER", "SUFFIX", "PERSINFO"];
+ columnTypes = db.getColumnTypes("PERS", columns);
+ condition = SqlCondition.andPrepare("PERSONID", pPersId)
+ .and("1=2");
+ //condition = "PERSID = '" + pPersId + "'";
+ updArray.push(["PERS", columns, columnTypes, values, condition])
+
+ newAnonymCategories.push(translate.text("Sonstige personenbezogene Daten"));
+ }
+
+ //Addressen
+ if(jsonResult["comp.chb_Address"] == "true")
+ {
+ data = db.table(SqlCondition.begin()
+ .andPrepare("CONTACT_ID", pContactId)
+ .build("select ADDRESS, STATE, CITY, COUNTRY, REGION, BUILDINGNO, ADDRESSADDITION, ZIP, DISTRICT, ADDRESSID "
+ + " from ADDRESS ", "1=2" ));
+
+ /*" select ADDRESS, STATE, CITY, COUNTRY, REGION, BUILDINGNO, ADDRESSADDITION, ZIP, DISTRICT, ADDRESSID "
+ + " from ADDRESS "
+ + " where RELATION_ID = '" + pContactId + "' ");
+*/
+ columns = ["ADDRESS", "STATE", "CITY", "COUNTRY", "REGION", "BUILDINGNO", "ADDRESSADDITION", "ZIP", "DISTRICT"];
+ columnTypes = db.getColumnTypes("ADDRESS", columns);
+
+ //Jede Addresse muss separat anonymisiert werden
+ for (let i = 0; i < data.length; i++) {
+ values = [dsgvoMkTextAnonymous(data[i][0]), dsgvoMkTextAnonymous(data[i][1]),
+ dsgvoMkTextAnonymous(data[i][2]), dsgvoMkTextAnonymous(data[i][3]),
+ dsgvoMkTextAnonymous(data[i][4]), dsgvoMkTextAnonymous(data[i][5]),
+ dsgvoMkTextAnonymous(data[i][6]), dsgvoMkTextAnonymous(data[i][7]),
+ dsgvoMkTextAnonymous(data[i][8])];
+
+ // TODO prüfen
+ condition = SqlCondition.andPrepare("CONTACT_ID", pContactId)
+ .andPrepare("ADDRESSID", data[i][9])
+ .and("1=2");
+ //condition = " CONTACT_ID = '" + pContactId + "' and ADDRESSID = '" + data[i][9] + "' ";
+ updArray.push(["ADDRESS", columns, columnTypes, values, condition]);
+ }
+ newAnonymCategories.push(translate.text("Adressdaten"));
+ }
+
+ //Kommunikationsdaten
+ if (jsonResult["comp.chb_Comm"] == "true")
+ {
+ data = db.table(SqlCondition.begin()
+ .andPrepare("CONTACT_ID", pContactId)
+ .build("select ADDRESS, SEARCHADDR, COMMUNICATIONID from COMMUNICATION", "1=2"));
+ //data = db.table("select ADDR, SEARCHADDR, COMMID from COMM where RELATION_ID = '" + pContactId + "'");
+
+ columns = ["ADDR", "SEARCHADDR"];
+ columnTypes = db.getColumnTypes("COMM", columns);
+
+ for (let i = 0; i < data.length; i++) {
+ values = [dsgvoMkTextAnonymous(data[i][0]), dsgvoMkTextAnonymous(data[i][1])];
+
+ condition = SqlCondition.andPrepare("CONTACT_ID", pContactId)
+ .andPrepare("COMMUNICATIONID", data[i][2]).and("1=2");
+ // TODO prüfen
+ //"RELATION_ID = '" + pContactId + "' and COMMID = '" + data[i][2] + "' ";
+
+ updArray.push(["COMM", columns, columnTypes, values, condition]);
+ }
+ newAnonymCategories.push(translate.text("Kommunikationsdaten"));
+ }
+
+ if (updArray.length > 0)
+ db.updates(updArray);
+
+ if(newAnonymCategories.length > 0)
+ {
+ subject = translate.text("DSGVO Anonymisierung");
+ info = translate.text("Folgende Daten wurden anonymisiert: " + newAnonymCategories.join(", "));
+ // TODO UX Abwarten
+ question.showMessage(info);
+ newHistory(vars.get("$global.user").relationid, getKeyValue("Intern", "HistoryMedium"), "o", subject, info, [[pContactId, 2]]);
+ }
+ else
+ question.showMessage(translate.text("Es wurden keine Daten anonymisiert."));
+}
+
+/**
+ * utility function to make a String anonymous. Replaces all letters between the first an last one with *
+ *
+ * @param {String} pText Text to be made anonymous
+ * @return {String} first and last letter from pText with (pText.length-2) stars(*) between them
+ *
+ * @example dsgvoMkTextAnonymous("Buchstabe")
+ * @exampleresult B*******e
+ */
+function dsgvoMkTextAnonymous(pText)
+{
+ if (pText == null)
+ return null;
+ if (pText.length <= 2)
+ return "**";
+
+ var res = pText.charAt(0);
+
+ for(i = 0; i < pText.length - 2; i++)
+ {
+ res += "*";
+ }
+
+ return res += pText.charAt(pText.length - 1);
+}
+
diff --git a/process/DataCaching_lib/process.js b/process/DataCaching_lib/process.js
index 5eee5316c78bcd96d5fcb1f63316cac3d1e2ef34..03cb0d54a4410f6b78a5c339bba7534f0687b1c1 100644
--- a/process/DataCaching_lib/process.js
+++ b/process/DataCaching_lib/process.js
@@ -11,7 +11,7 @@ import("system.project");
* @class
*
* @param {String} pIdentifiyingName name to identify the DataCache. This MUST be unique for one data representation (e.g. key-value pair for all Languages with key ISO2-code and value the ISO3-Code). this will affect the storage-name (=name of the global variable on the client for example)
- * @param {bool} [pKeepPerLanguage=false] if true the data is kept per locale (different storing for each requested language), false when not (every language is sharin the same stoarge because only untranslated data is kept)
+ * @param {bool} [pKeepPerLanguage=false] if true the data is kept per locale (different storing for each requested language), false when not (every language is sharing the same stoarge because only untranslated data is kept)
* @param {String} [pLocaleOverride=current language] sometimes a special locale is required, use this parameter to specify it
*
*/
@@ -37,7 +37,7 @@ function CachedData(pIdentifiyingName, pKeepPerLanguage, pLocaleOverride)
* @param {String} [pLocaleOverride=current language] sometimes a special locale is required, use this parameter to specify it
* @param {Function} pDataCallbackFunction function that is called to load the data. this functions gets 2 params: 1. if the data has to be translated 2. the locale to translate
*
- * @return {Object} returns the data you wanted (of the pDataCallbackFunction)
+ * @return {CachedData} returns the data you wanted (of the pDataCallbackFunction)
*
* @static
*/
diff --git a/process/Date_lib/process.js b/process/Date_lib/process.js
index 17211f90c49d785958443411232f61c1cebf359c..273d18b40915c0d0d8c861db68b9d32b60e278c1 100644
--- a/process/Date_lib/process.js
+++ b/process/Date_lib/process.js
@@ -20,7 +20,8 @@ function DateUtils() {}
DateUtils.validateBeginnBeforeEnd = function(pStart, pEnd) {
if (!pStart || !pEnd)
return true;
- return pStart <= pEnd;
+
+ return parseInt(pStart) <= parseInt(pEnd);
}
DateUtils.getValidationFailString = function() {
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index d4c01e318b614e7fedbb43822aac0bdf8c1db096..296b74a0d2e35cfd7eb10c557988bca193a31349 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -34,6 +34,8 @@ function DocumentTemplate (pTemplateContent, pType, pFilename)
DocumentTemplate.prototype.toString = function ()
{
+ if (this.type == DocumentTemplate.types.PLAIN)
+ return this.content;
return text.parseDocument(this.content);
}
@@ -48,22 +50,26 @@ DocumentTemplate.types = {
HTML : "html",
EML : "eml",
ODT : "odt",
- DOCX : "docx"
+ DOCX : "docx",
+ PLAIN : "plain" //for simple strings
};
/**
* Loads the content of a document template and creates a new DocumentTemplate object with that.
*
- * @param {String} pTemplateId id of the template
+ * @param {String} pAssignmentRowId id of the assignment (in most cases the document template id)
+ * @param {String} [pAssignmentTable="DOCUMENTTEMPLATE"] the LOB assignment table
*
* @return {DocumentTemplate} template object
*
* @throws {Error} if the type can't be used
*/
-DocumentTemplate.loadTemplate = function (pTemplateId)
+DocumentTemplate.loadTemplate = function (pAssignmentRowId, pAssignmentTable)
{
var alias = "_____SYSTEMALIAS";
- var templateDocument = db.getBinaryMetadata("DOCUMENTTEMPLATE", "DOCUMENT", pTemplateId, false, alias, null);
+ if (!pAssignmentTable)
+ pAssignmentTable = "DOCUMENTTEMPLATE";
+ var templateDocument = db.getBinaryMetadata(pAssignmentTable, "DOCUMENT", pAssignmentRowId, false, alias, null);
if (!templateDocument[0])
return new DocumentTemplate();
var binaryId = templateDocument[0][db.BINARY_ID];
@@ -138,13 +144,15 @@ DocumentTemplate.prototype.getReplacedContent = function (pReplacements)
return this._getReplacedODT(pReplacements);
case DocumentTemplate.types.DOCX:
return this._getReplacedDOCX(pReplacements);
+ case DocumentTemplate.types.PLAIN:
+ return DocumentTemplate._replaceText(this.content, pReplacements);
default:
return null;
}
}
/**
- * replaces the placeholders with data from the contact and returns the result
+ * replaces the placeholders with data from one contact and returns the result
*/
DocumentTemplate.prototype.getReplacedContentByContactId = function (pContactId)
{
@@ -171,11 +179,12 @@ DocumentTemplate.prototype.getReplacedContentByContactIds = function (pContactId
}
/**
- * replaces the placeholders with data from the contacts and returns the result
+ * Replaces the placeholders with data from the contacts and returns the resulting Emails.
*
* @param {Array} pContactIds contact ids
*
- * @return {Object} emails for every contactId
+ * @return {Object} Object containing the contact ids as keys and the corresponding Email
+ * objects as values
*/
DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds)
{
@@ -184,7 +193,10 @@ DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds
for (let contactId in replacements)
{
if (this.type == DocumentTemplate.types.EML)
+ {
+ //use the special function for EML to also fill subject and sender
emailObj[contactId] = this._getReplacedEML(replacements[contactId], true);
+ }
else
{
let body = this.getReplacedContent(replacements[contactId]);
@@ -195,6 +207,12 @@ DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds
}
/**
+ * Builds an object with the placeholder data for multiple contacts
+ *
+ * @param {Array} pContactIds contact ids
+ *
+ * @return {Object} Object containing the data. The structure is like {contactId : {placeholderName : replacementValue, ...}, ...}
+ *
* @private
*/
DocumentTemplate.prototype._getReplacementsByContactIds = function (pContactIds)
@@ -223,7 +241,7 @@ DocumentTemplate.prototype._getReplacementsByContactIds = function (pContactIds)
* Replaces placeholders for EML
*
* @param {Object} pReplacements mapping with replacements for every placeholder
- * @param {boolean} [pGetEmail] if true, return Email object
+ * @param {boolean} [pGetEmail] if true, return an Email object (use this if the sender and subject are required)
*
* @return {String|Email} the replaced content
*
@@ -303,6 +321,31 @@ DocumentTemplate.prototype._getReplacedODT = function (pReplacements)
body = body.replace(placeholder,
pReplacements[placeholder].replace(/\n/ig, "<text:line-break/>").replace(/&/ig, "&"), "ig");
}
+
+ //TODO: TableData
+// for (ti = 0; ti < pTableData.length; ti++)
+// {
+// var tablepos = bulkbody.indexOf( getDefaultODTplaceholer(pTableData[ti].Table, true));
+// if ( tablepos != -1 )
+// {
+// var tablebegin = bulkbody.lastIndexOf("<table:table-row", tablepos);
+// var tableend = bulkbody.indexOf("</table:table-row>", tablepos ) + 18;
+// var lasttable = bulkbody.substr( tableend );
+// var tablerow = bulkbody.substring( tablebegin, tableend );
+// bulkbody = bulkbody.substring( 0, tablebegin );
+// var tabledata = pTableData[ti].TableData[addrdata[i][0]];
+// if ( tabledata != undefined )
+// {
+// for (var tz = 0; tz < tabledata.length; tz++)
+// {
+// var table = tablerow;
+// bulkbody += relaceAdditionValues( table, pTableData[ti].Fields, tabledata[tz], pTableData[ti].Table + "." );
+// }
+// }
+// bulkbody += lasttable;
+// }
+
+
contentXml = beforeBody + body + afterBody;
pack.addToZip(pODTFileName, "content.xml", util.encodeBase64String(contentXml));
@@ -344,23 +387,6 @@ DocumentTemplate.prototype._getReplacedDOCX = function (pReplacements)
return documentData;
}
-/**
- * Provides functions for document templates
- */
-function DocumentTemplateUtils () {}
-
-/**
- * loads a document template and replaces the placeholders
- *
- * @param {String} pTemplateId id of the document template
- * @param {String} pContactId the contact whose address data is used
- */
-DocumentTemplateUtils.getSingleReplacedDocument = function (pTemplateId, pContactId)
-{
- var template = DocumentTemplate.loadTemplate(pTemplateId);
- return template.getReplacedTextByContactId(pContactId);
-}
-
/**
* functions for working with letters
*/
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index bf786a48d2025baa41d5c9ba7045d26a5cc27c6e..2dc743927ceb63b4d3cc7697d8e6f4d22a09b502 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -197,37 +197,37 @@ Email.prototype.send = function ()
{
var ENCODING = "UTF-8";
var mailId;
- try
- {
- mailId = mail.newMail();
- }
- catch(ex)
- {
- //TODO: fix this dirty workaround [waiting for #1038963], since newMail causes an error on the first call after a user logged in
- logging.log(ex);
- util.sleep(1500);
- mailId = mail.newMail();
- }
-
- if (this.toRecipients.length)
- mail.addRecipients(mailId, mail.RECIPIENT_TO, this.toRecipients);
-
- if (this.ccRecipients.length)
- mail.addRecipients(mailId, mail.RECIPIENT_CC, this.ccRecipients);
-
- if (this.bccRecipients.length)
- mail.addRecipients(mailId, mail.RECIPIENT_BCC, this.bccRecipients);
-
- if (this.subject)
- mail.setSubject(mailId, this.subject, ENCODING);
-
- if (this.body)
- mail.addText(mailId, this.body, "text/html", ENCODING, null);
- else
- mail.addText(mailId, "", "text/html", ENCODING, null);
-
try
{
+ try
+ {
+ mailId = mail.newMail();
+ }
+ catch(ex)
+ {
+ //TODO: fix this dirty workaround [waiting for #1038963], since newMail causes an error on the first call after a user logged in
+ logging.log(ex);
+ util.sleep(1500);
+ mailId = mail.newMail();
+ }
+
+ if (this.toRecipients.length)
+ mail.addRecipients(mailId, mail.RECIPIENT_TO, this.toRecipients);
+
+ if (this.ccRecipients.length)
+ mail.addRecipients(mailId, mail.RECIPIENT_CC, this.ccRecipients);
+
+ if (this.bccRecipients.length)
+ mail.addRecipients(mailId, mail.RECIPIENT_BCC, this.bccRecipients);
+
+ if (this.subject)
+ mail.setSubject(mailId, this.subject, ENCODING);
+
+ if (this.body)
+ mail.addText(mailId, this.body, "text/html", ENCODING, null);
+ else
+ mail.addText(mailId, "", "text/html", ENCODING, null);
+
mail.sendMail(mailId);
return true;
}
diff --git a/process/Employee_lib/process.js b/process/Employee_lib/process.js
index 2be8c9f21461ec1c98e0daaa7b4bf9edee59fd56..8b2729142c99c08b40186bf5b9aae89134bc8958 100644
--- a/process/Employee_lib/process.js
+++ b/process/Employee_lib/process.js
@@ -1,116 +1,127 @@
-import("system.db");
-import("Sql_lib");
-import("system.tools");
-
-/**
- * Provides functions for employees and users.j
- *
- * Do not create an instance of this!
- *
- * @class
- */
-function EmployeeUtils () {}
-
-/**
- * Returns the contact id of the current user
- *
- * @return the contact id
- */
-EmployeeUtils.getCurrentContactId = function ()
-{
- var user = tools.getCurrentUser();
- return user ? user[tools.PARAMS][tools.CONTACTID] : null;
-}
-
-/**
- * Returns the username id of the current user
- *
- * @return the username
- */
-EmployeeUtils.getCurrentUserName = function ()
-{
- var user = tools.getCurrentUser();
- return user ? user[tools.TITLE] : null;
-}
-
-EmployeeUtils.sliceUserId = function (pUserId)
-{
- return pUserId.slice(-36);
-}
-
-/**
- * generates a username from the firstname and lastname with the given structure
- *
- * @param {String} pFirstName
- * @param {String} pLastName
- * @param {String} pStructure the structure of the username, special characters:
- * f - one letter of the firstname in lowercase
- * F - one letter of the firstname in uppsercase
- * l - one letter of the lastname in lowercase
- * L - one letter of the lastname in uppsercase
- * f+ - the complete firstname in lowercase
- * F+ - the complete firstname
- * l+ - the complete lastname in lowercae
- * L+ - the complete lastname
- *
- * @return {String} the generated username
- */
-EmployeeUtils.generateUserName = function (pFirstName, pLastName, pStructure)
-{
- if (!pStructure || (!pFirstName && !pLastName))
- return null;
-
- var firstNameIndex = 0;
- var lastNameIndex = 0;
- var userName = pStructure.replace(/(f\+|l\+|f|l)/ig, function (type)
- {
- switch (type)
- {
- case "f+":
- return pFirstName.toLowerCase() || "";
- case "F+":
- return pFirstName || "";
- case "l+":
- return pLastName.toLowerCase() || "";
- case "L+":
- return pLastName || "";
- case "f":
- return pFirstName.charAt(firstNameIndex++).toLowerCase() || "";
- case "F":
- return pFirstName.charAt(firstNameIndex++).toUpperCase() || "";
- case "l":
- return pLastName.charAt(lastNameIndex++).toLowerCase() || "";
- case "L":
- return pLastName.charAt(lastNameIndex++).toUpperCase() || "";
- }
- });
-
- return userName;
-}
-
-/**
- * checks if an employee is used somewhere
- *
- * @param {String} pContactId the contact id of the user
- *
- * @return {boolean} if the employee has relations
- */
-EmployeeUtils.hasRelations = function (pContactId)
-{
- //sql queries with selects on tables where an employee can be used
- var queries = [
- SqlCondition.begin()
- .andPrepare("ACTIVITY.RESPONSIBLE", pContactId)
- .buildSql("select 1 from ACTIVITY"),
- SqlCondition.begin()
- .andPrepare("TASK.REQUESTOR_CONTACT_ID", pContactId)
- .buildSql("select 1 from TASK"),
- SqlCondition.begin()
- .andPrepare("TIMETRACKING.CONTACT_ID", pContactId)
- .buildSql("select 1 from TIMETRACKING")
- ];
- return queries.some(function (sql)
- {
- return db.cell(sql) != "";
- });
+import("system.db");
+import("Sql_lib");
+import("system.tools");
+
+/**
+ * Provides functions for employees and users.j
+ *
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function EmployeeUtils () {}
+
+/**
+ * Returns the contact id of the current user
+ *
+ * @return the contact id
+ */
+EmployeeUtils.getCurrentContactId = function ()
+{
+ var user = tools.getCurrentUser();
+ return user ? user[tools.PARAMS][tools.CONTACTID] : null;
+}
+
+/**
+ * Returns the username id of the current user
+ *
+ * @return the username
+ */
+EmployeeUtils.getCurrentUserName = function ()
+{
+ var user = tools.getCurrentUser();
+ return user ? user[tools.TITLE] : null;
+}
+
+/**
+ * Returns the username id of the current user
+ *
+ * @return the username
+ */
+EmployeeUtils.getCurrentUserId = function ()
+{
+ var user = tools.getCurrentUser();
+ return user ? user[tools.NAME] : null;
+}
+
+EmployeeUtils.sliceUserId = function (pUserId)
+{
+ return pUserId.slice(-36);
+}
+
+/**
+ * generates a username from the firstname and lastname with the given structure
+ *
+ * @param {String} pFirstName
+ * @param {String} pLastName
+ * @param {String} pStructure the structure of the username, special characters:
+ * f - one letter of the firstname in lowercase
+ * F - one letter of the firstname in uppsercase
+ * l - one letter of the lastname in lowercase
+ * L - one letter of the lastname in uppsercase
+ * f+ - the complete firstname in lowercase
+ * F+ - the complete firstname
+ * l+ - the complete lastname in lowercae
+ * L+ - the complete lastname
+ *
+ * @return {String} the generated username
+ */
+EmployeeUtils.generateUserName = function (pFirstName, pLastName, pStructure)
+{
+ if (!pStructure || (!pFirstName && !pLastName))
+ return null;
+
+ var firstNameIndex = 0;
+ var lastNameIndex = 0;
+ var userName = pStructure.replace(/(f\+|l\+|f|l)/ig, function (type)
+ {
+ switch (type)
+ {
+ case "f+":
+ return pFirstName.toLowerCase() || "";
+ case "F+":
+ return pFirstName || "";
+ case "l+":
+ return pLastName.toLowerCase() || "";
+ case "L+":
+ return pLastName || "";
+ case "f":
+ return pFirstName.charAt(firstNameIndex++).toLowerCase() || "";
+ case "F":
+ return pFirstName.charAt(firstNameIndex++).toUpperCase() || "";
+ case "l":
+ return pLastName.charAt(lastNameIndex++).toLowerCase() || "";
+ case "L":
+ return pLastName.charAt(lastNameIndex++).toUpperCase() || "";
+ }
+ });
+
+ return userName;
+}
+
+/**
+ * checks if an employee is used somewhere
+ *
+ * @param {String} pContactId the contact id of the user
+ *
+ * @return {boolean} if the employee has relations
+ */
+EmployeeUtils.hasRelations = function (pContactId)
+{
+ //sql queries with selects on tables where an employee can be used
+ var queries = [
+ SqlCondition.begin()
+ .andPrepare("ACTIVITY.RESPONSIBLE", pContactId)
+ .buildSql("select 1 from ACTIVITY"),
+ SqlCondition.begin()
+ .andPrepare("TASK.REQUESTOR_CONTACT_ID", pContactId)
+ .buildSql("select 1 from TASK"),
+ SqlCondition.begin()
+ .andPrepare("TIMETRACKING.CONTACT_ID", pContactId)
+ .buildSql("select 1 from TIMETRACKING")
+ ];
+ return queries.some(function (sql)
+ {
+ return db.cell(sql) != "";
+ });
}
\ No newline at end of file
diff --git a/process/ImporterMappingFunctions_lib/process.js b/process/ImporterMappingFunctions_lib/process.js
index 05c4aa930bda24e17fd357797301b67bd8fce6d3..5500aa69c906c58d13b2580312cca6114070a43d 100644
--- a/process/ImporterMappingFunctions_lib/process.js
+++ b/process/ImporterMappingFunctions_lib/process.js
@@ -943,7 +943,7 @@ function iDecode(pObject)
*
* @example [(iGlobalVar {Value: "{3}", Name: "importLogin"} ) --> $global.importLogin]
*
-* @return {void}
+* @return {Boolean}
*/
function iGlobalVar(pObject)
{
@@ -957,6 +957,8 @@ function iGlobalVar(pObject)
if(pObject.Value != undefined) value = this.resolveSymbol(pObject, pObject.Value);
if(pObject.Name != undefined) name = pObject.Name;
vars.getString("$global." + name, value);
+
+ return false;
}
diff --git a/process/Importer_lib/process.js b/process/Importer_lib/process.js
index fe2913476193d23a48cf7eef1dc743a965d00756..ab241b91420723ab309c943e79039116de38b806 100644
--- a/process/Importer_lib/process.js
+++ b/process/Importer_lib/process.js
@@ -1497,7 +1497,6 @@ function batchCsvLoad(pCurrentBatchNum, pBatchSize)
var dataStr = "";
var fn = this.Config.DataFile;
var bs = pBatchSize;
- var process = this.Config.Processname;
if (!fileIO.exists(fn))
throw new Error(translate.withArguments("file '%0' does not exist or you have got no permission on this file", [fn]));
else if (!fileIO.canRead(fn))
diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index f64dd8e4970f6e1140f52cb0a14ad8c51daf8102..f1102303109f2398aac93b1d92b558973a4be6e6 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.translate");
import("system.db");
import("DataCaching_lib");
@@ -50,7 +51,7 @@ KeywordData.getKeywordAttributeRelations = function (pKeywordContainer)
var data = CachedData.make("KeywordAttributeRelationObj_" + pKeywordContainer, false, function(){
var cond = SqlCondition.begin()
.andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pKeywordContainer);
-
+
var sql = cond.buildSql("select AB_KEYWORD_ENTRY.KEYID, AB_KEYWORD_ATTRIBUTE.NAME, AB_KEYWORD_ATTRIBUTE.TYPE, \n\
AB_KEYWORD_ATTRIBUTERELATION.CHAR_VALUE, AB_KEYWORD_ATTRIBUTERELATION.LONG_CHAR_VALUE, AB_KEYWORD_ATTRIBUTERELATION.NUMBER_VALUE, AB_KEYWORD_ATTRIBUTERELATION.BOOL_VALUE \n\
from AB_KEYWORD_ENTRY \n\
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 276c521b0f52d3de505491a4868c559016d27c28..673772df7ecf7038c5cbcb13942b15843ae3ae0e 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -21,41 +21,55 @@ $KeywordRegistry.attributeType = function(){return "AttributeType";};
$KeywordRegistry.keywordAttributeType = function(){return "KeywordAttributeType";};
$KeywordRegistry.contractPayment = function(){return "ContractPayment";};
$KeywordRegistry.contractStatus = function(){return "ContractStatus";};
+$KeywordRegistry.contractState$validLimited = function(){return "CONTRACTSTATVALIDLI ";};
+$KeywordRegistry.contractState$validUnlimited = function(){return "CONTRACTSTATVALIDUNLI ";};
+$KeywordRegistry.contractState$notSigned = function(){return "CONTRACTSTATSIGN ";};
$KeywordRegistry.contractType = function(){return "ContractType";};
$KeywordRegistry.activityDirection = function(){return "ActivityDirection";};
-$KeywordRegistry.activityDirection$incoming = function(){return "BSICacti-0dir-0inc-b8a3-f43e2c73df65";};
-$KeywordRegistry.activityDirection$outgoing = function(){return "BSICacti-0dir-outg-8337-909b0f93143a";};
+$KeywordRegistry.activityDirection$incoming = function(){return "i";};
+$KeywordRegistry.activityDirection$outgoing = function(){return "o";};
$KeywordRegistry.contactStatus = function(){return "ContactStatus";};
-$KeywordRegistry.contactStatus$active = function(){return "BSIC0rel-stat-actv-ae03-b6b04430e90b";};
+$KeywordRegistry.contactStatus$active = function(){return "CONTACTSTATACTIVE";};
$KeywordRegistry.currency = function(){return "Currency";};
+$KeywordRegistry.currency$eur = function(){return "EUR ";};
$KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
$KeywordRegistry.offerStatus = function(){return "OfferStatus";};
+$KeywordRegistry.offerStatus$open = function(){return "OFFERSTATOPEN ";};
+$KeywordRegistry.offerStatus$checked = function(){return "OFFERSTATCHECK ";};
+$KeywordRegistry.offerStatus$sent = function(){return "OFFERSTATSENT ";};
+$KeywordRegistry.offerStatus$won = function(){return "OFFERSTATWON ";};
+$KeywordRegistry.offerStatus$lost = function(){return "OFFERSTATLOST ";};
$KeywordRegistry.organisationType = function(){return "OrganisationType";};
-$KeywordRegistry.organisationType$manufacturer = function(){return "dbb3f596-bd2b-4e08-baef-ba28d7b752e9";};
-$KeywordRegistry.organisationType$competitor = function(){return "eccaf9de-5c7b-4b6e-ab77-0b33d8486f29";};
-
+$KeywordRegistry.organisationType$manufacturer = function(){return "ORGMANUF";};
+$KeywordRegistry.organisationType$competitor = function(){return "ORGCOMP";};
$KeywordRegistry.personGender = function(){return "PersonGender";};
+
$KeywordRegistry.taskStatus = function(){return "TaskStatus";};
-$KeywordRegistry.taskStatus$new = function(){return "21bc4d20-1a87-4247-8f7c-8d3a09631850";};
-$KeywordRegistry.taskStatus$inProcess = function(){return "b1fd456f-f5d2-459e-b467-76e2914c8169";};
-$KeywordRegistry.taskStatus$waiting = function(){return "00595a73-22e2-4c3b-a21c-06bdec262d20";};
-$KeywordRegistry.taskStatus$ended = function(){return "7c9d6681-6cf5-4395-b276-3941b6fd0d57";};
+$KeywordRegistry.taskStatus$new = function(){return "NEW ";};
+$KeywordRegistry.taskStatus$unassigned = function(){return "UNASSIGNED ";};
+$KeywordRegistry.taskStatus$assigned = function(){return "ASSIGNED ";};
+$KeywordRegistry.taskStatus$inProgress = function(){return "IN-PROGRESS ";};
+$KeywordRegistry.taskStatus$waiting = function(){return "WAITING ";};
+$KeywordRegistry.taskStatus$ended = function(){return "ENDED ";};
+$KeywordRegistry.taskStatus$customerChecks = function(){return "CUSTOMER-CHECKS ";};
$KeywordRegistry.taskType = function(){return "TaskType";};
-$KeywordRegistry.taskType$Task = function(){return "4dee8727-8299-422e-ae41-6cdf9de2dfd7";};
-$KeywordRegistry.taskType$bugTicket = function(){return "f3da0edd-49d9-4061-98c1-8fda8631be7e";};
-$KeywordRegistry.taskType$supportTicket = function(){return "7bf77721-470f-4cdf-a6af-452bf05a405b";};
+$KeywordRegistry.taskType$task = function(){return "TASK ";};
+$KeywordRegistry.taskType$ticket = function(){return "TICKET ";};
+
+$KeywordRegistry.ticketType = function(){return "TicketType";};
+$KeywordRegistry.ticketType$supportTicket = function(){return "SUPPORTTICKET ";};
$KeywordRegistry.productPricelist = function(){return "ProductPricelist";};
$KeywordRegistry.productPricelist$standardList = function(){return "02553fc7-4611-4914-8ff5-0b7c4e7531c9";};
$KeywordRegistry.quantityUnit = function(){return "QuantityUnit";};
-$KeywordRegistry.quantityUnit$pieces = function(){return "548ffe3b-466b-4c8f-97d6-e3ad23e33344";};
+$KeywordRegistry.quantityUnit$pieces = function(){return "QUANTITYPIECES";};
$KeywordRegistry.MemberRole = function(){return "MemberRole";};
$KeywordRegistry.salesprojectSource = function(){return "SalesprojectSource";};
$KeywordRegistry.salesorderState = function(){return "SalesorderState";};
@@ -65,8 +79,8 @@ $KeywordRegistry.salesprojectProbability = function(){return "SalesprojectProbab
$KeywordRegistry.activityCategory = function(){return "ActivityCategory";};
$KeywordRegistry.addressType = function(){return "AddressType";};
-$KeywordRegistry.addressType$private = function(){return "a7466ee5-3fba-40bf-93cf-aa20a2b32ad6";};
-$KeywordRegistry.addressType$office = function(){return "b3292432-bca2-4674-8b06-b78b2b06351e";};
+$KeywordRegistry.addressType$private = function(){return "HOMEADDR";};
+$KeywordRegistry.addressType$office = function(){return "OFFICEADDR";};
$KeywordRegistry.offerProbability = function(){return "OfferProbability";};
$KeywordRegistry.communicationMedium = function(){return "CommunicationMedium";};
@@ -74,12 +88,19 @@ $KeywordRegistry.salesprojectPricePolitics = function(){return "SalesprojectPric
$KeywordRegistry.salesprojectWeakness = function(){return "SalesprojectWeakness";};
$KeywordRegistry.salesprojectStrenght = function(){return "SalesprojectStrenght";};
$KeywordRegistry.salesprojectState = function(){return "SalesprojectState";};
+$KeywordRegistry.salesprojectState$open = function(){return "SALPROJSTATOPEN ";};
+$KeywordRegistry.salesprojectState$postponed = function(){return "SALPROJSTATPOSTPONED ";};
+$KeywordRegistry.salesprojectState$aborted = function(){return "SALPROJSTATABORT ";};
+$KeywordRegistry.salesprojectState$partialOrder = function(){return "SALPROJSTATPARTIAL ";};
+$KeywordRegistry.salesprojectState$order = function(){return "SALPROJSTATORDER ";};
+$KeywordRegistry.salesprojectState$lost = function(){return "SALPROJSTATLOST ";};
$KeywordRegistry.salesprojectPhase = function(){return "SalesprojectPhase";};
+$KeywordRegistry.salesprojectPhase$nqc = function(){return "SALPROJPHASENQC ";};
$KeywordRegistry.taskPriority = function(){return "TaskPriority";};
-$KeywordRegistry.taskPriority$none = function(){return "f587f53a-72cc-4b76-9e39-276a26cab2e0";};
-$KeywordRegistry.taskPriority$low = function(){return "09072b59-d12f-469b-acbd-18a28232ff70";};
-$KeywordRegistry.taskPriority$medium = function(){return "4467b33c-3a68-4c8b-ba4a-1eb666a6c774";};
-$KeywordRegistry.taskPriority$high = function(){return "1e42f183-fb97-415f-9917-b43ca159fde4";};
+$KeywordRegistry.taskPriority$none = function(){return "TASKPRIONONE";};
+$KeywordRegistry.taskPriority$low = function(){return "TASKPRIOLOW";};
+$KeywordRegistry.taskPriority$medium = function(){return "TASKPRIOMEDIUM";};
+$KeywordRegistry.taskPriority$high = function(){return "TASKPRIOHIGH";};
$KeywordRegistry.taskProgress = function(){return "TaskProgress";};
$KeywordRegistry.taskProgress$0 = function(){return "ec92271b-eac2-4ec2-be24-ab4abde7e939";};
$KeywordRegistry.CompetitionState = function(){return "CompetitionState";};
@@ -90,25 +111,34 @@ $KeywordRegistry.contactDepartment = function(){return "ContactDepartment";};
$KeywordRegistry.contactPosition = function(){return "ContactPosition";};
$KeywordRegistry.contactContactrole = function(){return "ContactContactrole";};
$KeywordRegistry.campaignState = function(){return "CampaignManagementStates";};
-$KeywordRegistry.campaignState$planning = function(){return "e04c9c59-0590-463c-a10e-e25c583e9cf2";};
+$KeywordRegistry.campaignState$planning = function(){return "PLANNING ";};
+$KeywordRegistry.campaignState$approved = function(){return "APPROVED ";};
$KeywordRegistry.campaignStepState = function(){return "CampaignManagementStepStates";};
-$KeywordRegistry.campaignStepState$open = function(){return "bbf69673-2ec6-46f8-b231-684a31be9fbd";};
+$KeywordRegistry.campaignStepState$open = function(){return "OPEN ";};
$KeywordRegistry.campaignStepCostCategory = function(){return "CampaignManagementCostCategory";};
$KeywordRegistry.documentTemplateType = function(){return "DocumentTemplateType";};
-$KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTemplateTypeCategory";};
$KeywordRegistry.documentTemplateType$letter = function(){return "LET ";};
$KeywordRegistry.documentTemplateType$mail = function(){return "MAI ";};
$KeywordRegistry.documentTemplateType$attachment = function(){return "ATT ";};
+$KeywordRegistry.documentTemplateTypeCategory = function(){return "DocumentTemplateTypeCategory";};
+$KeywordRegistry.documentTemplateTypeCategory$single = function(){return "1 ";};
+$KeywordRegistry.documentTemplateTypeCategory$serial = function(){return "2 ";};
$KeywordRegistry.classificationType = function(){return "ClassificationType";};
-$KeywordRegistry.classificationType$salesproject = function(){return "968eafa3-3e76-4afa-8999-878e51cc3bab";};
+$KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
$KeywordRegistry.personGender = function(){return "PersonGender";};
$KeywordRegistry.personGender$other = function(){return "o";};
$KeywordRegistry.permissionCondType = function(){return "PermissionCondType";};
$KeywordRegistry.permissionAccessType = function(){return "PermissionAccessType";};
$KeywordRegistry.communicationMediumCampaign = function(){return "CommunicationMediumCampaign";};
+$KeywordRegistry.communicationMediumCampaign$mail = function(){return "CAMPAIGNEMAIL ";};
+
+$KeywordRegistry.bulkMailRecipientStatus = function(){return "BulkMailRecipientStatus";};
+$KeywordRegistry.bulkMailRecipientStatus$pending = function(){return "EMAILPENDING ";};
+$KeywordRegistry.bulkMailRecipientStatus$sent = function(){return "EMAILSENT ";};
+$KeywordRegistry.bulkMailRecipientStatus$failed = function(){return "EMAILFAILED ";};
-$KeywordRegistry.bulkMailSentStatus = function(){return "BulkMailSentStatus";};
-$KeywordRegistry.bulkMailSentStatus$pending = function(){return "9a0c5608-070e-49fb-92cd-f6abece9242d";};
-$KeywordRegistry.bulkMailSentStatus$sent = function(){return "147211fb-a1cf-49c8-8e08-c3cfe0404f9b";};
-$KeywordRegistry.bulkMailSentStatus$failed = function(){return "353e27e9-7491-4bfd-b9f9-f18f2cb2a36c";};
\ No newline at end of file
+$KeywordRegistry.bulkMailStatus = function(){return "BulkMailStatus";};
+$KeywordRegistry.bulkMailStatus$notSent = function(){return "BULKMAILNOTSENT ";};
+$KeywordRegistry.bulkMailStatus$beingSent = function(){return "BULKMAILBEINGSENT ";};
+$KeywordRegistry.bulkMailStatus$sent = function(){return "BULKMAILSENT ";};
\ No newline at end of file
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 62e96d19e0b903d9c5150fcc6e3bbe8a068ca751..e40c7c2f077d16d91f3b211d89d9714087e72410 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -173,6 +173,21 @@ KeywordUtils.exists = function(pKeyId, pContainerName)
return parseInt(db.cell(sql)) > 0;
};
+/**
+ * Get the first keyword Keyid from a container
+ *
+ * @param {String} pContainerName name of the keyword container that shall be resolved
+ * @param {String} [pLocale=current client language] specifies the locale for translating the title; can be false if nothing shalle be translated
+ *
+ * @return {String} the keyid or ""
+ */
+KeywordUtils.getFirst = function(pContainerName, pLocale)
+{
+ var keywordData = KeywordData.getSimpleData(pContainerName, pLocale);
+
+ return (keywordData && keywordData.length > 0 ? keywordData[0][0] : "");
+};
+
/**
* get the translated container name.
*
diff --git a/process/Liquibase_lib/process.js b/process/Liquibase_lib/process.js
index 5b9685c79b4dcaf1a1bb3d025be7a33beb30142c..f7656297bf61248f10f6e4f97f3ae7184ddd907d 100644
--- a/process/Liquibase_lib/process.js
+++ b/process/Liquibase_lib/process.js
@@ -43,9 +43,8 @@ LiquiUtils.exportAllTablesAsLiquibaseFiles = function(pOutFolderPath, pAuthor, p
if (ArrayUtils.hasElement(excludedTables, tables[i], true))
continue;
- var columns = db.getColumns(tables[i], alias);
var cond = null;
- LiquiUtils.exportTableAsLiquibaseFiles(pOutFolderPath, tables[i], columns, cond, pAuthor, pIncludeClearTableDirective, alias);
+ LiquiUtils.exportTableAsLiquibaseFiles(pOutFolderPath, tables[i], null, cond, pAuthor, pIncludeClearTableDirective, alias);
}
};
@@ -85,7 +84,7 @@ LiquiUtils.exportTableAsLiquibaseFiles = function(pPath, pTableName, pColumns, p
* @param {String} [pLobPath=not set] file-path where lob files and folders will be created; the folder must be on the server;
* if you've no lob-fields you don't have to specify somehing here
* @param {String} pTableName name of the DB-table that will be exported; this is also the name of the file that is stored
-* @param {Array} pColumns db-columns within the table that will be exported
+* @param {Array} [pColumns=all columns within the table] db-columns within the table that will be exported
* @param {String} [pCondition=none] db-condition to limit the data that will be exported; if nothing given the whole content will be exported
* @param {Boolean} [pIncludeClearTableDirective=false] if true, a delete element is added at the beginning of the changeset for the table
* @param {String} [pAlias=current db-alias] alias where the data will be loaded from
@@ -99,10 +98,11 @@ LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCond
//cannot be added within jdito code to the XML-object, so instead add it as string
var XML_HEADER_LINE= '<?xml version="1.1" encoding="UTF-8" standalone="no"?>';
- var dbData = db.table("select " + pColumns.join(", ") + " from " + pTableName + " " + (pCondition ? pCondition : ""), alias);
+ var columns = pColumns || db.getColumns(pTableName, alias);
+ var dbData = db.table("select " + columns.join(", ") + " from " + pTableName + " " + (pCondition ? "where " + pCondition : ""), alias);
if (dbData.length == 0)
return "";
- var colTypes = db.getColumnTypes(pTableName, pColumns, alias);
+ var colTypes = db.getColumnTypes(pTableName, columns, alias);
//every type has its function that accepts a columnName- and a value-parameter
//so let's dertermine once the corresponding funtion to its type for faster access
//(the function will only depend on the type and not change per datarow - so no need to determine the correct function per datarow)
@@ -126,7 +126,7 @@ LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCond
else
return LiquiXTable.prototype.addStrCol;
});
- var columnLen = pColumns.length;
+ var columnLen = columns.length;
var changeLogXml = LiquiXmlUtils.databaseChangeLog(author);
if (pIncludeClearTableDirective)
@@ -138,7 +138,7 @@ LiquiUtils._getDataXml = function(pAuthor, pLobPath, pTableName, pColumns, pCond
tableXml.setLobBasePath(pLobPath);
for (var i = 0; i < columnLen; i++)
{
- var colName = pColumns[i];
+ var colName = columns[i];
var value = row[i];
var fnToUse = colCallbackFn[i];
if (fnToUse != null)
diff --git a/process/Neon_lib/process.js b/process/Neon_lib/process.js
index 65e019d7c4c2bc5f6789467daf8e527f652eccab..037de6882493598ffab3c553f2efa866a9f37c68 100644
--- a/process/Neon_lib/process.js
+++ b/process/Neon_lib/process.js
@@ -1,3 +1,4 @@
+import("Date_lib");
import("system.vars");
import("system.datetime");
import("system.util");
diff --git a/process/Notification_lib/process.js b/process/Notification_lib/process.js
index 31db73ecfdc83ea1e38849c4f6b3eb6999daa893..5be0287f6d618a49ff4a52a6d0a30112122229f5 100644
--- a/process/Notification_lib/process.js
+++ b/process/Notification_lib/process.js
@@ -1,6 +1,4 @@
-
-
-
+import("system.notification");
function NotificationUtil(){}
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index e052a9b674ad3a092df5ef1a8c94606ca2151e26..134d0c80cf3fed4d900d1830b8cc2d5f8f3532d6 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -196,7 +196,7 @@ ItemUtils.prototype.roundPrice = function(pPrice) {
* @param {String} currency opt currency for price list to use
* @param {String} contactId opt contactid for price list to use (custom price list)
* @param {String[][]} additionalProductInfo additional product info, which has to be copied from the product. (e.g. INFO field is only used by offer)
- * has to be in the form: [["DESTINATION-DB-FIELD", "PRODUCT-DB-FIELD"], ...]
+ * has to be in the form: [[["identifier1", "DESTINATION-DB-SUBSELECT-OR-FIELD"], ["identifier2", "BRODUCT-DB-SUBSELECT-OR-FIELD"]], ...]
*
* @return {String[]} Array of inserted ItemIDs
*
@@ -223,8 +223,9 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
var partsList = p2pUtils.getPartsListObject();
var statements = [];
-
- columns = columns.concat(additionalProductInfo.map(function(item) {return item[0]}));
+
+ columns = columns.concat(additionalProductInfo.map(function(item) {return item[0][1]}));
+
var colTypes = db.getColumnTypes(table, columns);
if (partsList.root != undefined) // if product has a parts list
@@ -275,7 +276,7 @@ ItemUtils.prototype.insertPartsList = function(columns, productId, assignedTo, c
, pos
, itemsort]
// add aditional details
- .concat(additionalProductInfo.map(function(item) {return ProductDetails[item[1]]}));
+ .concat(additionalProductInfo.map(function(item) {return ProductDetails[item[1][0]]}));
statements.push([table, columns, colTypes, vals]);
insertedItemIds.push(newid);
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 8c1b20917651296cd102d431e245ac22ddc283d3..3c526221f7c96f469faeb7bfee1e9f24d94010f3 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.vars");
import("system.util");
import("system.datetime");
@@ -59,10 +60,15 @@ OfferUtils.getOfferNumberValidationFailString = function() {
}
OfferUtils.isEditable = function(status) {
- // TODO: Administrator darf immer �ndern, warten auf neue Berechtigungslogik?
+ // TODO: Administrator darf immer ändern, warten auf neue Berechtigungslogik?
+ // Offer should be editable if offer state not equals "Sent", "Won" or "Lost"
+ return status != $KeywordRegistry.offerStatus$sent() && status != $KeywordRegistry.offerStatus$won() && status != $KeywordRegistry.offerStatus$lost();
+}
+OfferUtils.isDeletable = function(status) {
+ // TODO: Administrator darf immer ändern, warten auf neue Berechtigungslogik?
// Offer should be editable if offer state not equals "Sent", "Won" or "Lost"
- return status != "2" && status != "3" && status != "4";
+ return status != $KeywordRegistry.offerStatus$won() && status != $KeywordRegistry.offerStatus$lost();
}
/**
@@ -444,7 +450,7 @@ OfferItemUtils.prototype.roundPrice = function(pPrice) {
/**
* For documentation, see class ItemUtils.
*/
-OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId) {
+OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCurrency, pContactId, pLanguage) {
this.initItemTree();
var cols = ["OFFERITEMID"
@@ -461,7 +467,11 @@ OfferItemUtils.prototype.insertPartsList = function(pProductId, pAssignedTo, pCu
, "ITEMPOSITION"
, "ITEMSORT"];
- return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, [["INFO", "INFO"]]]);
+ return ItemUtils.prototype.insertPartsList.apply(this, [cols, pProductId, pAssignedTo, pCurrency, pContactId, [[["info", "INFO"], ["info", db.translateStatement(SqlCondition.begin()
+ .andPrepare("DESCRIPTIONTRANSLATION.OBJECT_ROWID", pProductId)
+ .and("DESCRIPTIONTRANSLATION.OBJECT_TYPE = 'Product'")
+ .andPrepare("DESCRIPTIONTRANSLATION.LANG", pLanguage)
+ .buildSql("(select DESCRIPTION from DESCRIPTIONTRANSLATION", "1=2", ")"))]]]]);
}
/**
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index 818de7d7027bb5c0994fe4ae5743764e5a69c31f..fe4915c08ac0d696a17e7ffbbc2e4c6de2d41d8f 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -1,3 +1,4 @@
+import("Neon_lib");
import("system.vars");
import("system.util");
import("system.datetime");
diff --git a/process/Placeholder_lib/process.js b/process/Placeholder_lib/process.js
index 8b837310b6ff822c9e28911c7227b20ffa5dd5d7..a373b2b34f5eeb33eb79efdbf1a8f8f333c91bca 100644
--- a/process/Placeholder_lib/process.js
+++ b/process/Placeholder_lib/process.js
@@ -37,6 +37,9 @@ PlaceholderUtils.getPlaceholders = function ()
_addAddressFormat("senderFullAddress", "", Placeholder.targets.SENDER);
_addSqlPart("orgname", "ORGANISATION.NAME");
+ _addSqlPart("firstname", "PERSON.FIRSTNAME");
+ _addSqlPart("lastname", "PERSON.LASTNAME");
+ _addSqlPart("salutation", "PERSON.SALUTATION");
_addSqlPart("phone", CommUtil.getStandardSubSqlPhone());
_addSqlPart("email", CommUtil.getStandardSubSqlMail());
_addSqlPart("name", sqlUtil.concat(["SALUTATION", "TITLE", "FIRSTNAME", "LASTNAME"]));
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 4d5c93b08c4cce458a872e93c6955c99207d1d51..1cd3c94982b3164bfae3f19f99b69349921d1824 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.util");
import("system.SQLTYPES");
import("system.datetime");
@@ -94,8 +95,9 @@ ProductUtils.getStockCount = function(pid) {
*
* @param {String} pid req ProductID
* @param {Object} priceListFilter opt { currency: "currencyValue", quantity: "quantityValue", relationId: "relationIdValue (for custom price lists)" }
- * @param {String[]} additionalProductInfoFields additional fields from Product
- * They are added to the result with the Fieldname as key. e.g. if the array is ["INFO"] the result will contain the key "INFO"
+ * @param {String[]} additionalProductInfoSubselects additional fields from Product
+ * They are added to the result with the Fieldname as key. e.g. if the array is [["info", "INFO"]] the result will contain the key "info" which has the value of field INFO
+ * (Subqueries are also possible)
*
* @example //Product_entity, Field: PRODUCT_ID, Process: onValueChange
* var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"));
@@ -103,7 +105,7 @@ ProductUtils.getStockCount = function(pid) {
* var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
* var pUtils = new ProductUtils();
* var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), contactId: contactid };
- * var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, ["INFO"]);
+ * var ProductDetails = pUtils.getProductDetails(pid, PriceListFilter, [["info", "INFO"]]);
*
* @return {Object} { <br>
* productId: "productid" <br>
@@ -149,15 +151,15 @@ ProductUtils.getStockCount = function(pid) {
* INFO: "the productinfo"
* }
*/
-ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoFields)
+ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProductInfoSubselects)
{
- if (additionalProductInfoFields == undefined) {additionalProductInfoFields = []}
+ if (additionalProductInfoSubselects == undefined) {additionalProductInfoSubselects = []}
var ProductDetails = {};
var cols = [];
var colsProduct = ["PRODUCT.PRODUCTID", "PRODUCT.PRODUCTNAME", "PRODUCT.GROUPCODEID", "PRODUCT.UNIT"];
var defaultProductFieldCount = colsProduct.length;
- colsProduct = colsProduct.concat(additionalProductInfoFields.map(function(item) {return "PRODUCT." + item}));
+ colsProduct = colsProduct.concat(additionalProductInfoSubselects.map(function(item) {return item[1]}));
cols = cols.concat(colsProduct);
@@ -228,9 +230,9 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
// add additional fields to the details
var countPos = defaultProductFieldCount;
- additionalProductInfoFields.forEach(function(productField)
+ additionalProductInfoSubselects.forEach(function(productSubselect)
{
- this[productField] = ProductData[i][countPos];
+ this[productSubselect[0]] = ProductData[i][countPos];
countPos++;
}, ProductDetails);
}
@@ -299,22 +301,25 @@ ProductUtils.getProductDetails = function(pid, priceListFilter, additionalProduc
* @param {String} pid ProductID
* @param {Object} priceList { <br>
* priceList: "keyvalue of keyword 'PRICELIST'" <br>
- * , validFrom: TIMESTAMP <br>
- * , validTo: TIMESTAMP <br>
- * , buySell: "SP" / "PP" <br>
- * , fromQuantity: "fromquantity" <br>
- * , currency: "keyvalue of keyword 'CURRENCY'" <br>
+ * validFrom: TIMESTAMP, <br>
+ * validTo: TIMESTAMP, <br>
+ * buySell: "SP" / "PP", <br>
+ * vat: Number, <br>
+ * fromQuantity: "fromquantity", <br>
+ * currency: "keyvalue of keyword 'CURRENCY'" <br>
* }
*
* @example //Productprice_entity, Field: PRICELIST, Process: onValidation
* var pUtils = new ProductUtils();
* var priceList = {
- * priceList: ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRICELIST"))
- * , fromQuantity: vars.get("$field.FROMQUANTITY")
- * , buySell: vars.get("$field.BUYSELL")
- * , currency: vars.get("$field.CURRENCY")
- * , validFrom: vars.get("$field.VALID_FROM")
- * , validTo: vars.get("$field.VALID_TO")
+ * priceList: vars.get("$field.PRICELIST"),
+ * priceListId: vars.get("$field.PRODUCTPRICEID"),
+ * fromQuantity: vars.get("$field.FROMQUANTITY"),
+ * buySell: vars.get("$field.BUYSELL"),
+ * vat: vars.get("$field.VAT"),
+ * currency: vars.get("$field.CURRENCY"),
+ * validFrom: vars.get("$field.VALID_FROM"),
+ * validTo: vars.get("$field.VALID_TO")
* };
*
* var identicalPriceList = pUtils.checkForIndenticalPriceLists(vars.get("$field.PRODUCT_ID"), priceList);
@@ -334,10 +339,12 @@ ProductUtils.checkForIndenticalPriceLists = function(pid, priceList) {
//equal fromquantity
//equal currency
//equal pp/sp
+ //equal vat
if (priceList.priceListId != PriceLists[pricelist].priceListId
&& priceList.priceList == PriceLists[pricelist].priceList
&& parseFloat(priceList.fromQuantity) == parseFloat(PriceLists[pricelist].fromQuantity)
&& priceList.buySell == PriceLists[pricelist].buySell
+ && parseFloat(priceList.vat) == parseFloat(PriceLists[pricelist].vat)
&& priceList.currency == PriceLists[pricelist].currency) {
//identical validFrom & validTo
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index ae7bfd7d0836060686f9c879220136c012bb307f..cfb5a109638a20414127ffd5e066d2356ccd774e 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -277,6 +277,13 @@ SqlCondition.prototype.andPrepareVars = function(field, variable, cond, fieldTyp
return this;
}
+SqlCondition.prototype.andPrepareValue = function(field, value) {
+ if (value) {
+ return this.andPrepare(field, value, null, null);
+ }
+ return this;
+}
+
/**
* same as the "orPrepare"-function but with validation of adito-variables functionality
* @param {String | String[]} field the database field as "tablename.columnname"; e.g. "ORGANISATION.NAME" or as array with column-alias: ["ORGANISATION", "NAME", "myorgAlias"]
@@ -580,6 +587,250 @@ SqlCondition.equalsNot = function(pField, pValue, pAlternativeCond, pAlias) {
return SqlCondition.begin(pAlias).andPrepare(pField, pValue, "# <> ?").build(pAlternativeCond);
}
+
+/**
+ * Object for building sqls. The main purpose of this is to make it
+ * possible to use SqlCondition objects inside join conditions or sub sqls.
+ * This can also be useful to build complex sqls where parts should be added
+ * dynamically while keeping the code clear.
+ *
+ * @class
+ */
+function SqlBuilder ()
+{
+ this._query = [];
+}
+
+/**
+ * Alternative way of creating a new SqlBuilder object that allows to use
+ * methods on it directly without having to put brackets around it
+ *
+ * @return {SqlBuilder} a new SqlBuilder object
+ */
+SqlBuilder.begin = function ()
+{
+ return new SqlBuilder();
+}
+
+/**
+ * Builds the sql and uses db.translateStatement to make a string out of it.
+ * @return {String} the sql as string
+ */
+SqlBuilder.prototype.toString = function ()
+{
+ return db.translateStatement(this.build());
+}
+
+/**
+ * Adds a select clause to the sql.
+ * @param {String|String[]} pFields
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.select = function (pFields)
+{
+ this._append(pFields, "select", true);
+ return this;
+}
+
+/**
+ * Adds a select distinct clause to the sql.
+ * @param {String|String[]} pFields
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.selectDistinct = function (pFields)
+{
+ this._append(pFields, "select distinct", true);
+ return this;
+}
+
+/**
+ * Adds a from clause to the sql.
+ * @param {String} pTable
+ * @param {String} [pAlias] table alias
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.from = function (pTable, pAlias)
+{
+ if (pAlias)
+ pTable += " " + pAlias;
+ this._append(pTable, "from");
+ return this;
+}
+
+/**
+ * Adds a join clause to the sql.
+ * @param {String} pTable
+ * @param {String|String[]} pCondition The where condition. This can be
+ * a string (without the where keyword) or an array (for prepared queries).
+ * @param {String} [pAlias] table alias
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.join = function (pTable, pCondition, pAlias)
+{
+ var joinStr = "join " + pTable;
+ if (pAlias)
+ joinStr += " " + pAlias;
+ this._append(joinStr + " on");
+ this._append(pCondition);
+ return this;
+}
+
+/**
+ * Adds a left join clause to the sql.
+ * @param {String} pTable
+ * @param {String|String[]} pCondition The where condition. This can be
+ * a string (without the where keyword) or an array (for prepared queries).
+ * @param {String} [pAlias] table alias
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.leftJoin = function (pTable, pCondition, pAlias)
+{
+ var joinStr = "left join " + pTable;
+ if (pAlias)
+ joinStr += " " + pAlias;
+ this._append(joinStr + " on");
+ this._append(pCondition);
+ return this;
+}
+
+/**
+ * Adds a where clause to the sql.
+ *
+ * @param {String|String[]} pCondition The where condition. This can be
+ * a string (without the where keyword) or an array (for prepared queries).
+ *
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.where = function (pCondition)
+{
+ this._append("where");
+ this._append(pCondition);
+ return this;
+}
+
+/**
+ * Adds a order by clause to the sql.
+ * @param {String} pOrderBy
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.orderBy = function (pOrderBy)
+{
+ this._append(pOrderBy, "order by");
+ return this;
+}
+
+/**
+ * Adds another SqlBuilder object as a subquery.
+ * @param {SqlBuilder} pSubSelect
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.subSelect = function (pSubSelect)
+{
+ this._append(pSubSelect);
+ return this;
+}
+
+/**
+ * Adds a group by clause to the sql.
+ * @param {String|String[]} pFields
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.groupBy = function (pFields)
+{
+ this._append(pFields, "group by", true);
+ return this;
+}
+
+/**
+ * Adds another SqlBuilder object or select string with union.
+ * @param {SqlBuilder|String} pSelect
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.union = function (pSelect)
+{
+ this._append("union");
+ this._append(pSelect);
+ return this;
+}
+
+/**
+ * Adds another SqlBuilder object or select string with union all.
+ * @param {SqlBuilder|String} pSelect
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.unionAll = function (pSelect)
+{
+ this._append("union all");
+ this._append(pSelect);
+ return this;
+}
+
+/**
+ * Adds a having clause to the sql.
+ *
+ * @param {String|String[]} pCondition The where condition. This can be
+ * a string (without the where keyword) or an array (for prepared queries).
+ *
+ * @return {SqlBuilder} current SqlBuilder object
+ */
+SqlBuilder.prototype.having = function (pCondition)
+{
+ this._append("having");
+ this._append(pCondition);
+ return this;
+}
+
+/**
+ * adds an element
+ *
+ * @param {String|String[]|SqlBuilder} pElement the element to append
+ * @param {String} [pPrefix] string to be added before pElement
+ * @param {Boolean} [pAutoJoin] if this is true and pElement is an array, it will be automatically
+ * joined together to a string
+ *
+ * @private
+ */
+SqlBuilder.prototype._append = function (pElement, pPrefix, pAutoJoin)
+{
+ if (pAutoJoin && pElement && typeof pElement !== "string" && pElement.length !== undefined)
+ pElement = pElement.join(", ");
+ if (pPrefix)
+ pElement = pPrefix + " " + pElement;
+ this._query.push(pPrefix + " " + pElement);
+}
+
+/**
+ * builds a prepared statement out of the object
+ *
+ * @return {String[]} prepared statement
+ */
+SqlBuilder.prototype.build = function ()
+{
+ var sqlStr = "";
+ var preparedValues = [];
+
+ for (let i = 0, l = this._query.length; i < l; i++)
+ {
+ let sqlPart = this._query[i];
+ if (sqlPart instanceof SqlBuilder)
+ {
+ let condition = sqlPart.build();
+ sqlPart = "(" + condition[0] + ")";
+ preparedValues = preparedValues.concat(condition[1]);
+ }
+ //array => prepared statement
+ else if (typeof pElement !== "string" && pElement.length === 2 && pElement[1].length !== undefined)
+ {
+ preparedValues = preparedValues.concat(sqlPart[1]);
+ sqlPart = sqlPart[0];
+ }
+ sqlStr += " " + sqlPart;
+ }
+ return [sqlStr.trim(), preparedValues];
+}
+
+
+
/**
*provides functions for masking sql functions
*
diff --git a/process/Ticket_lib/Ticket_lib.aod b/process/Ticket_lib/Ticket_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5ce9c41505cb4df632f5c1d34f0bbaf80f48a171
--- /dev/null
+++ b/process/Ticket_lib/Ticket_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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>Ticket_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Ticket_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Ticket_lib/process.js b/process/Ticket_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..f5bb788424d40875e07031e69b10fc3dd4e8d727
--- /dev/null
+++ b/process/Ticket_lib/process.js
@@ -0,0 +1,157 @@
+import("system.logging");
+import("ActivityTask_lib");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.db");
+import("Sql_lib");
+
+
+/**
+ * Methods used by for tickets.
+ * Note that Tickets are built on the Task-construct so they share some similar logik.
+ *
+ * Tickets are in an extra Table 'TICKET' and the task table is joined to it. All tasks with type Ticket should be also in 'TICKET'.
+ * --> if you need all information for a Ticket, just select from TICKET left join TASK on TASK_ID = TASKID
+ *
+ * Note that all methods which do not need the ticket type are static.
+ *
+ * @param {String} pTicketType the Keyid of Keyword TicketType
+ *
+ * @class
+ */
+function TicketUtils(pTicketType)
+{
+ this.type = pTicketType;
+}
+
+/**
+ * create new instance. You can also use normal constructor. This is just for convenience.
+ * TicketUtils.begin(vars.get("$field.TICKETTYPE"))
+ * ...
+ * @param {String} pTicketType the Keyid of Keyword TicketType
+ * @return {TicketUtils}
+ */
+TicketUtils.begin = function(pTicketType)
+{
+ return new TicketUtils(pTicketType);
+}
+
+/**
+ * get the icon for the status. (from Keyword attributes)
+ * @return {String} pStatus
+ */
+TicketUtils.getStatusIcon = function(pStatus)
+{
+ return TaskUtils.getStatusIcon(pStatus);
+}
+
+/**
+ * add the links to the link-table in new mode
+ *
+ * @return {String} pObjectIdField jdito Field for the objectId
+ * @return {String} pRowIdField jdito Field for the rowId
+ * @return {String} pAdditionalLinksField jdito Field for additional links
+ */
+TicketUtils.addLinkRecords= function(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField)
+{
+ throw Error("Not implemented yet");
+ //TaskUtils.addLinkRecords(pObjectIdField, pRowIdField, pAdditionalLinksField, pParentContextField, pParentIdField, "Links");
+}
+
+/**
+ * Create a new ticket
+ */
+TicketUtils.prototype.createNewTicket = function(pRowId, pAdditionalLinks, pParentContext, pParentId, pParams)
+{
+ throw Error("Not implemented yet");
+}
+
+/**
+ * check if an object has tickets (of current ticket type)
+ * @param {String} pRowId
+ * @param {String} pObjectType
+ *
+ * @return {Boolean} true, if object is linked with at least one ticket of the given TicketType
+ */
+TicketUtils.prototype.hasTickets = function(pRowId, pObjectType)
+{
+ if (pRowId != "" && pObjectType != "")
+ {
+ var cond = SqlCondition.begin().andPrepare("TASKLINK.OBJECT_TYPE", pObjectType)
+ .andPrepare("TASKLINK.OBJECT_ROWID", pRowId)
+ .andPrepareVars("TICKET.TICKETTYPE", this.type);
+ var taskCount = db.cell(cond.buildSql("select count(*) from TASKLINK join TICKET on TICKET.TASK_ID = TASKLINK.TASK_ID"));
+ if (taskCount != "0")
+ return true;
+ else
+ return false;
+ }
+ else
+ return true;
+}
+
+/**
+ * Check if the given TicketType has attributes. (stored as keyword attribute as json array containing AtributeIds)
+ *
+ * @return {Boolean} true if the type has attributes
+ */
+TicketUtils.prototype.typeHasAttributes = function()
+{
+ return this.getTypeAttributes().length > 0;
+}
+
+/**
+ * Get all possible attributes for the given TicketType. (stored as keyword attribute as json array containing AtributeIds)
+ *
+ * @return {String[]} all possible attributes (or attribute groups) of a TicketType
+ */
+TicketUtils.prototype.getTypeAttributes = function()
+{
+ return JSON.parse(KeywordUtils.getAttributeRelation(this.type, $KeywordRegistry.ticketType(), "attributes", "[]"));
+}
+
+/**
+ * Get list of all available Status.
+ * Alle Tasks and Tickets use the same Status Keyword. This enables to use a group by / search over the full Task-table
+ *
+ * @return {String[]|null} all status keyids stored as keywordattribute of the TicketType keyword. Or null if the keywordattribute doesn't exist
+ */
+TicketUtils.prototype.getAvailableStatus = function()
+{
+ states = JSON.parse(KeywordUtils.getAttributeRelation(this.type, $KeywordRegistry.ticketType(), "availableStatus", ""))
+ if (states == null)
+ return states;
+
+ return states.map(TicketUtils._toChar36);
+}
+
+/**
+ * Get the default status stored as keywordattribute of the TicketType keyword.
+ *
+ * @return {String} the Keyid of the default status
+ */
+TicketUtils.prototype.getDefaultStatus = function()
+{
+ return TicketUtils._toChar36(KeywordUtils.getAttributeRelation(this.type, $KeywordRegistry.ticketType(), "defaultStatus", ""));
+}
+
+/**
+ * Get the default priority for the tickettype.
+ *
+ * @return {String} the keyid of the default priority
+ */
+TicketUtils.prototype.getDefaultPriority = function()
+{
+ // Imporant: if you would like to change priority/ add or remove possible priorities
+ // consider using the same construct as for status
+ // (--> using keyword attributes (e.g. whitelist) on the ticket type for making grouping over all (task /) tickets possible.
+ return $KeywordRegistry.taskPriority$low();
+}
+
+/**
+ * converts a string to a string of always 36 chars. Whitespaces are added at the end if needed.
+ */
+TicketUtils._toChar36 = function(pValue)
+{
+ return (pValue + " ").slice(0, 36);
+}
\ No newline at end of file
diff --git a/process/Timetracking_lib/process.js b/process/Timetracking_lib/process.js
index d2128cd195542977845b87086fe6bc0da1f74520..9cefd34b87c6f7bc5f432d4f084158fd36b288f3 100644
--- a/process/Timetracking_lib/process.js
+++ b/process/Timetracking_lib/process.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("system.db");
import("system.neon");
import("Context_lib");
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 7120f0e2ee9bc23d8fdc9b3de06c0680f1f923ab..d72ca6cdbaade78eb6424b3fcfda4bf0450def5d 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("system.neon");
import("system.project");
import("system.process");
@@ -495,6 +496,9 @@ NumberSequencingUtils.getMaxUniqueNumber = function(pColumn, pTable, pCondition)
/**
* functions for trees
+ * Do not create an instance of this!
+ *
+ * @class
*/
function TreeUtils () {}
@@ -566,4 +570,23 @@ TreeUtils.treeOrderBy = function(pData, pLayerIndex, pOrderByIndexes)
return 0;
})
+}
+
+/**
+ * functions for numbered codes
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function CodeUtils () {}
+/**
+ * Sets the code of the given Table to the current max-code + 1
+ */
+CodeUtils.setCode = function(pId, pTable, pIdCol, pCodeCol)
+{
+ var max = db.cell("select max(" + pCodeCol + ") from " + pTable);
+ if (!max)
+ max = -1;
+
+ db.updateData(pTable, [pCodeCol], null, [parseInt(max)+1], SqlCondition.equals(pTable + "." + pIdCol, pId, "1=2"));
}
\ No newline at end of file
diff --git a/process/WsValidation_lib/process.js b/process/WsValidation_lib/process.js
index 84e45bd713f4c658fd57c46ced08076cc21a6749..0f34bcf034364414e9877eb649cb7608060926e7 100644
--- a/process/WsValidation_lib/process.js
+++ b/process/WsValidation_lib/process.js
@@ -5,6 +5,8 @@ import("system.vars");
import("system.neon");
import("system.net");
import("system.util");
+import("system.auth");
+import("DataCaching_lib");
/**
* Class used for the webservice validation types.
@@ -12,16 +14,18 @@ import("system.util");
* Do not create new instances anywhere else than inside of the get-function!
*
* @param {String} pKey the key-name
- * @param {String} pParamName name used by the webservice
* @param {String} pWebserviceName name of the webservice. Used to find the correct webservice configuraation
* @param {Function} pProcessResultCallback function for processing Webservice-result to the return value
+ * @param {Function} pProcessRequestCallback function for processing Webservice-request
+ * @param {Object} pAdditionalInfo additional Info. Can be an object or something else. (callback specific)
*/
-function WsValidationType(pKey, pParamName, pWebserviceName, pProcessResultCallback)
+function WsValidationType(pKey, pWebserviceName, pProcessResultCallback, pProcessRequestCallback, pAdditionalInfo)
{
this.key = pKey;
- this.paramName = pParamName;
this.processResultCallback = pProcessResultCallback;
+ this.processRequestCallback = pProcessRequestCallback;
this.webserviceName = pWebserviceName;
+ this.additionalInfo = pAdditionalInfo;
}
/**
@@ -35,12 +39,12 @@ WsValidationType.get = function(pKey)
if (!this._cache)
this._cache = {
// Address lookups
- TYPE_ADDRESS: new WsValidationType("TYPE_ADDRESS", "search", "addressValidation", _processAllAddressLookup),
- TYPE_ZIP: new WsValidationType("TYPE_ZIP", "zip", "zipCityValidation", _processAddressLookup),
- TYPE_CITY: new WsValidationType("TYPE_CITY", "city", "zipCityValidation", _processAddressLookup),
+ TYPE_ADDRESS_NOMINATIM: new WsValidationType("TYPE_ADDRESS_NOMINATIM", "nominatim", _processNominatimAddressLookup, _nominatimRequest, "q"),
+ TYPE_ZIP_NOMINATIM: new WsValidationType("TYPE_ZIP_NOMINATIM", "nominatim", _processNominatimAddressLookup, _nominatimRequest, "postalcode"),
+ TYPE_CITY_NOMINATIM: new WsValidationType("TYPE_CITY_NOMINATIM", "nominatim", _processNominatimAddressLookup, _nominatimRequest, "city"),
// Communication validation
- TYPE_PHONE: new WsValidationType("TYPE_PHONE", "Number", "phoneValidation", _processCommunicationValidation)
+ TYPE_PHONE: new WsValidationType("TYPE_PHONE", "phoneValidation", _processCommunicationValidation, _customRequest, "Number")
}
if (pKey)
@@ -48,118 +52,185 @@ WsValidationType.get = function(pKey)
return this._cache;
- /**
- * [UID,
- * displayName,
- * zip,
- * city,
- * cityext,
- * country,
- * district,
- * region,
- * state,
- * street,
- * from_bn, // building number
- * to_bn, // building number
- * lon,
- * lat,
- * value // pValue
- */
- function _processAllAddressLookup(pWsResult, pValue)
+ function _processCommunicationValidation(pWsResult, pValue)
{
- var resultAddresses = [];
-
- // if error, only add the default value else parse the body
if (!WsValidationUtils._isError(pWsResult))
{
- resultAddresses = JSON.parse(pWsResult.body);
+ return pWsResult.body;
+ }
+ else
+ {
+ return pValue;
}
-
- return resultAddresses.map(function(pAddress, pIndex)
- {
- pAddress[0].value = pValue;
- pAddress[0].index = pIndex;
- var data = pAddress[0];
-
- return [
- JSON.stringify(data),
- pAddress[1],
- data.zip,
- data.city,
- data.cityext,
- data.country,
- data.district,
- data.region,
- data.state,
- data.streat,
- data.from_bn,
- data.to_bn,
- data.lon,
- data.lat,
- pValue]
- }, this);
}
- /**
- * [UID,
- * displayName,
- * zip,
- * city,
- * cityext,
- * country,
- * district,
- * region,
- * state,
- * street,
- * from_bn, // building number
- * to_bn, // building number
- * lon,
- * lat,
- * value // (the result. e.g. if pType was ZIP, the value is the found zip)
- */
- function _processAddressLookup(pWsResult, pValue)
+ function _processNominatimAddressLookup(pWsResult, pValue)
{
var resultAddresses = [];
- // if error, only add the default value else parse the body
- if (!WsValidationUtils._isError(pWsResult))
+ if (pWsResult != null)
{
- resultAddresses = JSON.parse(pWsResult.body);
+ logging.log(JSON.stringify(pWsResult, null, "\t"))
+ pWsResult.forEach(function(pPlaceData) {
+ if (pPlaceData.address == undefined)
+ pPlaceData.address = {};
+
+ var city = pPlaceData.address.town;
+ if (!city)
+ city = pPlaceData.address.city;
+ if (!city)
+ city = pPlaceData.address.village;
+ if (!city)
+ city = pPlaceData.address.hamlet;
+
+ var cityext = pPlaceData.address.suburb;
+ if (!cityext)
+ cityext = pPlaceData.address.city_district;
+
+ var addrData = [
+ pPlaceData.display_name,
+ pPlaceData.address.postcode,
+ city,
+ cityext,
+ pPlaceData.address.country_code.toUpperCase(),
+ pPlaceData.address.district,
+ pPlaceData.address.state_district,
+ pPlaceData.address.state,
+ pPlaceData.address.road,
+ pPlaceData.address.house_number,
+ pPlaceData.lon,
+ pPlaceData.lat
+ ];
+
+ resultAddresses.push([JSON.stringify(addrData.concat([pValue, pPlaceData.place_id]))].concat(addrData));
+ })
}
-
- return resultAddresses.map(function(pAddress, pIndex)
- {
- pAddress[0].index = pIndex;
- var data = pAddress[0];
- return [
- JSON.stringify(data),
- pAddress[1],
- data.zip,
- data.city,
- data.cityext,
- data.country,
- data.district,
- data.region,
- data.state,
- data.streat,
- data.from_bn,
- data.to_bn,
- data.lon,
- data.lat,
- data[this.paramName]]
- }, this);
- }
- function _processCommunicationValidation(pWsResult, pValue)
+ return resultAddresses;
+ }
+
+ /**
+ * request using a custom webservice
+ */
+ function _customRequest(pValue, pCountry)
{
- if (!WsValidationUtils._isError(pWsResult))
+ if (WsValidationUtils.isWsEnabled(this))
{
- return pWsResult.body;
+ var userName = project.getPreferenceValue("custom." + this.webserviceName + ".user");
+ var pw = project.getPreferenceValue("custom." + this.webserviceName + ".pw");
+ var url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
+ var countryParamName = project.getPreferenceValue("custom." + this.webserviceName + ".countryParamName");
+ var parameterName = this.additionalInfo;
+
+ if (!userName || !pw || !url || !countryParamName)
+ {
+ throw new Error("if the webservice " + this.key + " is enabled, you have to provide also userName, pw, url and countryParamName")
+ }
+
+ var actionType = "GET";
+
+ if (pValue)
+ {
+ // fill params
+ var parameters = {};
+ if (pCountry)
+ {
+ parameters[countryParamName] = pCountry;
+ }
+ parameters[parameterName] = pValue;
+
+ // call webservice
+ var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
+
+ // if error, log the error. But also process the result and let the callback generate the correct default value
+ if (WsValidationUtils._isError(ret))
+ {
+ logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
+ logging.log("Params: " + parameters.toSource());
+ }
+
+ // different handling of the result per type
+ return this.processResultCallback.call(this, ret, pValue);
+ }
}
- else
+ return this.processResultCallback.call(this, null, pValue);
+ }
+
+ function _nominatimRequest(pValue, pCountry)
+ {
+ var nominatimCache;
+ if (WsValidationUtils.isWsEnabled(this))
{
- return pValue;
+ var parameterName = this.additionalInfo;
+
+ if (!vars.exists("$context.nominatim"))
+ {
+ nominatimCache = {
+ last: ""
+ }
+ }
+ else
+ {
+ nominatimCache = JSON.parse(vars.getString("$context.nominatim"));
+ }
+
+ if (nominatimCache.last == parameterName + pValue + (pCountry ? pCountry : ""))
+ {
+ return nominatimCache.data;
+ }
+ else
+ {
+ nominatimCache.last = parameterName + pValue + (pCountry ? pCountry : "")
+
+ var url = project.getPreferenceValue("custom." + this.webserviceName + ".url");
+
+
+ if (!url)
+ {
+ throw new Error("if the webservice " + this.key + " is enabled, you have to provide also the url")
+ }
+
+ if (pValue)
+ {
+ var restConf = net.createConfigForRestWebserviceCall()
+ .url(url)
+ .actionType("GET")
+ .dataTypeAccept("application/json")
+ .dataTypeJDitoAccept(util.DATA_TEXT)
+ .dataTypeJDitoSend(util.DATA_TEXT)
+ .addQueryParameter("format", "json")
+ .addQueryParameter("addressdetails", "1");
+
+ // add user input params
+ if (pCountry)
+ {
+ restConf.addQueryParameter("countrycodes", pCountry)
+ }
+
+ restConf.addQueryParameter(parameterName, pValue)
+
+
+ // call webservice
+ var ret = JSON.parse(net.callRestWebservice(restConf, auth.createConfigForNoAuth()));
+
+ // if error, log the error. But also process the result and let the callback generate the correct default value
+ if (ret == null)
+ {
+ logging.log("error")
+ logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
+ }
+
+ // different handling of the result per type
+ nominatimCache.data = this.processResultCallback.call(this, ret, pValue);
+ vars.set("$context.nominatim", JSON.stringify(nominatimCache))
+ return nominatimCache.data;
+ }
+ }
}
+ nominatimCache = {}
+ nominatimCache.data = this.processResultCallback.call(this, null, pValue);
+ vars.set("$context.nominatim", JSON.stringify(nominatimCache))
+ return nominatimCache.data;
}
}
@@ -186,47 +257,7 @@ WsValidationUtils.validate = function(pValue, pType, pCountry)
if (typeof pType == "string")
pType = WsValidationType.get(pType);
- if (WsValidationUtils.isWsEnabled(pType))
- {
-
- var userName = project.getPreferenceValue("custom." + pType.webserviceName + ".user");
- var pw = project.getPreferenceValue("custom." + pType.webserviceName + ".pw");
- var url = project.getPreferenceValue("custom." + pType.webserviceName + ".url");
- var countryParamName = project.getPreferenceValue("custom." + pType.webserviceName + ".countryParamName");
-
- if (!userName || !pw || !url || !countryParamName)
- {
- throw new Error("if the webservice " + pType.key + " is enabled, you have to provide also userName, pw, url and countryParamName")
- }
-
- var actionType = "GET";
-
- if (pValue && pType)
- {
- // fill params
- var parameters = {};
- if (pCountry)
- {
- parameters[countryParamName] = pCountry;
- }
- parameters[pType.paramName] = pValue;
-
- // call webservice
- var ret = JSON.parse(net.callRestWebserviceBasicAuth(url, actionType, parameters, null, null, "text/plain", "text/plain", util.DATA_TEXT, util.DATA_TEXT, userName, pw, true));
-
- // if error, log the error. But also process the result and let the callback generate the correct default value
- if (WsValidationUtils._isError(ret))
- {
- logging.log(translate.withArguments("${WEBSERVICE_ERROR} url:%0 status:%1", [url, (ret.hasHttpSuccessStatusCode ? " StatusCode: " + ret.httpStatusCode : "")]));
- logging.log("Params: " + parameters.toSource());
- }
-
- // different handling of the result per type
- return pType.processResultCallback(ret, pValue);
- }
- }
-
- return pType.processResultCallback(null, pValue);
+ return pType.processRequestCallback.call(pType, pValue, pCountry)
}
/**
@@ -235,7 +266,7 @@ WsValidationUtils.validate = function(pValue, pType, pCountry)
*/
WsValidationUtils.setAddressFields = function(pFieldToSetToValue)
{
- try
+ try
{
var data = JSON.parse(vars.getString("$this.value"));
} catch (exception) {
@@ -244,17 +275,17 @@ WsValidationUtils.setAddressFields = function(pFieldToSetToValue)
return
}
- _setField("$field.ZIP", data.zip);
- _setField("$field.COUNTRY", data.country);
- _setField("$field.CITY", data.city);
- //_setField("$field.DISTRICT", data.district); not needed currently
- _setField("$field.REGION", data.region);
- _setField("$field.STATE", data.state);
- _setField("$field.ADDRESS", data.streat);
+ _setField("$field.ZIP", data[1]);
+ _setField("$field.CITY", data[2]);
+ _setField("$field.COUNTRY", data[4]);
+ //_setField("$field.DISTRICT", data[5]); not needed currently
+ _setField("$field.REGION", data[6]);
+ _setField("$field.STATE", data[7]);
+ _setField("$field.ADDRESS", data[8]);
if (pFieldToSetToValue)
{
- _setField(pFieldToSetToValue, data.value)
+ _setField(pFieldToSetToValue, data[12])
}
function _setField(pField, pValue)
diff --git a/process/_test_clientProcess/process.js b/process/_test_clientProcess/process.js
index 83e2827f7d3ccd659cf0f75c1945014b285542b7..9161a9a2bede588a70ca5152ecd6bf9e7e70bede 100644
--- a/process/_test_clientProcess/process.js
+++ b/process/_test_clientProcess/process.js
@@ -5,10 +5,16 @@ import("Liquibase_lib");
import("system.db");
import("system.fileIO");
-var outFolderPath = "C:\\temp\\generatedData";
-var alias = "betterData";
+var alias = "_____SYSTEMALIAS";
+//var alias = "betterDataSys";
+//var alias = "betterData";
//var alias = db.getCurrentAlias();
+var outFolderPath = "C:\\temp\\generatedData\\" + alias + "\\";
var excludedTables = ["AB_COUNTRYINFO", "AB_LANGUAGE"];
-LiquiUtils.exportAllTablesAsLiquibaseFiles(outFolderPath, null, alias, excludedTables, true);
+//LiquiUtils.exportAllTablesAsLiquibaseFiles(outFolderPath, null, alias, excludedTables, true);
+
+alias = "_____SYSTEMALIAS";
+outFolderPath = "C:\\temp\\generatedData\\" + alias + "\\";
+LiquiUtils.exportTableAsLiquibaseFiles(outFolderPath, "ASYS_USERS", null, "PROPKEY in ('mailserverAlias', 'userserverEnabled') ", null, false, alias);
logging.log("finish");
\ No newline at end of file
diff --git a/process/autostartNeon/process.js b/process/autostartNeon/process.js
index 3fe0118611202eac091ede79de190e6f6a0dc376..aa471725ace0af79aa8fb9b6eddbb99a2be34281 100644
--- a/process/autostartNeon/process.js
+++ b/process/autostartNeon/process.js
@@ -14,4 +14,4 @@ for(var i = 0; i < usersTools.length; i++)
}
calendars.setCalendarUser(users, calendars.RIGHT_READ | calendars.RIGHT_WRITE, false, calendars.SORTSTRATEGY_NATURAL);
-calendars.setCheckAttendeesOnWrite(false);
\ No newline at end of file
+calendars.setCheckAttendeesOnWrite(false);
diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js
index 675a783ead8e82230e4b7f88fa96c0cc11dcdddc..ba89d5b72fe127a05af388ffdd0cb0cb3803c612 100644
--- a/process/getDocxDocument_serverProcess/process.js
+++ b/process/getDocxDocument_serverProcess/process.js
@@ -3,6 +3,7 @@ import("system.vars");
import("system.swing");
import("system.fileIO");
import("system.util");
+import("system.result");
/* This is a serverprocess to improve the performance
* This Process has 13k lines of code since 2 js-libs are included (ress in about 420KB)
@@ -134,7 +135,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
function initJsZip()
{
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.JSZip = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-'use strict';
var DataReader = require('./dataReader');
function ArrayReader(data) {
@@ -187,7 +187,6 @@ ArrayReader.prototype.readData = function(size) {
module.exports = ArrayReader;
},{"./dataReader":6}],2:[function(require,module,exports){
-'use strict';
// private property
var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
@@ -259,7 +258,6 @@ exports.decode = function(input, utf8) {
};
},{}],3:[function(require,module,exports){
-'use strict';
function CompressedObject() {
this.compressedSize = 0;
this.uncompressedSize = 0;
@@ -289,7 +287,6 @@ CompressedObject.prototype = {
module.exports = CompressedObject;
},{}],4:[function(require,module,exports){
-'use strict';
exports.STORE = {
magic: "\x00\x00",
compress: function(content, compressionOptions) {
@@ -304,7 +301,6 @@ exports.STORE = {
exports.DEFLATE = require('./flate');
},{"./flate":9}],5:[function(require,module,exports){
-'use strict';
var utils = require('./utils');
@@ -408,7 +404,7 @@ module.exports = function crc32(input, crc) {
// vim: set shiftwidth=4 softtabstop=4:
},{"./utils":22}],6:[function(require,module,exports){
-'use strict';
+
var utils = require('./utils');
function DataReader(data) {
@@ -518,7 +514,6 @@ DataReader.prototype = {
module.exports = DataReader;
},{"./utils":22}],7:[function(require,module,exports){
-'use strict';
exports.base64 = false;
exports.binary = false;
exports.dir = false;
@@ -531,7 +526,6 @@ exports.unixPermissions = null;
exports.dosPermissions = null;
},{}],8:[function(require,module,exports){
-'use strict';
var utils = require('./utils');
/**
@@ -638,7 +632,6 @@ exports.isRegExp = function (object) {
},{"./utils":22}],9:[function(require,module,exports){
-'use strict';
var USE_TYPEDARRAY = (typeof Uint8Array !== 'undefined') && (typeof Uint16Array !== 'undefined') && (typeof Uint32Array !== 'undefined');
var pako = require("pako");
@@ -656,7 +649,6 @@ exports.uncompress = function(input) {
};
},{"pako":25}],10:[function(require,module,exports){
-'use strict';
var base64 = require('./base64');
@@ -737,7 +729,6 @@ JSZip.compressions = require('./compressions');
module.exports = JSZip;
},{"./base64":2,"./compressions":4,"./defaults":7,"./deprecatedPublicUtils":8,"./load":11,"./object":14,"./support":18}],11:[function(require,module,exports){
-'use strict';
var base64 = require('./base64');
var utf8 = require('./utf8');
var utils = require('./utils');
@@ -779,7 +770,6 @@ module.exports = function(data, options) {
},{"./base64":2,"./utf8":21,"./utils":22,"./zipEntries":23}],12:[function(require,module,exports){
(function (Buffer){
-'use strict';
module.exports = function(data, encoding){
return new Buffer(data, encoding);
};
@@ -789,7 +779,6 @@ module.exports.test = function(b){
}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
},{}],13:[function(require,module,exports){
-'use strict';
var Uint8ArrayReader = require('./uint8ArrayReader');
function NodeBufferReader(data) {
@@ -812,7 +801,7 @@ NodeBufferReader.prototype.readData = function(size) {
module.exports = NodeBufferReader;
},{"./uint8ArrayReader":19}],14:[function(require,module,exports){
-'use strict';
+
var support = require('./support');
var utils = require('./utils');
var crc32 = require('./crc32');
@@ -1684,7 +1673,7 @@ var out = {
module.exports = out;
},{"./base64":2,"./compressedObject":3,"./compressions":4,"./crc32":5,"./defaults":7,"./nodeBuffer":12,"./signature":15,"./stringWriter":17,"./support":18,"./uint8ArrayWriter":20,"./utf8":21,"./utils":22}],15:[function(require,module,exports){
-'use strict';
+
exports.LOCAL_FILE_HEADER = "PK\x03\x04";
exports.CENTRAL_FILE_HEADER = "PK\x01\x02";
exports.CENTRAL_DIRECTORY_END = "PK\x05\x06";
@@ -1693,7 +1682,7 @@ exports.ZIP64_CENTRAL_DIRECTORY_END = "PK\x06\x06";
exports.DATA_DESCRIPTOR = "PK\x07\x08";
},{}],16:[function(require,module,exports){
-'use strict';
+
var DataReader = require('./dataReader');
var utils = require('./utils');
@@ -1732,7 +1721,7 @@ StringReader.prototype.readData = function(size) {
module.exports = StringReader;
},{"./dataReader":6,"./utils":22}],17:[function(require,module,exports){
-'use strict';
+
var utils = require('./utils');
@@ -1765,7 +1754,7 @@ module.exports = StringWriter;
},{"./utils":22}],18:[function(require,module,exports){
(function (Buffer){
-'use strict';
+
exports.base64 = true;
exports.array = true;
exports.string = true;
@@ -1802,7 +1791,7 @@ else {
}).call(this,(typeof Buffer !== "undefined" ? Buffer : undefined))
},{}],19:[function(require,module,exports){
-'use strict';
+
var ArrayReader = require('./arrayReader');
function Uint8ArrayReader(data) {
@@ -1830,7 +1819,7 @@ Uint8ArrayReader.prototype.readData = function(size) {
module.exports = Uint8ArrayReader;
},{"./arrayReader":1}],20:[function(require,module,exports){
-'use strict';
+
var utils = require('./utils');
@@ -1868,7 +1857,7 @@ Uint8ArrayWriter.prototype = {
module.exports = Uint8ArrayWriter;
},{"./utils":22}],21:[function(require,module,exports){
-'use strict';
+
var utils = require('./utils');
var support = require('./support');
@@ -2077,7 +2066,7 @@ exports.utf8decode = function utf8decode(buf) {
// vim: set shiftwidth=4 softtabstop=4:
},{"./nodeBuffer":12,"./support":18,"./utils":22}],22:[function(require,module,exports){
-'use strict';
+
var support = require('./support');
var compressions = require('./compressions');
var nodeBuffer = require('./nodeBuffer');
@@ -2423,7 +2412,7 @@ exports.extend = function() {
},{"./compressions":4,"./nodeBuffer":12,"./support":18}],23:[function(require,module,exports){
-'use strict';
+
var StringReader = require('./stringReader');
var NodeBufferReader = require('./nodeBufferReader');
var Uint8ArrayReader = require('./uint8ArrayReader');
@@ -2705,7 +2694,7 @@ ZipEntries.prototype = {
module.exports = ZipEntries;
},{"./arrayReader":1,"./nodeBufferReader":13,"./object":14,"./signature":15,"./stringReader":16,"./support":18,"./uint8ArrayReader":19,"./utils":22,"./zipEntry":24}],24:[function(require,module,exports){
-'use strict';
+
var StringReader = require('./stringReader');
var utils = require('./utils');
var CompressedObject = require('./compressedObject');
@@ -3027,7 +3016,7 @@ module.exports = ZipEntry;
},{"./compressedObject":3,"./object":14,"./stringReader":16,"./support":18,"./utils":22}],25:[function(require,module,exports){
// Top level file is just a mixin of submodules & constants
-'use strict';
+
var assign = require('./lib/utils/common').assign;
@@ -3042,7 +3031,7 @@ assign(pako, deflate, inflate, constants);
module.exports = pako;
},{"./lib/deflate":26,"./lib/inflate":27,"./lib/utils/common":28,"./lib/zlib/constants":31}],26:[function(require,module,exports){
-'use strict';
+
var zlib_deflate = require('./zlib/deflate');
@@ -3444,7 +3433,7 @@ exports.deflateRaw = deflateRaw;
exports.gzip = gzip;
},{"./utils/common":28,"./utils/strings":29,"./zlib/deflate":33,"./zlib/messages":38,"./zlib/zstream":40}],27:[function(require,module,exports){
-'use strict';
+
var zlib_inflate = require('./zlib/inflate');
@@ -3864,7 +3853,7 @@ exports.inflateRaw = inflateRaw;
exports.ungzip = inflate;
},{"./utils/common":28,"./utils/strings":29,"./zlib/constants":31,"./zlib/gzheader":34,"./zlib/inflate":36,"./zlib/messages":38,"./zlib/zstream":40}],28:[function(require,module,exports){
-'use strict';
+
var TYPED_OK = (typeof Uint8Array !== 'undefined') &&
@@ -3969,7 +3958,7 @@ exports.setTyped(TYPED_OK);
},{}],29:[function(require,module,exports){
// String encode/decode helpers
-'use strict';
+
var utils = require('./common');
@@ -4155,7 +4144,7 @@ exports.utf8border = function (buf, max) {
};
},{"./common":28}],30:[function(require,module,exports){
-'use strict';
+
// Note: adler32 takes 12% for level 0 and 2% for level 6.
// It doesn't worth to make additional optimizationa as in original.
@@ -4189,7 +4178,7 @@ function adler32(adler, buf, len, pos) {
module.exports = adler32;
},{}],31:[function(require,module,exports){
-'use strict';
+
module.exports = {
@@ -4241,7 +4230,7 @@ module.exports = {
};
},{}],32:[function(require,module,exports){
-'use strict';
+
// Note: we can't get significant speed boost here.
// So write code to minimize size - no pregenerated tables
@@ -4284,7 +4273,7 @@ function crc32(crc, buf, len, pos) {
module.exports = crc32;
},{}],33:[function(require,module,exports){
-'use strict';
+
var utils = require('../utils/common');
var trees = require('./trees');
@@ -6141,7 +6130,7 @@ exports.deflateTune = deflateTune;
*/
},{"../utils/common":28,"./adler32":30,"./crc32":32,"./messages":38,"./trees":39}],34:[function(require,module,exports){
-'use strict';
+
function GZheader() {
@@ -6183,7 +6172,7 @@ function GZheader() {
module.exports = GZheader;
},{}],35:[function(require,module,exports){
-'use strict';
+
// See state defs from inflate.js
var BAD = 30; /* got a data error -- remain here until reset */
@@ -6511,7 +6500,7 @@ module.exports = function inflate_fast(strm, start) {
};
},{}],36:[function(require,module,exports){
-'use strict';
+
var utils = require('../utils/common');
@@ -8051,7 +8040,7 @@ exports.inflateUndermine = inflateUndermine;
*/
},{"../utils/common":28,"./adler32":30,"./crc32":32,"./inffast":35,"./inftrees":37}],37:[function(require,module,exports){
-'use strict';
+
var utils = require('../utils/common');
@@ -8380,7 +8369,7 @@ module.exports = function inflate_table(type, lens, lens_index, codes, table, ta
};
},{"../utils/common":28}],38:[function(require,module,exports){
-'use strict';
+
module.exports = {
2: 'need dictionary', /* Z_NEED_DICT 2 */
@@ -8395,7 +8384,7 @@ module.exports = {
};
},{}],39:[function(require,module,exports){
-'use strict';
+
var utils = require('../utils/common');
@@ -9599,7 +9588,7 @@ exports._tr_tally = _tr_tally;
exports._tr_align = _tr_align;
},{"../utils/common":28}],40:[function(require,module,exports){
-'use strict';
+
function ZStream() {
@@ -9631,7 +9620,7 @@ module.exports = ZStream;
},{}]},{},[10])(10)
});
-};
+}
//templater
@@ -9654,7 +9643,7 @@ function initTemplater()
initJsZip();
(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.Docxtemplater = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
-"use strict";
+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -9846,7 +9835,7 @@ DocUtils.getLeft = function (parsed, element, index) {
module.exports = DocUtils;
},{"./errors":2,"./memoize":5,"xmldom":19}],2:[function(require,module,exports){
-"use strict";
+
function XTError(message) {
this.name = "GenericError";
@@ -9884,7 +9873,7 @@ module.exports = {
XTScopeParserError: XTScopeParserError
};
},{}],3:[function(require,module,exports){
-"use strict";
+
var loopModule = require("./modules/loop");
var spacePreserveModule = require("./modules/space-preserve");
@@ -9929,7 +9918,7 @@ module.exports = {
pptx: PptXFileTypeConfig
};
},{"./modules/expand-pair-trait":8,"./modules/loop":9,"./modules/rawxml":10,"./modules/render":11,"./modules/space-preserve":12}],4:[function(require,module,exports){
-"use strict";
+
var Errors = require("./errors");
var DocUtils = require("./doc-utils");
@@ -10172,7 +10161,7 @@ module.exports = {
}
};
},{"./doc-utils":1,"./errors":2}],5:[function(require,module,exports){
-"use strict";
+
function memoize(func) {
var stringifyJson = JSON.stringify,
@@ -10186,7 +10175,7 @@ function memoize(func) {
module.exports = memoize;
},{}],6:[function(require,module,exports){
-"use strict";
+
function getMinFromArrays(arrays, state) {
var minIndex = -1;
@@ -10230,7 +10219,7 @@ module.exports = function (arrays) {
return resArray;
};
},{}],7:[function(require,module,exports){
-"use strict";
+
function emptyFun() {}
function identity(i) {
@@ -10257,7 +10246,7 @@ module.exports = function (module) {
return module;
};
},{}],8:[function(require,module,exports){
-"use strict";
+
var traitName = "expandPair";
var mergeSort = require("../mergesort");
@@ -10388,7 +10377,7 @@ module.exports = function () {
return wrapper(expandPairTrait);
};
},{"../doc-utils":1,"../errors":2,"../mergesort":6,"../module-wrapper":7,"../traits":16}],9:[function(require,module,exports){
-"use strict";
+
var DocUtils = require("../doc-utils");
var dashInnerRegex = /^-([^\s]+)\s(.+)$/;
@@ -10451,7 +10440,7 @@ module.exports = function () {
return wrapper(loopModule);
};
},{"../doc-utils":1,"../module-wrapper":7}],10:[function(require,module,exports){
-"use strict";
+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -10542,7 +10531,7 @@ module.exports = function () {
return wrapper(new RawXmlModule());
};
},{"../doc-utils":1,"../errors":2,"../module-wrapper":7}],11:[function(require,module,exports){
-"use strict";
+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -10586,7 +10575,7 @@ module.exports = function () {
return wrapper(new Render());
};
},{"../module-wrapper":7}],12:[function(require,module,exports){
-"use strict";
+
var wrapper = require("../module-wrapper");
var spacePreserve = {
@@ -10621,7 +10610,7 @@ module.exports = function () {
return wrapper(spacePreserve);
};
},{"../module-wrapper":7}],13:[function(require,module,exports){
-"use strict";
+
var DocUtils = require("./doc-utils");
@@ -10687,7 +10676,7 @@ var parser = {
module.exports = parser;
},{"./doc-utils":1}],14:[function(require,module,exports){
-"use strict";
+
var ScopeManager = require("./scope-manager");
var DocUtils = require("./doc-utils");
@@ -10731,7 +10720,7 @@ function render(options) {
module.exports = render;
},{"./doc-utils":1,"./scope-manager":15}],15:[function(require,module,exports){
-"use strict";
+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -10858,7 +10847,7 @@ ScopeManager.createBaseScopeManager = function (_ref) {
module.exports = ScopeManager;
},{"./errors":2}],16:[function(require,module,exports){
-"use strict";
+
var DocUtils = require("./doc-utils");
var Errors = require("./errors");
@@ -10979,7 +10968,7 @@ module.exports = {
getExpandToDefault: getExpandToDefault
};
},{"./doc-utils":1,"./errors":2}],17:[function(require,module,exports){
-"use strict";
+
// res class responsibility is to parse the XML.
var DocUtils = require("./doc-utils");
@@ -11057,7 +11046,7 @@ module.exports = function (content, tagsXmlArray) {
return DocUtils.cloneDeep(memoized(content, tagsXmlArray));
};
},{"./doc-utils":1,"./memoize":5}],18:[function(require,module,exports){
-"use strict";
+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
@@ -11442,7 +11431,7 @@ function _extends(Class,Super){
pt.__proto__ = ppt;
}
if(!(pt instanceof Super)){
- function t(){};
+ function t(){}
t.prototype = Super.prototype;
t = new t();
copy(pt,t);
@@ -11504,7 +11493,7 @@ function DOMException(code, message) {
error.code = code;
if(message) this.message = this.message + ": " + message;
return error;
-};
+}
DOMException.prototype = Error.prototype;
copy(ExceptionCode,DOMException)
/**
@@ -11513,7 +11502,7 @@ copy(ExceptionCode,DOMException)
* The items in the NodeList are accessible via an integral index, starting from 0.
*/
function NodeList() {
-};
+}
NodeList.prototype = {
/**
* The number of nodes in the list. The range of valid child node indices is 0 to length-1 inclusive.
@@ -11566,7 +11555,7 @@ _extends(LiveNodeList,NodeList);
* used for attributes or DocumentType entities
*/
function NamedNodeMap() {
-};
+}
function _findNodeIndex(list,node){
var i = list.length;
@@ -11683,7 +11672,7 @@ function DOMImplementation(/* Object */ features) {
this._features = features[feature];
}
}
-};
+}
DOMImplementation.prototype = {
hasFeature: function(/* string */ feature, /* string */ version) {
@@ -11732,7 +11721,7 @@ DOMImplementation.prototype = {
*/
function Node() {
-};
+}
Node.prototype = {
firstChild : null,
@@ -12134,7 +12123,7 @@ _extends(Document,Node);
function Element() {
this._nsMap = {};
-};
+}
Element.prototype = {
nodeType : ELEMENT_NODE,
hasAttribute : function(name){
@@ -12227,13 +12216,13 @@ Document.prototype.getElementsByTagNameNS = Element.prototype.getElementsByTagNa
_extends(Element,Node);
function Attr() {
-};
+}
Attr.prototype.nodeType = ATTRIBUTE_NODE;
_extends(Attr,Node);
function CharacterData() {
-};
+}
CharacterData.prototype = {
data : '',
substringData : function(offset, count) {
@@ -12264,7 +12253,7 @@ CharacterData.prototype = {
}
_extends(CharacterData,Node);
function Text() {
-};
+}
Text.prototype = {
nodeName : "#text",
nodeType : TEXT_NODE,
@@ -12283,7 +12272,7 @@ Text.prototype = {
}
_extends(Text,CharacterData);
function Comment() {
-};
+}
Comment.prototype = {
nodeName : "#comment",
nodeType : COMMENT_NODE
@@ -12291,7 +12280,7 @@ Comment.prototype = {
_extends(Comment,CharacterData);
function CDATASection() {
-};
+}
CDATASection.prototype = {
nodeName : "#cdata-section",
nodeType : CDATA_SECTION_NODE
@@ -12300,27 +12289,27 @@ _extends(CDATASection,CharacterData);
function DocumentType() {
-};
+}
DocumentType.prototype.nodeType = DOCUMENT_TYPE_NODE;
_extends(DocumentType,Node);
function Notation() {
-};
+}
Notation.prototype.nodeType = NOTATION_NODE;
_extends(Notation,Node);
function Entity() {
-};
+}
Entity.prototype.nodeType = ENTITY_NODE;
_extends(Entity,Node);
function EntityReference() {
-};
+}
EntityReference.prototype.nodeType = ENTITY_REFERENCE_NODE;
_extends(EntityReference,Node);
function DocumentFragment() {
-};
+}
DocumentFragment.prototype.nodeName = "#document-fragment";
DocumentFragment.prototype.nodeType = DOCUMENT_FRAGMENT_NODE;
_extends(DocumentFragment,Node);
@@ -13274,7 +13263,7 @@ function _set_proto_(thiz,parent){
}
if(!(_set_proto_({},_set_proto_.prototype) instanceof _set_proto_)){
_set_proto_ = function(thiz,parent){
- function p(){};
+ function p(){}
p.prototype = parent;
p = new p();
for(parent in thiz){
@@ -13300,7 +13289,7 @@ exports.XMLReader = XMLReader;
},{}],"/src/js/docxtemplater.js":[function(require,module,exports){
-"use strict";
+
var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
diff --git a/process/sendBulkMail_serverProcess/process.js b/process/sendBulkMail_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..40bd252ef6a43197982835d8211d9b60171115cf
--- /dev/null
+++ b/process/sendBulkMail_serverProcess/process.js
@@ -0,0 +1,22 @@
+import("Sql_lib");
+import("system.db");
+import("system.util");
+import("system.translate");
+import("Bulkmail_lib");
+import("system.vars");
+import("system.notification");
+
+var bulkMailId = vars.get("$local.bulkMailId");
+var user = vars.get("$local.user");
+var res = BulkMailUtils.sendBulkMail(bulkMailId);
+
+if (user)
+{
+ var mailName = db.cell(SqlCondition.begin()
+ .andPrepare("BULKMAIL.BULKMAILID", bulkMailId)
+ .buildSql("select NAME from BULKMAIL")
+ );
+ var message = translate.withArguments("Bulk mail \"%0\" was sent!", [mailName]);
+ var description = translate.withArguments("%0 mails sent sucessfully, %1 mails failed", [res.sucessful, res.failed]);
+ notification.addNotification(util.getNewUUID(), null, null, null, "BulkMailSent", notification.PRIO_NORMAL, 2, notification.STATE_UNSEEN, [user], message, description);
+}
\ No newline at end of file
diff --git a/process/sendBulkMail_serverProcess/sendBulkMail_serverProcess.aod b/process/sendBulkMail_serverProcess/sendBulkMail_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..eedbd698a37de20e16572ed649bfc21ad97ae355
--- /dev/null
+++ b/process/sendBulkMail_serverProcess/sendBulkMail_serverProcess.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.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.1">
+ <name>sendBulkMail_serverProcess</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/sendBulkMail_serverProcess/process.js</process>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/system/default/default.aod b/system/default/default.aod
index 1cb63b40eca1fd0b628e385da33f7334800e5cbd..fdabfb84c273955bb6b0172a47b857c182f08d52 100644
--- a/system/default/default.aod
+++ b/system/default/default.aod
@@ -7,6 +7,6 @@
<aditoDataPath>$PROJECTHOME/data</aditoDataPath>
<loginUser>admin</loginUser>
<autoLogin v="false" />
- <aditoDebug>SIMPLE | JDITO</aditoDebug>
+ <aditoDebug>TRACE</aditoDebug>
<enableJDitoDebug v="true" />
</system>