diff --git a/.liquibase/Data_alias/basic/2020.1.0/DocumentTemplate/create_DocumentTemplatePlaceOfUse.xml b/.liquibase/Data_alias/basic/2020.1.0/DocumentTemplate/create_DocumentTemplatePlaceOfUse.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8f5692ded69566daaf0b6ec0d2233ded20eb6d4f
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.0/DocumentTemplate/create_DocumentTemplatePlaceOfUse.xml
@@ -0,0 +1,13 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="d1b03d92-482f-4655-a380-6d2f83da3873">
+ <createTable tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_DOCUMENTTEMPLATEPLACEOFUSEID"/>
+ </column>
+ <column name="DOCUMENTTEMPLATE_ID" type="VARCHAR(36)"/>
+ <column name="PLACEOFUSE" type="VARCHAR(36)"/>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.0/ExportTemplate/create_ExportTemplateTables.xml b/.liquibase/Data_alias/basic/2020.1.0/ExportTemplate/create_ExportTemplateTables.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c7231cea854776cbe7a3c4c2bc0764f17d3c093b
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2020.1.0/ExportTemplate/create_ExportTemplateTables.xml
@@ -0,0 +1,50 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="d1b03d92-482f-4655-a380-6d2f83da3873">
+ <createTable tableName="EXPORTTEMPLATE">
+ <column name="EXPORTTEMPLATEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_EXPORTTEMPLATEID"/>
+ </column>
+ <column name="TITLE" type="VARCHAR(100)"/>
+ <column name="SEPARATOR" type="VARCHAR(36)"/>
+ <column name="ISOLANGUAGE" type="CHAR(3)"/>
+ <column name="DESCRIPTION" type="VARCHAR(1337)"/>
+ <column name="DATE_EDIT" type="TIMESTAMP(9)"/>
+ <column name="DATE_NEW" type="TIMESTAMP(9)"/>
+ <column name="USER_EDIT" type="VARCHAR(50)"/>
+ <column name="USER_NEW" type="VARCHAR(50)"/>
+ </createTable>
+ <createTable tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_EXPORTTEMPLATEFIELDID"/>
+ </column>
+ <column name="EXPORTTEMPLATE_ID" type="VARCHAR(36)"/>
+ <column name="FIELD" type="VARCHAR(36)"/>
+ <column name="SORTING" type="SMALLINT"/>
+ </createTable>
+ <createIndex indexName="idx_exprttmpfld_tmpltid" tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATE_ID"/>
+ </createIndex>
+ <createTable tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_EXPORTTEMPLATEPLACEOFUSEID"/>
+ </column>
+ <column name="EXPORTTEMPLATE_ID" type="VARCHAR(36)"/>
+ <column name="PLACEOFUSE" type="VARCHAR(36)"/>
+ </createTable>
+ <createIndex indexName="idx_exprttmppou_tmpltid" tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="EXPORTTEMPLATE_ID"/>
+ </createIndex>
+ <createTable tableName="EXPORTTEMPLATESELECTION">
+ <column name="EXPORTTEMPLATESELECTIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_EXPORTTEMPLATESELECTIONID"/>
+ </column>
+ <column name="EXPORTTEMPLATE_ID" type="VARCHAR(36)"/>
+ <column name="FILENAME" type="VARCHAR(33)"/>
+ </createTable>
+ <createIndex indexName="idx_exprttmpselection_tmpltid" tableName="EXPORTTEMPLATESELECTION">
+ <column name="EXPORTTEMPLATE_ID"/>
+ </createIndex>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
index 58432113f00714761783b4833e76ad72d8ba2512..f28da066a3539dfca3b3329d53da58625ea702e9 100644
--- a/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
+++ b/.liquibase/Data_alias/basic/2020.1.0/changelog.xml
@@ -1,5 +1,7 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="ExportTemplate/create_ExportTemplateTables.xml" relativeToChangelogFile="true"/>
<include file="PermissionCalendar/changelog.xml" relativeToChangelogFile="true"/>
+ <include file="DocumentTemplate/create_DocumentTemplatePlaceOfUse.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index 0d76cc105d2d1371298bb09e08bf16d13d776a2a..1bab6d642387531f868402cacc4ef202cb73721e 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -46,4 +46,8 @@
<include file="generatedData/tasklink.xml" relativeToChangelogFile="true"/>
<include file="generatedData/ticket.xml" relativeToChangelogFile="true"/>
<include file="generatedData/duplicates/duplicatescanner.xml" relativeToChangelogFile="true"/>
+ <include file="generatedData/exporttemplate.xml" relativeToChangelogFile="true"/>
+ <include file="generatedData/exporttemplatefield.xml" relativeToChangelogFile="true"/>
+ <include file="generatedData/exporttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
+ <include file="generatedData/documenttemplateplaceofuse.xml" relativeToChangelogFile="true"/>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2f0f5b419543c07050af14670884bac90f6ae14a
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/documenttemplateplaceofuse.xml
@@ -0,0 +1,100 @@
+<?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="62ad16a9-7312-4dda-9e4b-460673b9af82">
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b3af9285-63cc-4bc1-abf6-58091e18d10f"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0003e431-4355-4de5-aae8-2e08cf0703c9"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="034a68c9-81bb-46f9-b936-3b195a8d54fd"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="78227d81-7af4-4f6c-95f0-348b87e8862e"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="b4fafa76-73f2-43ee-8a88-12d30946f1bb"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="12da39a8-6fc9-4220-b09d-179cd611a814"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="256dad02-7433-45b3-9584-ec335e0bdcab"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="98022888-3232-4688-a2f5-17efdf440e85"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="97233a7f-d454-4cd3-8ead-49e3caa820a0"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="1cabdde7-870e-4094-a0f7-a335ded3536a"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0938ed90-7191-48b4-81b9-daf9244bbe71"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="0c546f3e-11bb-4fbf-b2f0-a06bf36f55fa"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="21a32662-687e-4592-b92e-1e0a93969e1f"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="32259cb7-f9ec-407b-9f91-807049ab013f"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="32169990-8d00-41f9-88c5-96e6f0cbbc9a"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="95985522-1197-4ba6-8e48-6f3eab25510a"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="5e494f97-4d29-4cce-abf7-9eaa2577337f"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="464d1fa7-6a07-4ed0-8d4b-46e394cc4d56"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="9a2f13e5-68d9-4db4-919e-f9ee89c79439"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="9106d24f-8afc-491d-8309-ea20377466ac"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="1dcf4e02-79ad-463d-8956-a3886eba9546"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="f43bc91d-7fc1-4549-8a41-903c62673e43"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="b935bc35-cb5e-4ccc-aef6-0cc745ca2691"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="ebbec7a2-a396-424a-aab5-1726254fc2e9"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="7fa4140f-7489-416e-83df-459f36628917"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="e70b9ef1-f0a3-4cd2-b3cd-fa7b4229ee73"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="6329678a-70cf-4216-b529-99c90524fdb2"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="DOCUMENTTEMPLATEPLACEOFUSE">
+ <column name="DOCUMENTTEMPLATEPLACEOFUSEID" value="ca93ae0d-bd78-44a6-b781-e060da44e17e"/>
+ <column name="DOCUMENTTEMPLATE_ID" value="151fcb6f-683b-4398-9fa0-afc202d688f0"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..01e76eab81e1c1cff530b96e61f9c4820277759e
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplate.xml
@@ -0,0 +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="62ad16a9-7312-4dda-9e4b-460673b9af82">
+ <insert tableName="EXPORTTEMPLATE">
+ <column name="EXPORTTEMPLATEID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
+ <column name="TITLE" value="Personen mit Anschriften"/>
+ <column name="SEPARATOR" value="SEMICOLON"/>
+ <column name="ISOLANGUAGE" value="deu"/>
+ <column name="DESCRIPTION" value="Name mit Anrede, Titel und vollständiger Addresse"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATE">
+ <column name="EXPORTTEMPLATEID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
+ <column name="TITLE" value="Firmen mit Addressen"/>
+ <column name="SEPARATOR" value="COMMA"/>
+ <column name="ISOLANGUAGE" value="deu"/>
+ <column name="DESCRIPTION" value="Firmen und deren Addressen"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATE">
+ <column name="EXPORTTEMPLATEID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
+ <column name="TITLE" value="Personen und Kontaktmöglichkeiten"/>
+ <column name="SEPARATOR" value="TAB"/>
+ <column name="ISOLANGUAGE" value="deu"/>
+ <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
+ <column name="USER_EDIT" value="Admin"/>
+ <column name="USER_NEW" value="Admin"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATE">
+ <column name="EXPORTTEMPLATEID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:23"/>
+ <column name="DATE_EDIT" valueDate="2020-03-02T10:43:24"/>
+ <column name="TITLE" value="Personen und Kontaktmöglichkeiten (Englisch)"/>
+ <column name="SEPARATOR" value="TAB"/>
+ <column name="ISOLANGUAGE" value="eng"/>
+ <column name="DESCRIPTION" value="Anrede, Vor und Nachname sowie Email und Telefonnummer"/>
+ <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/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.xml
new file mode 100644
index 0000000000000000000000000000000000000000..88d3c7af00c6dcf394ed7f9c2798050d65e0e148
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplatefield.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="62ad16a9-7312-4dda-9e4b-460673b9af82">
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="acb36d07-089e-4a25-a0c2-694b06e74ae5"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@salutation@}"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="e1b5c9c8-846a-4195-af5c-09e923c1c1c6"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@title@}"/>
+ <column name="SORTING" valueNumeric="2"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="34c65722-937f-4741-9c08-48a841e19527"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@firstname@}"/>
+ <column name="SORTING" valueNumeric="3"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="330bc05f-501e-4774-85bc-046347829dda"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@lastname@}"/>
+ <column name="SORTING" valueNumeric="4"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="224cf307-fe26-4a6b-aae8-61190a2bff19"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@country@}"/>
+ <column name="SORTING" valueNumeric="5"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="e9f1cd83-5652-4f5b-913b-40dea9eda1c8"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@region@}"/>
+ <column name="SORTING" valueNumeric="6"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="779f6222-d1e8-4ec3-953a-31cb27115b9a"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@zipCode@}"/>
+ <column name="SORTING" valueNumeric="7"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="bffb3d69-7774-438e-85b2-81fc0629462a"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@address@}"/>
+ <column name="SORTING" valueNumeric="8"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="82059884-4b8e-4031-b32a-2b9a03b7109a"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="FIELD" value="{@region@}"/>
+ <column name="SORTING" valueNumeric="6"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="bfeb9284-6db4-4d15-a07b-9b3f21fe9c22"/>
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+ <column name="FIELD" value="{@country@}"/>
+ <column name="SORTING" valueNumeric="2"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="c245bf8e-1d99-4d85-834c-64613bad5042"/>
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+ <column name="FIELD" value="{@region@}"/>
+ <column name="SORTING" valueNumeric="3"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="c39bb945-ecd2-4836-9cee-002178ae9709"/>
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+ <column name="FIELD" value="{@zipCode@}"/>
+ <column name="SORTING" valueNumeric="4"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="5ebc3ae4-80dd-497e-a26e-f275769f81e4"/>
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+ <column name="FIELD" value="{@address@}"/>
+ <column name="SORTING" valueNumeric="5"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="e153ea76-5e68-497a-8a3e-9bb40ce734b3"/>
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+ <column name="FIELD" value="{@orgname@}"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="e319ac75-3468-4167-8f0d-568a0dfaef7d"/>
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="FIELD" value="{@firstname@}"/>
+ <column name="SORTING" valueNumeric="2"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="0804cb9a-0cfb-43d6-bd37-2680e24604b0"/>
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="FIELD" value="{@lastname@}"/>
+ <column name="SORTING" valueNumeric="3"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="300aeca0-0de8-4225-99ce-bcbb850016aa"/>
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="FIELD" value="{@salutation@}"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="334146d9-7950-4c59-9b07-d89eb57a0da2"/>
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="FIELD" value="{@phone@}"/>
+ <column name="SORTING" valueNumeric="4"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="8fd83e1e-e2ef-499c-9425-0da511fdb6fb"/>
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="FIELD" value="{@email@}"/>
+ <column name="SORTING" valueNumeric="5"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="10194e81-65d8-4a12-acd3-123d6a692fba"/>
+ <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+ <column name="FIELD" value="{@firstname@}"/>
+ <column name="SORTING" valueNumeric="2"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="ba303e1b-40c9-4fef-bbdf-6d16ab0dbeb0"/>
+ <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+ <column name="FIELD" value="{@lastname@}"/>
+ <column name="SORTING" valueNumeric="3"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="a9fae3fa-e2c1-4c34-a264-e74bc93e6ac9"/>
+ <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+ <column name="FIELD" value="{@salutation@}"/>
+ <column name="SORTING" valueNumeric="1"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="cacce4e9-c9ad-4dd3-ac43-79684ef57008"/>
+ <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+ <column name="FIELD" value="{@phone@}"/>
+ <column name="SORTING" valueNumeric="4"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEFIELD">
+ <column name="EXPORTTEMPLATEFIELDID" value="d01169d3-aab0-4233-b5ec-02ede86995cf"/>
+ <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+ <column name="FIELD" value="{@email@}"/>
+ <column name="SORTING" valueNumeric="5"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
new file mode 100644
index 0000000000000000000000000000000000000000..02caafcd5a95767ea02322db6a955d4dad33e511
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/exporttemplateplaceofuse.xml
@@ -0,0 +1,25 @@
+<?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="62ad16a9-7312-4dda-9e4b-460673b9af82">
+ <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="4f036ac7-b1bf-4667-9177-7c0d444b1819"/>
+ <column name="EXPORTTEMPLATE_ID" value="86b48d2c-3850-4778-9240-45cf79396a0a"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="86865c59-aa8b-4511-bf3d-b069395c684d"/>
+ <column name="EXPORTTEMPLATE_ID" value="f399dc64-11b8-4490-ad24-53c9c3fc6df3"/>
+ <column name="PLACEOFUSE" value="Organisation"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="408eba99-bcc3-4308-9b2c-1a4495e01a0f"/>
+ <column name="EXPORTTEMPLATE_ID" value="3acf26f9-4807-4661-8084-c0c21c593c81"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ <insert tableName="EXPORTTEMPLATEPLACEOFUSE">
+ <column name="EXPORTTEMPLATEPLACEOFUSEID" value="135975c6-6c7a-408b-93e3-f04239503ff0"/>
+ <column name="EXPORTTEMPLATE_ID" value="84eb1373-3745-4455-a0a7-32cf62c8d4dc"/>
+ <column name="PLACEOFUSE" value="Person"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
index bf57d6e5328a16d694d400033173a33f773f3c99..2132f5ce1289e1b5c031d360dd3a4a2dc0a66850 100644
--- a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry.xml
@@ -25,4 +25,5 @@
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_TaskType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_AttributeType.xml"/>
<include relativeToChangelogFile="true" file="ab_keyword_entry/init_SalesprojectProbability.xml"/>
+ <include relativeToChangelogFile="true" file="ab_keyword_entry/init_ExportTemplateSeparator.xml"/>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ExportTemplateSeparator.xml b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ExportTemplateSeparator.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6f7f7e6461479ebfb435c476142c1a0d667685ca
--- /dev/null
+++ b/.liquibase/Data_alias/basic/init/data/AditoBasic/ab_keyword_entry/init_ExportTemplateSeparator.xml
@@ -0,0 +1,33 @@
+<?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="autogenerated" id="62ad16a9-7312-4dda-9e4b-460673b9af82">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="170a50ff-06b8-41f6-bd0e-40b62ea82d55"/>
+ <column name="KEYID" value="SEMICOLON"/>
+ <column name="TITLE" value="Semicolon"/>
+ <column name="CONTAINER" value="ExportTemplateSeparator"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="5f3cbf72-585d-4a80-88d0-b0df03f0f0e3"/>
+ <column name="KEYID" value="COMMA"/>
+ <column name="TITLE" value="Comma"/>
+ <column name="CONTAINER" value="ExportTemplateSeparator"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="210e6e52-2201-4499-a74d-69ecf2424a0e"/>
+ <column name="KEYID" value="TAB"/>
+ <column name="TITLE" value="Tab"/>
+ <column name="CONTAINER" value="ExportTemplateSeparator"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index a2ce46565fd4c03e9f6cc048de6386cd35ceda00..9f5df436ed9dda5507cc16b148130b9a31952d41 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -139,7 +139,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Organisation Id</title>
<description></description>
@@ -274,7 +274,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Contact Id</title>
<description></description>
</entityFieldDb>
@@ -556,7 +556,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Person Id</title>
<description></description>
<dependencies>
@@ -1007,7 +1007,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Address Id</title>
<description></description>
</entityFieldDb>
@@ -1167,7 +1167,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Communication Id</title>
<description></description>
</entityFieldDb>
@@ -1447,7 +1447,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Contract Id</title>
<description></description>
</entityFieldDb>
@@ -1604,7 +1604,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Product Id</title>
<description></description>
</entityFieldDb>
@@ -1950,7 +1950,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Product relationship</title>
<description></description>
</entityFieldDb>
@@ -2194,7 +2194,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Product price Id</title>
<description></description>
</entityFieldDb>
@@ -2246,7 +2246,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Stock Id</title>
<description></description>
</entityFieldDb>
@@ -2405,7 +2405,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>ISO 3166-1 alpha-2</title>
<description></description>
</entityFieldDb>
@@ -2628,7 +2628,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Offer Id</title>
<description></description>
</entityFieldDb>
@@ -3172,7 +3172,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Offer item Id</title>
<description></description>
</entityFieldDb>
@@ -3520,7 +3520,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title>Salesproject Id</title>
<description></description>
</entityFieldDb>
@@ -3675,7 +3675,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Timetracking Id</title>
<description></description>
@@ -3914,7 +3914,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Activity Id</title>
<description></description>
@@ -4317,7 +4317,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Salesorder Id</title>
<description></description>
@@ -5063,7 +5063,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Salesorder item Id</title>
<description></description>
@@ -5211,7 +5211,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Task Id</title>
<description></description>
@@ -5521,7 +5521,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Object relation</title>
<description></description>
@@ -5617,7 +5617,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Attribute usage Id</title>
<description></description>
@@ -5776,7 +5776,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Attribute Id</title>
<description></description>
@@ -5991,7 +5991,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Attribute relation Id</title>
<description></description>
@@ -6206,7 +6206,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Activity link Id</title>
<description></description>
@@ -6463,7 +6463,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Keyword entry Id</title>
<description></description>
@@ -6538,7 +6538,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>ISO3</title>
<description></description>
@@ -6613,7 +6613,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Keyword attribute Id</title>
<description></description>
@@ -6751,7 +6751,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Keyword attribute relation Id</title>
<description></description>
@@ -6882,7 +6882,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Appointment link Id</title>
<description></description>
@@ -7000,7 +7000,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Task link Id</title>
<description></description>
@@ -7055,7 +7055,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Object Relation Type</title>
<description></description>
@@ -7271,7 +7271,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Salutation Id</title>
<description></description>
@@ -7759,7 +7759,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Id</title>
<description></description>
@@ -7987,7 +7987,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title>Salesproject milestone Id</title>
<description></description>
@@ -8077,7 +8077,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -8223,7 +8223,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -8425,7 +8425,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -8557,7 +8557,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -8675,7 +8675,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -8975,7 +8975,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9065,7 +9065,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9197,7 +9197,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9301,7 +9301,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9363,7 +9363,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9467,7 +9467,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9613,7 +9613,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9703,7 +9703,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -9833,7 +9833,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10049,7 +10049,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10153,7 +10153,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10243,7 +10243,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10403,7 +10403,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10563,7 +10563,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10639,7 +10639,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10813,7 +10813,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10889,7 +10889,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -10963,7 +10963,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11143,7 +11143,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11275,7 +11275,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11421,7 +11421,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11483,7 +11483,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11587,7 +11587,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11719,7 +11719,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11977,7 +11977,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -12403,7 +12403,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -12549,7 +12549,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -13269,7 +13269,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -13429,7 +13429,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -13505,7 +13505,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -13569,9 +13569,9 @@
</entityFields>
</entityDb>
<entityDb>
- <name>AB_PERMISSIONCALENDAR</name>
+ <name>EXPORTTEMPLATEPLACEOFUSE</name>
<dbName></dbName>
- <idColumn>AB_PERMISSIONCALENDARID</idColumn>
+ <idColumn>EXPORTTEMPLATEPLACEOFUSEID</idColumn>
<idGeneratorType v="0" />
<idGeneratorInterval v="1" />
<documentation></documentation>
@@ -13587,12 +13587,434 @@
</auditSyncConfig>
<entityFields>
<entityFieldDb>
- <name>PERMISSION</name>
+ <name>EXPORTTEMPLATEPLACEOFUSEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PLACEOFUSE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EXPORTTEMPLATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <dependencies>
+ <entityDependency>
+ <name>a9054d80-d866-4312-9a53-03c7fbb06165</name>
+ <entityName>EXPORTTEMPLATE</entityName>
+ <fieldName>EXPORTTEMPLATEID</fieldName>
+ </entityDependency>
+ </dependencies>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>DOCUMENTTEMPLATEPLACEOFUSE</name>
+ <dbName></dbName>
+ <idColumn>DOCUMENTTEMPLATEPLACEOFUSEID</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>DOCUMENTTEMPLATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>PLACEOFUSE</name>
<dbName></dbName>
<primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DOCUMENTTEMPLATEPLACEOFUSEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
<columnType v="1" />
<size v="36" />
<scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>EXPORTTEMPLATE</name>
+ <dbName></dbName>
+ <idColumn>EXPORTTEMPLATEID</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>ISOLANGUAGE</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></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>DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="1337" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SEPARATOR</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EXPORTTEMPLATEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TITLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="100" />
+ <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="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_EDIT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>EXPORTTEMPLATEFIELD</name>
+ <dbName></dbName>
+ <idColumn>EXPORTTEMPLATEFIELDID</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>FIELD</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EXPORTTEMPLATEFIELDID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SORTING</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="5" />
+ <size v="5" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EXPORTTEMPLATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>EXPORTTEMPLATESELECTION</name>
+ <dbName></dbName>
+ <idColumn>EXPORTTEMPLATESELECTIONID</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>EXPORTTEMPLATESELECTIONID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>EXPORTTEMPLATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <dependencies>
+ <entityDependency>
+ <name>e391399b-0f92-436d-96fa-1aaed5f712a8</name>
+ <entityName>EXPORTTEMPLATE</entityName>
+ <fieldName>EXPORTTEMPLATEID</fieldName>
+ </entityDependency>
+ </dependencies>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>FILENAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="33" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>AB_PERMISSIONCALENDAR</name>
+ <dbName></dbName>
+ <idColumn>AB_PERMISSIONCALENDARID</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>PERMISSION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
diff --git a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
index aad3346e5094ea711cef7be840e64d960313da72..16698f619bcff3845d05565739efbbcad9d7b4e2 100644
--- a/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
+++ b/aliasDefinition/_____SYSTEMALIAS/_____SYSTEMALIAS.aod
@@ -75,7 +75,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -213,7 +213,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -326,7 +326,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -464,7 +464,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -706,7 +706,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -857,7 +857,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -995,7 +995,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1133,7 +1133,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1246,7 +1246,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1397,7 +1397,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<title></title>
<description></description>
</entityFieldDb>
@@ -1534,7 +1534,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -1806,7 +1806,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -1868,7 +1868,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -1930,7 +1930,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -2006,7 +2006,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -2068,7 +2068,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -2186,7 +2186,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -2248,7 +2248,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -2616,7 +2616,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -2720,7 +2720,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -2838,7 +2838,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="true" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 1d89f0af72e0c2173db0bbd4112fb9ee481c7105..bd6660d03011988f37bd579d6706396c0baf3710 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -284,6 +284,10 @@
<kind v="10077" />
<title></title>
</entityNode>
+ <entityNode>
+ <name>ExportTemplate</name>
+ <kind v="10077" />
+ </entityNode>
<entityNode>
<name>WorkflowDefinition</name>
<kind v="10077" />
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index f2201393b8ef0ca3b8308c427400cf082cd431c6..314198e2dde0bb0d0f1396e73540082ed6ace12e 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -116,6 +116,7 @@
<entityParameter>
<name>InvertBlacklist_param</name>
<expose v="true" />
+ <documentation>%aditoprj%/entity/Context_entity/entityfields/invertblacklist_param/documentation.adoc</documentation>
<description>PARAMETER</description>
</entityParameter>
<entityProvider>
@@ -159,6 +160,34 @@
</entityDependency>
</dependencies>
</entityProvider>
+ <entityProvider>
+ <name>ContextTemplatePlaceOfUse</name>
+ <dependencies>
+ <entityDependency>
+ <name>423a7a33-02f4-4975-94fd-fa0c21278e3b</name>
+ <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
+ <fieldName>ContextDocumentTemplatePlaceOfUse</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>26628738-c954-4bf5-8c1f-cbc008d73056</name>
+ <entityName>ExportTemplatePlaceOfUse_entity</entityName>
+ <fieldName>ContextExportTemplatePlaceOfUse</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <valueProcess>%aditoprj%/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js b/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e45ce3b6cda9f9cffa1f8c6046d4267f2eb0a61
--- /dev/null
+++ b/entity/Context_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object(["Person", "Organisation"]);
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js b/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e45ce3b6cda9f9cffa1f8c6046d4267f2eb0a61
--- /dev/null
+++ b/entity/Context_entity/entityfields/contexttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object(["Person", "Organisation"]);
\ No newline at end of file
diff --git a/entity/Context_entity/entityfields/invertblacklist_param/documentation.adoc b/entity/Context_entity/entityfields/invertblacklist_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..96d599f7613f03991b7d3cfcb6f174ed73317309
--- /dev/null
+++ b/entity/Context_entity/entityfields/invertblacklist_param/documentation.adoc
@@ -0,0 +1,5 @@
+= InvertBlacklist_param
+
+needs true or false.
+If true = Blacklist is inverted (whitelist)
+If false = normal Blacklist
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..12f70f2df715a8c7c7e81472a5158f511fc6a552
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/DocumentTemplatePlaceOfUse_entity.aod
@@ -0,0 +1,100 @@
+<?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.13" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.13">
+ <name>DocumentTemplatePlaceOfUse_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <title>Documenttemplate Place Of Use</title>
+ <titlePlural>Documenttemplate Places Of Useage</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>DOCUMENTTEMPLATEPLACEOFUSEID</name>
+ <title>DocumentPlaceOfUseId</title>
+ <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuseid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DOCUMENTTEMPLATE_ID</name>
+ <title>Documenttemplate_Id</title>
+ <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplate_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PLACEOFUSE</name>
+ <title>Place Of Use</title>
+ <consumer>ContextDocumentTemplatePlaceOfUse</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ContextDocumentTemplatePlaceOfUse</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>ContextTemplatePlaceOfUse</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>DocumentTemplatePlaceOfUse</name>
+ <dependencies>
+ <entityDependency>
+ <name>bc05b556-ecca-478c-9a92-b77e4d98d6f3</name>
+ <entityName>DocumentTemplate_entity</entityName>
+ <fieldName>DocumentTemplatePlaceOfUse</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplatePlaceOfUse_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>DocumentTemplatePlaceOfUse_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/DocumentTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>df318337-f5d2-4046-989d-476f336b3fb4</name>
+ <tableName>DOCUMENTTEMPLATEPLACEOFUSE</tableName>
+ <primaryKey>DOCUMENTTEMPLATEPLACEOFUSEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATE_ID.value</name>
+ <recordfield>DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DOCUMENTTEMPLATEPLACEOFUSEID.value</name>
+ <recordfield>DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATEPLACEOFUSEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PLACEOFUSE.value</name>
+ <recordfield>DOCUMENTTEMPLATEPLACEOFUSE.PLACEOFUSE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e45ce3b6cda9f9cffa1f8c6046d4267f2eb0a61
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/blacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object(["Person", "Organisation"]);
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..599bfc35195077f2fb171156ddaf1faddd9b3254
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/contextdocumenttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true)
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplate_id/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6ce7ecb1e67d526de905d3f89bd4d61b590c077a
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplate_id/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.exists("$param.DocumentTemplatePlaceOfUse_param") && vars.get("$param.DocumentTemplatePlaceOfUse_param") != null
+ && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+ result.string(vars.getString("$param.DocumentTemplatePlaceOfUse_param"));
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f786c8c7b183a2cf2240b9a314f499b55fcdf72c
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse_param/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f786c8c7b183a2cf2240b9a314f499b55fcdf72c
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuse_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuseid/valueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuseid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d81b1c1049eb25c998728bf5e0b90bada3a24e8d
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/documenttemplateplaceofuseid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd3384b9ec0af65bca467795cd70e356e2e08fe4
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var placeOfUse = vars.get("$field.PLACEOFUSE");
+
+if(placeOfUse)
+result.string(ContextUtils.getTitle(placeOfUse, true));
\ No newline at end of file
diff --git a/entity/DocumentTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6e52152b3be7156116bc04b71b8f7a77ac26a4bd
--- /dev/null
+++ b/entity/DocumentTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID", "$param.DocumentTemplatePlaceOfUse_param");
+result.string(cond);
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 962069a33c33cd27b0e1649c55b32cce60afc48a..dbfe4eca7af8f8240a64b81c9357ea869a9c8f22 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -281,6 +281,12 @@
<isConsumer v="false" />
</entityDependency>
</dependencies>
+ <children>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
</entityProvider>
<entityParameter>
<name>DocumentTemplateType_param</name>
@@ -315,6 +321,25 @@
<stateProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/preview/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/preview/valueProcess.js</valueProcess>
</entityField>
+ <entityConsumer>
+ <name>DocumentTemplatePlaceOfUse</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
+ <fieldName>DocumentTemplatePlaceOfUse</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DocumentTemplatePlaceOfUse_param</name>
+ <valueProcess>%aditoprj%/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f786c8c7b183a2cf2240b9a314f499b55fcdf72c
--- /dev/null
+++ b/entity/DocumentTemplate_entity/entityfields/documenttemplateplaceofuse/children/documenttemplateplaceofuse_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.DOCUMENTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
index f00432c718e6a697f9bb7ca93bdbc6b926d59efe..a6caa092b127b8be6153548a5be25be6507ba913 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -4,8 +4,14 @@ import("system.db");
import("Sql_lib");
var cond = newWhere()
- .andIfSet("DOCUMENTTEMPLATE.KIND", "$param.DocumentTemplateType_param")
- .andIfSet("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param");
+ .andIfSet("DOCUMENTTEMPLATE.KIND", "$param.DocumentTemplateType_param")
+ .andIfSet("DOCUMENTTEMPLATE.CLASSIFICATION", "$param.DocumentTemplateTypeClassification_param");
-//TODO: use a preparedCondition (.build instead of .toString) when available #1030812 #1034026
-result.string(cond.toString());
+if(vars.get("$param.ComingFrom_param"))
+{
+ cond.and("DOCUMENTTEMPLATE.DOCUMENTTEMPLATEID", newSelect("DOCUMENTTEMPLATEPLACEOFUSE.DOCUMENTTEMPLATE_ID")
+ .from("DOCUMENTTEMPLATEPLACEOFUSE")
+ .where("DOCUMENTTEMPLATEPLACEOFUSE.PLACEOFUSE", "$param.ComingFrom_param"),SqlBuilder.IN());
+}
+
+result.string(cond);
\ No newline at end of file
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index f27af73fbb8f680a3ea4dad7752a71622a683a37..1eecd7924d715c7e54031575fc439272bc85ad98 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -29,6 +29,10 @@
<name>DocumentTemplateType_param</name>
<valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <valueProcess>%aditoprj%/entity/Email_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityParameter>
@@ -76,6 +80,14 @@
<iconId>VAADIN:FILE_FONT</iconId>
<stateProcess>%aditoprj%/entity/Email_entity/entityfields/downloadtemplate/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>comingfrom</name>
+ <valueProcess>%aditoprj%/entity/Email_entity/entityfields/comingfrom/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Email_entity/entityfields/comingfrom/valueProcess.js b/entity/Email_entity/entityfields/comingfrom/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e1559e60a161a0cc6323ece8b28b23741043a814
--- /dev/null
+++ b/entity/Email_entity/entityfields/comingfrom/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.get("$param.ComingFrom_param"))
+result.string(vars.get("$param.ComingFrom_param"));
\ No newline at end of file
diff --git a/entity/Email_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js b/entity/Email_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..489ff072d50288d03c732806a74e476c8eb99807
--- /dev/null
+++ b/entity/Email_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.comingfrom"));
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e75b7a26601ab6ea72549591463ec6e47240715f
--- /dev/null
+++ b/entity/ExportTemplateField_entity/ExportTemplateField_entity.aod
@@ -0,0 +1,101 @@
+<?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.13" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.13">
+ <name>ExportTemplateField_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ExportTemplateField_entity/documentation.adoc</documentation>
+ <title>Export Template Field</title>
+ <titlePlural>Export Template Fields</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>EXPORTTEMPLATEFIELDID</name>
+ <title>ExportTemplateFieldID</title>
+ <mandatory v="true" />
+ <tooltip></tooltip>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefieldid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EXPORTTEMPLATE_ID</name>
+ <title>ExportTemplate</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>FIELD</name>
+ <title>Field</title>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityProvider>
+ <name>ExportTemplateFields</name>
+ <dependencies>
+ <entityDependency>
+ <name>b111615c-cde3-46b7-b229-46cc2db004fd</name>
+ <entityName>ExportTemplate_entity</entityName>
+ <fieldName>ExportTemplateFields</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateField_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ExportTemplateField_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateField_entity/entityfields/exporttemplatefield_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>SORTING</name>
+ <title>Sorting</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>###</outputFormat>
+ <inputFormat>###</inputFormat>
+ <mandatory v="true" />
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isPageable v="true" />
+ <isReadOnly v="false" />
+ <conditionProcess>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <orderClauseProcess>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>7236de85-f623-4f6a-9ff5-d9014a2f7a4c</name>
+ <tableName>EXPORTTEMPLATEFIELD</tableName>
+ <primaryKey>EXPORTTEMPLATEFIELDID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>EXPORTTEMPLATE_ID.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID</recordfield>
+ <expression>%aditoprj%/entity/ExportTemplateField_entity/recordcontainers/db/recordfieldmappings/exporttemplate_id.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>EXPORTTEMPLATEFIELDID.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.EXPORTTEMPLATEFIELDID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>FIELD.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.FIELD</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SORTING.value</name>
+ <recordfield>EXPORTTEMPLATEFIELD.SORTING</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ExportTemplateField_entity/documentation.adoc b/entity/ExportTemplateField_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..12a981536f07b090008f49b7462d5ec16c7c5d6c
--- /dev/null
+++ b/entity/ExportTemplateField_entity/documentation.adoc
@@ -0,0 +1,4 @@
+= ExportTemplateField_entity
+
+Entity to store all the Fields from the ExportTemplates, linked to the Template via the ExportTemplateId.
+Own dbTable Entity is needed to make it possible to store multiple fields for one template
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..76dc5ef71d45ba4b444c21383abcbd8281f1e26f
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplate_id/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ if(vars.exists("$param.ExportTemplateField_param") && vars.get("$param.ExportTemplateField_param") != null)
+ result.string(vars.getString("$param.ExportTemplateField_param"));
+}
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplatefield_param/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplatefield_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplatefield_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplatefieldid/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplatefieldid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d81b1c1049eb25c998728bf5e0b90bada3a24e8d
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplatefieldid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js b/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..08ec9605693f96322c16424b5da5990bbf9a9b11
--- /dev/null
+++ b/entity/ExportTemplateField_entity/entityfields/field/dropDownProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Placeholder_lib");
+import("system.text")
+
+var placeholders = PlaceholderUtils.getPlaceholders(null, true).map(function (placeholder){
+ return [placeholder.placeholderName, placeholder.title || placeholder.placeholderName];
+})
+
+result.object(placeholders);
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js b/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0a8fd4155c358a1f28eecdeba07050276ed58e5b
--- /dev/null
+++ b/entity/ExportTemplateField_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", "$param.ExportTemplateField_param");
+result.string(cond);
+
diff --git a/entity/ExportTemplateField_entity/recordcontainers/db/orderClauseProcess.js b/entity/ExportTemplateField_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a2e3dd517a64c190669cd534332c948230223536
--- /dev/null
+++ b/entity/ExportTemplateField_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.db");
+
+result.object({
+ "EXPORTTEMPLATEFIELD.SORTING": db.ASCENDING
+ });
\ No newline at end of file
diff --git a/entity/ExportTemplateField_entity/recordcontainers/db/recordfieldmappings/exporttemplate_id.value/expression.js b/entity/ExportTemplateField_entity/recordcontainers/db/recordfieldmappings/exporttemplate_id.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6ccf31f474a2e5cbae1e09c894fcaba4ba7c4232
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/ExportTemplatePlaceOfUse_entity.aod
@@ -0,0 +1,105 @@
+<?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.13" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.13">
+ <name>ExportTemplatePlaceOfUse_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc</documentation>
+ <title>Place of Use</title>
+ <titlePlural>Places of Usage</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>EXPORTTEMPLATEPLACEOFUSEID</name>
+ <title>EXPORTTEMPLATEPLACEOFUSEID</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EXPORTTEMPLATE_ID</name>
+ <title>Exporttemplate</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>PLACEOFUSE</name>
+ <title>Place of use</title>
+ <consumer>ContextExportTemplatePlaceOfUse</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>ContextExportTemplatePlaceOfUse</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Context_entity</entityName>
+ <fieldName>ContextTemplatePlaceOfUse</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/invertblacklist_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ExportTemplatePlaceOfUse_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>ExportTemplatePlaceOfUser</name>
+ <dependencies>
+ <entityDependency>
+ <name>c60a238a-51f0-4538-8c53-6921481ddd4c</name>
+ <entityName>ExportTemplate_entity</entityName>
+ <fieldName>ExportTemplateplaceOfUseCon</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExportTemplatePlaceOfUse_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/children/exporttemplateplaceofuse_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>5e6f806e-c845-49ab-bfee-31b12e4c41f3</name>
+ <tableName>EXPORTTEMPLATEPLACEOFUSE</tableName>
+ <primaryKey>EXPORTTEMPLATEPLACEOFUSEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>EXPORTTEMPLATE_ID.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID</recordfield>
+ <expression>%aditoprj%/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/recordfieldmappings/exporttemplate_id.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>EXPORTTEMPLATEPLACEOFUSEID.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATEPLACEOFUSEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PLACEOFUSE.value</name>
+ <recordfield>EXPORTTEMPLATEPLACEOFUSE.PLACEOFUSE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc b/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..33f229e05ddc227b08ebb4f7eb4d91dada61a9b6
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/documentation.adoc
@@ -0,0 +1,5 @@
+= ExportTemplatePlaceOfUse_entity
+
+Entity to select all Modules where the created template should be useable (to limit the availability in the modules).
+Linked via the ExportTemplateID
+Own dbTable and Entity are to make it possible to store multiple fields for one template.
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e45ce3b6cda9f9cffa1f8c6046d4267f2eb0a61
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/blacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.object(["Person", "Organisation"]);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/invertblacklist_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..599bfc35195077f2fb171156ddaf1faddd9b3254
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/contextexporttemplateplaceofuse/children/invertblacklist_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true)
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7c84123ee891ea1b5d0719e8b77ae5cc7a0ca33b
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplate_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ if(vars.exists("$param.ExportTemplatePlaceOfUse_param") && vars.get("$param.ExportTemplatePlaceOfUse_param") != null
+ && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+ result.string(vars.getString("$param.ExportTemplatePlaceOfUse_param"));
+}
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuse_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d81b1c1049eb25c998728bf5e0b90bada3a24e8d
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuseid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/children/exporttemplateplaceofuse_param/valueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/children/exporttemplateplaceofuse_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/exporttemplateplaceofuser/children/exporttemplateplaceofuse_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dd3384b9ec0af65bca467795cd70e356e2e08fe4
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/entityfields/placeofuse/displayValueProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var placeOfUse = vars.get("$field.PLACEOFUSE");
+
+if(placeOfUse)
+result.string(ContextUtils.getTitle(placeOfUse, true));
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js b/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..30942689497eb2091398b6c15fb77fa8267a5806
--- /dev/null
+++ b/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,6 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhereIfSet("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID", "$param.ExportTemplatePlaceOfUse_param");
+result.string(cond);
\ No newline at end of file
diff --git a/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/recordfieldmappings/exporttemplate_id.value/expression.js b/entity/ExportTemplatePlaceOfUse_entity/recordcontainers/db/recordfieldmappings/exporttemplate_id.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7999e895197ef3bbd3739ec06dbaf64c96eb51b3
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/ExportTemplateSelection_entity.aod
@@ -0,0 +1,82 @@
+<?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.13" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.13">
+ <name>ExportTemplateSelection_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ExportTemplateSelection_entity/documentation.adoc</documentation>
+ <title>Exporttempalte Selection</title>
+ <contentTitleProcess>%aditoprj%/entity/ExportTemplateSelection_entity/contentTitleProcess.js</contentTitleProcess>
+ <recordContainer>jDito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>EXPORTTEMPLATESELECTIONID</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exporttemplateselectionid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>EXPORTTEMPLATE_ID</name>
+ <title>Exporttemplate</title>
+ <consumer>ExportTemplateComsumer</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exporttemplate_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityParameter>
+ <name>selectedData_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>ExportTemplateComsumer</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplate_entity</entityName>
+ <fieldName>ExportTemplateIDs</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateIDs_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/exporttemplateids_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>comingFrom_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/comingfrom_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>FILENAME</name>
+ <title>Filename</title>
+ <tooltip>Automatically generates an defaulttitle if left Blank</tooltip>
+ </entityField>
+ <entityField>
+ <name>selection</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>comingFrom_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/comingfrom_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>comingfrom</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplateSelection_entity/entityfields/comingfrom/valueProcess.js</valueProcess>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jDito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/ExportTemplateSelection_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/ExportTemplateSelection_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ExportTemplateSelection_entity/contentTitleProcess.js b/entity/ExportTemplateSelection_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ddd2d84051168f7a634537a04314c4f74c4233e1
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/contentTitleProcess.js
@@ -0,0 +1,5 @@
+import("ExportTemplate_lib");
+import("system.vars");
+import("system.result");
+
+result.string(ExportTemplateUtils.getExportTemplateTitle(vars.get("$field.EXPORTTEMPLATE_ID")));
diff --git a/entity/ExportTemplateSelection_entity/documentation.adoc b/entity/ExportTemplateSelection_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..080de302feb512ce9c6eb667037cb43aa616fe1e
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/documentation.adoc
@@ -0,0 +1,6 @@
+= ExportTemplateSelection_entity
+
+this Entity is needed for the exportAction in Person and Organisation.
+It's used for the Context ExportTemplateSelection (to open a new view in which you can select
+which ExportTemplate you want to use and choose a filename(optional).
+Linked to ExportTemplate via the ExportTemplateId.
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/comingfrom/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/comingfrom/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1a1c8901ceb6766105cfed31e0cb034dc372a500
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/comingfrom/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.get("$param.comingFrom_param"))
+ result.string(vars.get("$param.comingFrom_param"));
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/comingfrom_param/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/comingfrom_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exporttemplate_id/displayValueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exporttemplate_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..502353436146c39ef585cc30e318379f4015e43b
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exporttemplate_id/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("ExportTemplate_lib");
+
+var exporttemplateId = vars.get("$field.EXPORTTEMPLATE_ID");
+var exporttitle = ExportTemplateUtils.getExportTemplateTitle(exporttemplateId);
+result.string(exporttitle);
+
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/comingfrom_param/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/comingfrom_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..489ff072d50288d03c732806a74e476c8eb99807
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/comingfrom_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.comingfrom"));
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/exporttemplateids_param/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exporttemplatecomsumer/children/exporttemplateids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/ExportTemplateSelection_entity/entityfields/exporttemplateselectionid/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/exporttemplateselectionid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6ff4a9c1959d04bc196a5b0f742958ac9cb73152
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/exporttemplateselectionid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+ result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6779bc32ba75e82ff16f072e56a8efeefb0ba329
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/entityfields/selection/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.get("$param.selectedData_param"))
+result.string(vars.get("$param.selectedData_param"));
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/recordcontainers/jdito/contentProcess.js b/entity/ExportTemplateSelection_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e197aca8b7760073849e21fb581b065c47215654
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.vars");
+
+//TODO: This dummy implementation shouldn't be nescessary here. Remove this process eventually. #1051003
+var rows = [];
+if (vars.get("$local.idvalues"))
+ rows = vars.get("$local.idvalues").map(function (id) {return [id];});
+
+result.object(rows);
\ No newline at end of file
diff --git a/entity/ExportTemplateSelection_entity/recordcontainers/jdito/onInsert.js b/entity/ExportTemplateSelection_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4237df19e543c334921e62da29247f955cbe61b
--- /dev/null
+++ b/entity/ExportTemplateSelection_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,13 @@
+import("system.neon");
+import("system.vars");
+import("ExportTemplate_lib");
+
+var filename = vars.get("$field.FILENAME");
+var templateId = vars.get("$field.EXPORTTEMPLATE_ID");
+var selection = vars.get("$field.selection");
+var comingFrom = vars.get("$field.comingfrom");
+
+if(templateId){
+var document = ExportTemplateUtils.buildExport(templateId, selection, comingFrom, filename);
+neon.download(document.content, document.filename);
+}
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/ExportTemplate_entity.aod b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..05f8c694dd2f191d1549b619638a5030d4e67696
--- /dev/null
+++ b/entity/ExportTemplate_entity/ExportTemplate_entity.aod
@@ -0,0 +1,223 @@
+<?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.13" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.13">
+ <name>ExportTemplate_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/ExportTemplate_entity/documentation.adoc</documentation>
+ <title>Export Template</title>
+ <grantCreate v="true" />
+ <grantUpdate v="true" />
+ <grantDelete v="true" />
+ <iconId>NEON:EXPORT</iconId>
+ <titlePlural>Export Templates</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>EXPORTTEMPLATEID</name>
+ <title>ExportTemplateID</title>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>TITLE</name>
+ <title>Templatename</title>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>SEPARATOR</name>
+ <title>Separator</title>
+ <consumer>KeywordExportTemplateSeparator</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/separator/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>ISOLANGUAGE</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_EDIT</name>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>USER_EDIT</name>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ </entityField>
+ <entityField>
+ <name>DESCRIPTION</name>
+ <title>Description</title>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordExportTemplateSeparator</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ContainerName_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/keywordexporttemplateseparator/children/containername_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityConsumer>
+ <name>ExportTemplateFields</name>
+ <state>EDITABLE</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplateField_entity</entityName>
+ <fieldName>ExportTemplateFields</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateField_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc</documentation>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>ExportTemplateIDs_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>ExportTemplateplaceOfUseCon</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>ExportTemplatePlaceOfUse_entity</entityName>
+ <fieldName>ExportTemplatePlaceOfUser</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>ExportTemplatePlaceOfUse_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateplaceofusecon/children/exporttemplateplaceofuse_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityProvider>
+ <name>ExportTemplateIDs</name>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>1b692618-b800-47ae-a48c-3d4164d68401</name>
+ <entityName>ExportTemplateSelection_entity</entityName>
+ <fieldName>ExportTemplateComsumer</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ExportTemplateIDs_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/exporttemplateids/children/exporttemplateids_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>comingFrom_param</name>
+ <valueProcess>%aditoprj%/entity/ExportTemplate_entity/entityfields/comingfrom_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <isReadOnly v="false" />
+ <conditionProcess>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>ce410f40-846b-43e6-9c30-150393cee43d</name>
+ <tableName>EXPORTTEMPLATE</tableName>
+ <primaryKey>EXPORTTEMPLATEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>DATE_EDIT.value</name>
+ <recordfield>EXPORTTEMPLATE.DATE_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>EXPORTTEMPLATE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISOLANGUAGE.value</name>
+ <recordfield>EXPORTTEMPLATE.ISOLANGUAGE</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>EXPORTTEMPLATEID.value</name>
+ <recordfield>EXPORTTEMPLATE.EXPORTTEMPLATEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.value</name>
+ <recordfield>EXPORTTEMPLATE.TITLE</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_EDIT.value</name>
+ <recordfield>EXPORTTEMPLATE.USER_EDIT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>EXPORTTEMPLATE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DESCRIPTION.value</name>
+ <recordfield>EXPORTTEMPLATE.DESCRIPTION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISOLANGUAGE.displayValue</name>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.displayValue</name>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SEPARATOR.value</name>
+ <recordfield>EXPORTTEMPLATE.SEPARATOR</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SEPARATOR.displayValue</name>
+ <expression>%aditoprj%/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/separator.displayvalue/expression.js</expression>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/ExportTemplate_entity/documentation.adoc b/entity/ExportTemplate_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7ff3082082e4138fb3e2b25da143e3099646eb9e
--- /dev/null
+++ b/entity/ExportTemplate_entity/documentation.adoc
@@ -0,0 +1,9 @@
+= ExportTemplate_entity
+
+Entity to store all the ExportTemplates.
+Exporttemplates are used to give the user an easy way to export Data from an table.
+
+linked via the ExportTemplateId to:
+-ExportTemplateField_entity to make it possible to store multiple fields for one template
+-ExportTemplatePlaceOfUse_entity to make it possible to store multiple places of usage for one template
+-ExportTemplateSelection_entity entity for the selection of the template
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/comingfrom_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/comingfrom_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc b/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..7ff3082082e4138fb3e2b25da143e3099646eb9e
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/documentation.adoc
@@ -0,0 +1,9 @@
+= ExportTemplate_entity
+
+Entity to store all the ExportTemplates.
+Exporttemplates are used to give the user an easy way to export Data from an table.
+
+linked via the ExportTemplateId to:
+-ExportTemplateField_entity to make it possible to store multiple fields for one template
+-ExportTemplatePlaceOfUse_entity to make it possible to store multiple places of usage for one template
+-ExportTemplateSelection_entity entity for the selection of the template
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplatefields/children/exporttemplatefield_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateid/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplateid/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d81b1c1049eb25c998728bf5e0b90bada3a24e8d
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateid/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.result");
+import("system.util");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
+result.string(util.getNewUUID());
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateids/children/exporttemplateids_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplateids/children/exporttemplateids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateids/children/exporttemplateids_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateids_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplateids_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cbc49005642cf289c724b7b2de89a5db926e630
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateids_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/exporttemplateplaceofusecon/children/exporttemplateplaceofuse_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/exporttemplateplaceofusecon/children/exporttemplateplaceofuse_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d8e00008de741ec03a1997e0bd169d0acd7f4cc7
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/exporttemplateplaceofusecon/children/exporttemplateplaceofuse_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.vars");
+
+result.string(vars.get("$field.EXPORTTEMPLATEID"));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/isolanguage/displayValueProcess.js b/entity/ExportTemplate_entity/entityfields/isolanguage/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5218a6d203a2742cdf7757f012ae061dc37ebf6a
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/isolanguage/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.loadContentTitle("Language_entity", vars.get("$field.ISOLANGUAGE")));
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js b/entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2bb039c219ee635fbd789a66704d4f5dd483dbfb
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/isolanguage/valueProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.getString("$this.value") == null)
+ result.string("deu");
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/entityfields/keywordexporttemplateseparator/children/containername_param/valueProcess.js b/entity/ExportTemplate_entity/entityfields/keywordexporttemplateseparator/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9eb0cf8cb0746c1a404bca6bf156703b636ae99b
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/keywordexporttemplateseparator/children/containername_param/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.exportTemplateSeparator());
diff --git a/entity/ExportTemplate_entity/entityfields/separator/displayValueProcess.js b/entity/ExportTemplate_entity/entityfields/separator/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..317fa50a8d89afdae880324447b3385a4fca92fe
--- /dev/null
+++ b/entity/ExportTemplate_entity/entityfields/separator/displayValueProcess.js
@@ -0,0 +1,13 @@
+import("system.vars");
+import("KeywordRegistry_basic");
+import("system.result");
+import("Keyword_lib");
+import("Sql_lib");
+
+var separator = vars.get("$field.SEPARATOR");
+
+if (separator)
+{
+ var keyword = KeywordUtils.getViewValue($KeywordRegistry.exportTemplateSeparator(), separator);
+ result.string(keyword);
+}
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/recordcontainers/db/conditionProcess.js b/entity/ExportTemplate_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4d1fbcf2ebafabb46672f71de2ae2d541a8036bf
--- /dev/null
+++ b/entity/ExportTemplate_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,15 @@
+import("system.logging");
+import("system.vars");
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+if(vars.get("$param.comingFrom_param"))
+{
+ var cond = newWhere()
+ .andIfSet("EXPORTTEMPLATE.EXPORTTEMPLATEID", newSelect("EXPORTTEMPLATEPLACEOFUSE.EXPORTTEMPLATE_ID")
+ .from("EXPORTTEMPLATEPLACEOFUSE")
+ .where("EXPORTTEMPLATEPLACEOFUSE.PLACEOFUSE", "$param.comingFrom_param"),SqlBuilder.IN());
+
+ result.string(cond.toString());
+}
\ No newline at end of file
diff --git a/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/separator.displayvalue/expression.js b/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/separator.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ef02d53399b2bfd4138ce6f7f9abc31b6caaa111
--- /dev/null
+++ b/entity/ExportTemplate_entity/recordcontainers/db/recordfieldmappings/separator.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.exportTemplateSeparator(), "EXPORTTEMPLATE.SEPARATOR");
+result.string(sql);
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 42e97867f0e1f6c792346f8e833fcda4be12c18e..972a7077db68804ac53f33d460c1c39d0db62b83 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -559,6 +559,24 @@
<fieldName>TriggerKeyword</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>5d7ad44b-b2c0-4b6c-a0d6-8be9ee3bc82d</name>
+ <entityName>ExportTemplate_entity</entityName>
+ <fieldName>KeywordExportTemplateSeparator</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>38c8a85b-3bea-44cf-b57e-23eba340adb4</name>
+ <entityName>ExportTemplatePlaceOfUse_entity</entityName>
+ <fieldName>ContextExportTemplatePlaceOfUse</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>f21760f5-e138-4924-b3ee-3881afbda5d9</name>
+ <entityName>DocumentTemplatePlaceOfUse_entity</entityName>
+ <fieldName>ContextDocumentTemplatePlaceOfUse</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
<entityDependency>
<name>79bdbc02-19dc-4ecc-a91f-d657bda6f6cd</name>
<entityName>PermissionCalendar_entity</entityName>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 9769e7791c375b6b36c5780a088567ace2083fb8..14cb819d4299eb80a9388a4659b97bce2c91f33c 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -81,6 +81,12 @@
<fieldName>Languages</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>809a6f10-7cdc-4dd8-a2bb-c6bc8085dd26</name>
+ <entityName>ExportTemplate_entity</entityName>
+ <fieldName>Languages</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index 40a1f62745a741646597a086804699006634c798..fe6a2ec86ae43b7b7295935274fadeb8508432ce 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -30,6 +30,10 @@
<name>DocumentTemplateType_param</name>
<valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/documenttemplatetype_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <valueProcess>%aditoprj%/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityParameter>
@@ -48,6 +52,14 @@
<iconId>VAADIN:DOWNLOAD_ALT</iconId>
<stateProcess>%aditoprj%/entity/Letter_entity/entityfields/downloadtemplate/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>comingfrom</name>
+ <valueProcess>%aditoprj%/entity/Letter_entity/entityfields/comingfrom/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>ComingFrom_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
diff --git a/entity/Letter_entity/entityfields/comingfrom/valueProcess.js b/entity/Letter_entity/entityfields/comingfrom/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..534410568e17af797c3ebace69df84e559fb35c7
--- /dev/null
+++ b/entity/Letter_entity/entityfields/comingfrom/valueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+
+if(vars.get("$param.ComingFrom_param"))
+ result.string(vars.get("$param.ComingFrom_param"));
\ No newline at end of file
diff --git a/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js b/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..489ff072d50288d03c732806a74e476c8eb99807
--- /dev/null
+++ b/entity/Letter_entity/entityfields/documenttemplates/children/comingfrom_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.comingfrom"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 20e23fc7fe10a2860c7b160ee30e5fedcbeef6a4..a498f293bd0cbacc1b97fc07446744fbbc19021c 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -850,38 +850,49 @@
<tooltip>New Appointment</tooltip>
</entityActionField>
<entityActionGroup>
- <name>campaignActionGroup</name>
+ <name>filterViewActionGroup</name>
+ <documentation>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/documentation.adoc</documentation>
<title>Campaign</title>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<children>
<entityActionField>
<name>addToCampaignFromTable</name>
<title>Add to Campaign</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="false" />
<iconId>NEON:GROUP_APPOINTMENT</iconId>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js</stateProcess>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js</stateProcess>
<tooltip>Add the selection to a campaign</tooltip>
- <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
+ <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>addToBulkMailFromTable</name>
<title>Add to Bulkmail</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId>
- <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
+ <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>addToSerialLetter</name>
<title>Add to serial letter</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
- <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
+ <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js
rename to entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
rename to entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
rename to entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js
rename to entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js
similarity index 97%
rename from entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js
rename to entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js
index 57283da6acec06f88e11a59fa92ba03cb2713f85..497a88278adfae851d54cddb2968601c0cc58aaf 100644
--- a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("Add the selection to a campaign"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/onActionProcess.js
rename to entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js
similarity index 100%
rename from entity/Organisation_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js
rename to entity/Organisation_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..68b83abdba534ab6e967244ddbab5057150be017
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -0,0 +1,21 @@
+import("system.neon");
+import("system.vars");
+
+var sysSelection = vars.get("$sys.selection");
+var params;
+if(sysSelection.length > 0) //if data selected -> use selected data
+{
+ params = {
+ "selectedData_param" : JSON.stringify(sysSelection),
+ "comingFrom_param" : vars.get("$sys.currentcontextname")}
+ neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+}
+else //else -> use Filtercondition
+{
+ let sysFilter = vars.get("$sys.filter");
+ params = {
+ "selectedData_param" : JSON.stringify(sysFilter),
+ "comingFrom_param" : vars.get("$sys.currentcontextname")}
+ neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+}
+
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4aaaed5c074ef854441aa45e3e7993b2f77c04c4
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Export columns using a exporttemplate"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/filterviewactiongroup/documentation.adoc b/entity/Organisation_entity/entityfields/filterviewactiongroup/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e1446b1df0e4809a8959f88b215ba15a341947ff
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/filterviewactiongroup/documentation.adoc
@@ -0,0 +1,3 @@
+= filterViewActionGroup
+
+Menu Actions are stored in here
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newemail/onActionProcess.js b/entity/Organisation_entity/entityfields/newemail/onActionProcess.js
index cd7548548702791f8f81ec290a532fd19feaeafa..3909fcec58d0904fdc3644ef78dbb9131439e3e2 100644
--- a/entity/Organisation_entity/entityfields/newemail/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newemail/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("Email_lib");
-EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"));
\ No newline at end of file
+EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/newletter/onActionProcess.js b/entity/Organisation_entity/entityfields/newletter/onActionProcess.js
index 8fd84c8478f4dcc2778b695da065365ef90fd0bf..480d83a1467c24026ae52174f16c6be32875cc42 100644
--- a/entity/Organisation_entity/entityfields/newletter/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newletter/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("DocumentTemplate_lib");
-LetterUtils.openNewLetter(vars.get("$field.CONTACTID"));
\ No newline at end of file
+LetterUtils.openNewLetter(vars.get("$field.CONTACTID"), vars.get("$sys.currentcontextname"));
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index d8d91904ade265bb4c7c735a4f5ac97bd870f211..5b06ba224a6766e29f54643cca0faa31fde6d750 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -967,47 +967,58 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<tooltip>Choose a campaign and a step to add the contact to a campaign</tooltip>
</entityActionField>
<entityActionGroup>
- <name>campaignActionGroup</name>
+ <name>filterViewActionGroup</name>
+ <documentation>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/documentation.adoc</documentation>
<title>Campaign</title>
<iconId>NEON:GROUP_APPOINTMENT</iconId>
<children>
<entityActionField>
<name>addToCampaignFromTable</name>
<title>Add to Campaign</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js</onActionProcess>
<isMenuAction v="true" />
<isObjectAction v="false" />
<isSelectionAction v="false" />
<iconId>NEON:GROUP_APPOINTMENT</iconId>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js</stateProcess>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js</stateProcess>
<tooltip>Add the selection to a campaign</tooltip>
- <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
+ <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>addToBulkMailFromTable</name>
<title>Add to Bulkmail</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:AT</iconId>
- <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js</stateProcess>
+ <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>addToSerialLetter</name>
<title>Add to serial letter</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<isSelectionAction v="true" />
<iconId>VAADIN:ENVELOPES</iconId>
- <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
+ <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js</onActionProcess>
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>startMultipleWorkflows</name>
<title>Start workflow</title>
- <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/startmultipleworkflows/onActionProcess.js</onActionProcess>
+ <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/startmultipleworkflows/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
<iconId>VAADIN:PLAY</iconId>
- <stateProcess>%aditoprj%/entity/Person_entity/entityfields/campaignactiongroup/children/startmultipleworkflows/stateProcess.js</stateProcess>
+ <stateProcess>%aditoprj%/entity/Person_entity/entityfields/filterviewactiongroup/children/startmultipleworkflows/stateProcess.js</stateProcess>
</entityActionField>
</children>
</entityActionGroup>
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/onActionProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/onActionProcess.js
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/onActionProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/onActionProcess.js
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/stateProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/stateProcess.js
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js
similarity index 97%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js
index 57283da6acec06f88e11a59fa92ba03cb2713f85..497a88278adfae851d54cddb2968601c0cc58aaf 100644
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtocampaignfromtable/tooltipProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtocampaignfromtable/tooltipProcess.js
@@ -1,4 +1,4 @@
-import("system.translate");
-import("system.result");
-
+import("system.translate");
+import("system.result");
+
result.string(translate.text("Add the selection to a campaign"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtoserialletter/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
similarity index 97%
rename from entity/Organisation_entity/entityfields/campaignactiongroup/children/addtoserialletter/onActionProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
index 7296d20d707acedf3b1ee23cdcc8372450289cb2..3bbd8231ed11dd2906547f569e1463e72561c9bd 100644
--- a/entity/Organisation_entity/entityfields/campaignactiongroup/children/addtoserialletter/onActionProcess.js
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/onActionProcess.js
@@ -1,6 +1,6 @@
-import("Bulkmail_lib");
-import("system.vars");
-import("system.neon");
-
-if (vars.exists("$sys.selection"))
+import("Bulkmail_lib");
+import("system.vars");
+import("system.neon");
+
+if (vars.exists("$sys.selection"))
SerialLetterUtils.openAddRecipientView(vars.getString("$sys.selection"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/addtoserialletter/tooltipProcess.js
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7b5bf332a2c00f4b6bf433aa9309a3c6034bbc7b
--- /dev/null
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/onActionProcess.js
@@ -0,0 +1,20 @@
+import("system.neon");
+import("system.vars");
+
+var sysSelection = vars.get("$sys.selection");
+var params;
+if(sysSelection.length > 0) //if data selected -> use selected data
+{
+ params = {
+ "selectedData_param" : JSON.stringify(sysSelection),
+ "comingFrom_param" : vars.get("$sys.currentcontextname")}
+ neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+}
+else //else -> use Filtercondition
+{
+ var sysFilter = vars.get("$sys.filter");
+ params = {
+ "selectedData_param" : JSON.stringify(sysFilter),
+ "comingFrom_param" : vars.get("$sys.currentcontextname")}
+ neon.openContext("ExportTemplateSelection", "ExportTemplateSelectionEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4aaaed5c074ef854441aa45e3e7993b2f77c04c4
--- /dev/null
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/children/export/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("Export columns using a exporttemplate"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/startmultipleworkflows/onActionProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/startmultipleworkflows/onActionProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/startmultipleworkflows/onActionProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/startmultipleworkflows/onActionProcess.js
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/startmultipleworkflows/stateProcess.js b/entity/Person_entity/entityfields/filterviewactiongroup/children/startmultipleworkflows/stateProcess.js
similarity index 100%
rename from entity/Person_entity/entityfields/campaignactiongroup/children/startmultipleworkflows/stateProcess.js
rename to entity/Person_entity/entityfields/filterviewactiongroup/children/startmultipleworkflows/stateProcess.js
diff --git a/entity/Person_entity/entityfields/filterviewactiongroup/documentation.adoc b/entity/Person_entity/entityfields/filterviewactiongroup/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..e1446b1df0e4809a8959f88b215ba15a341947ff
--- /dev/null
+++ b/entity/Person_entity/entityfields/filterviewactiongroup/documentation.adoc
@@ -0,0 +1,3 @@
+= filterViewActionGroup
+
+Menu Actions are stored in here
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/newemail/onActionProcess.js b/entity/Person_entity/entityfields/newemail/onActionProcess.js
index cd7548548702791f8f81ec290a532fd19feaeafa..f4fedc1dc3c525360d5572683060ea4ca1c372f6 100644
--- a/entity/Person_entity/entityfields/newemail/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newemail/onActionProcess.js
@@ -1,4 +1,5 @@
import("system.vars");
import("Email_lib");
-EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"));
\ No newline at end of file
+EmailWritingUtils.openNewMail(vars.getString("$field.CONTACTID"), null, vars.get("$sys.currentcontextname"));
+
diff --git a/entity/Person_entity/entityfields/newletter/onActionProcess.js b/entity/Person_entity/entityfields/newletter/onActionProcess.js
index 7b45fb04f877160700a49e15514b61011a5b655f..210d95fea373a37493579c3efd88c599cb64acd5 100644
--- a/entity/Person_entity/entityfields/newletter/onActionProcess.js
+++ b/entity/Person_entity/entityfields/newletter/onActionProcess.js
@@ -1,4 +1,4 @@
import("system.vars");
import("DocumentTemplate_lib");
-LetterUtils.openNewLetter(vars.get("$field.CONTACTID"));
\ No newline at end of file
+LetterUtils.openNewLetter(vars.get("$field.CONTACTID"), vars.get("$sys.currentcontextname"));
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index f3ae42e247b3c52c9833dd14f26ecab723fe2c49..603123301b78a4aa0cfcddbd81dca79bc8486cbb 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -6191,9 +6191,165 @@
<entry>
<key>Resume</key>
</entry>
+ <entry>
+ <key>Workflow signal</key>
+ </entry>
+ <entry>
+ <key>Seperator</key>
+ </entry>
+ <entry>
+ <key>Place of use</key>
+ </entry>
+ <entry>
+ <key>ExportTemplateID</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>ExportTemplateFieldID</key>
+ </entry>
+ <entry>
+ <key>Signal</key>
+ </entry>
+ <entry>
+ <key>Export Template Field</key>
+ </entry>
+ <entry>
+ <key>Export Template Fields</key>
+ </entry>
+ <entry>
+ <key>Scope</key>
+ </entry>
+ <entry>
+ <key>Export Template</key>
+ </entry>
+ <entry>
+ <key>ExportTemplate</key>
+ </entry>
+ <entry>
+ <key>Export Templates</key>
+ </entry>
+ <entry>
+ <key>Claim date</key>
+ </entry>
+ <entry>
+ <key>Comma</key>
+ </entry>
+ <entry>
+ <key>Semicolon</key>
+ </entry>
+ <entry>
+ <key>EXPORTTEMPLATEPLACEOFUSEID</key>
+ </entry>
+ <entry>
+ <key>Places of Usage</key>
+ </entry>
+ <entry>
+ <key>Export</key>
+ </entry>
+ <entry>
+ <key>Field and Position</key>
+ </entry>
+ <entry>
+ <key>AExport fields of this table</key>
+ </entry>
+ <entry>
+ <key>Place of Use</key>
+ </entry>
+ <entry>
+ <key>Export fields of this table</key>
+ </entry>
+ <entry>
+ <key>Exporttemplate</key>
+ </entry>
+ <entry>
+ <key>Exporttempalte Selection</key>
+ </entry>
+ <entry>
+ <key>Export CSV \"%0\" can now be downloaded</key>
+ </entry>
+ <entry>
+ <key>ExportTemplate Selection</key>
+ </entry>
+ <entry>
+ <key>Export Template PlaceOfUse</key>
+ </entry>
+ <entry>
+ <key>Exportfile \"%0\" can now be downloaded</key>
+ </entry>
+ <entry>
+ <key>Automatically generates an defaulttitle if left Blank</key>
+ </entry>
+ <entry>
+ <key>Templatename</key>
+ </entry>
+ <entry>
+ <key>Export coloumns using a exporttemplate</key>
+ </entry>
+ <entry>
+ <key>Organisationname</key>
+ </entry>
+ <entry>
+ <key>Lettersalutation</key>
+ </entry>
+ <entry>
+ <key>Fulladdress</key>
+ </entry>
+ <entry>
+ <key>Senderemail</key>
+ </entry>
+ <entry>
+ <key>Senderphone</key>
+ </entry>
+ <entry>
+ <key>Sendername</key>
+ </entry>
+ <entry>
+ <key>FullAddress</key>
+ </entry>
+ <entry>
+ <key>Documenttemplate Place Of Use</key>
+ </entry>
+ <entry>
+ <key>Documenttemplate_Id</key>
+ </entry>
+ <entry>
+ <key>PlaceOfUse</key>
+ </entry>
+ <entry>
+ <key>DocumentPlaceOfUseId</key>
+ </entry>
+ <entry>
+ <key>Documenttemplate Places Of Useage</key>
+ </entry>
+ <entry>
+ <key>Place Of Use</key>
+ </entry>
+ <entry>
+ <key>pComingFrom is not defined. 'ExportTemplateUtils.buildExport:63'</key>
+ </entry>
+ <entry>
+ <key>Separator</key>
+ </entry>
<entry>
<key>Finished tasks</key>
</entry>
+ <entry>
+ <key>File from this template could not be found anymore. </key>
+ </entry>
+ <entry>
+ <key>delete linked permissions and hierarchies</key>
+ </entry>
+ <entry>
+ <key>Child Roles</key>
+ </entry>
+ <entry>
+ <key>Parent Roles</key>
+ </entry>
+ <entry>
+ <key>Export columns using a exporttemplate</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 72c901a2685d456f33dbddff5a24b8fda70bb60e..ccac1c2b571a5827bbac9e296f74166916844c98 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -6806,6 +6806,7 @@
</entry>
<entry>
<key>Organisation name</key>
+ <value>Firmenname</value>
</entry>
<entry>
<key>To buildingnumber</key>
@@ -6857,6 +6858,7 @@
</entry>
<entry>
<key>Sales Project</key>
+ <value>Vertriebsprojekt</value>
</entry>
<entry>
<key>closed</key>
@@ -6902,6 +6904,7 @@
</entry>
<entry>
<key>Export letter</key>
+ <value>Brief exportieren</value>
</entry>
<entry>
<key>Integrate current into selected contact</key>
@@ -7237,6 +7240,7 @@
</entry>
<entry>
<key>Tab</key>
+ <value>Tabulator</value>
</entry>
<entry>
<key>Field separator</key>
@@ -7821,7 +7825,195 @@ Bitte Datumseingabe prüfen</value>
<key>${CANCELLED}</key>
</entry>
<entry>
- <key>ankle of</key>
+ <key>Workflow signal</key>
+ </entry>
+ <entry>
+ <key>Seperator</key>
+ <value>Trennzeichen</value>
+ </entry>
+ <entry>
+ <key>Place of use</key>
+ <value>Verwendungsort</value>
+ </entry>
+ <entry>
+ <key>ExportTemplateID</key>
+ <value>ExportvorlageID</value>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>ExportTemplateFieldID</key>
+ <value>ExportvorlagenFeldID</value>
+ </entry>
+ <entry>
+ <key>Signal</key>
+ </entry>
+ <entry>
+ <key>Export Template Field</key>
+ <value>ExportvorlagenFeld</value>
+ </entry>
+ <entry>
+ <key>Export Template Fields</key>
+ <value>ExportvorlagenFelder</value>
+ </entry>
+ <entry>
+ <key>Scope</key>
+ </entry>
+ <entry>
+ <key>Export Template</key>
+ <value>Exportvorlage</value>
+ </entry>
+ <entry>
+ <key>ExportTemplate</key>
+ <value>Exportvorlage</value>
+ </entry>
+ <entry>
+ <key>Export Templates</key>
+ <value>Exportvorlagen</value>
+ </entry>
+ <entry>
+ <key>Claim date</key>
+ </entry>
+ <entry>
+ <key>Comma</key>
+ <value>Komma</value>
+ </entry>
+ <entry>
+ <key>Semicolon</key>
+ <value>Strichpunkt</value>
+ </entry>
+ <entry>
+ <key>EXPORTTEMPLATEPLACEOFUSEID</key>
+ <value>ExportvorlagenverwendungsortId</value>
+ </entry>
+ <entry>
+ <key>Places of Usage</key>
+ <value>Verwendungsorte</value>
+ </entry>
+ <entry>
+ <key>Export</key>
+ <value>Export</value>
+ </entry>
+ <entry>
+ <key>Field and Position</key>
+ <value>Feld und Position</value>
+ </entry>
+ <entry>
+ <key>AExport fields of this table</key>
+ </entry>
+ <entry>
+ <key>Place of Use</key>
+ <value>Verwendungsort</value>
+ </entry>
+ <entry>
+ <key>Export fields of this table</key>
+ <value>Exortfelder von dieser Tabelle</value>
+ </entry>
+ <entry>
+ <key>Exporttemplate</key>
+ <value>Exportvorlage</value>
+ </entry>
+ <entry>
+ <key>Exporttempalte Selection</key>
+ <value>Exportvorlagenauswahl</value>
+ </entry>
+ <entry>
+ <key>ExportTemplate Selection</key>
+ <value>Exportvorlagenauswahl</value>
+ </entry>
+ <entry>
+ <key>Export Template PlaceOfUse</key>
+ <value>Exportvorlagenverwendungsort</value>
+ </entry>
+ <entry>
+ <key>Exportfile \"%0\" can now be downloaded</key>
+ <value>Exportdatei \"%0\" kann heruntergeladen werden</value>
+ </entry>
+ <entry>
+ <key>Automatically generates an defaulttitle if left Blank</key>
+ <value>Wird automatisch generiert, wenn dieses Feld freigelassen wird.</value>
+ </entry>
+ <entry>
+ <key>Export CSV \"%0\" can now be downloaded</key>
+ <value>Export CSV \"%0\" kann heruntergeladen werden</value>
+ </entry>
+ <entry>
+ <key>Templatename</key>
+ <value>Vorlagenname</value>
+ </entry>
+ <entry>
+ <key>Organisationname</key>
+ <value>Firmenname</value>
+ </entry>
+ <entry>
+ <key>Lettersalutation</key>
+ <value>Briefanrede</value>
+ </entry>
+ <entry>
+ <key>Fulladdress</key>
+ <value>Vollständige Addresse</value>
+ </entry>
+ <entry>
+ <key>Senderemail</key>
+ </entry>
+ <entry>
+ <key>Senderphone</key>
+ </entry>
+ <entry>
+ <key>Sendername</key>
+ </entry>
+ <entry>
+ <key>FullAddress</key>
+ <value>Vollständige Addresse</value>
+ </entry>
+ <entry>
+ <key>Documenttemplate Place Of Use</key>
+ <value>Verwendungsort</value>
+ </entry>
+ <entry>
+ <key>Documenttemplate_Id</key>
+ <value>Dokumentvorlagen_Id</value>
+ </entry>
+ <entry>
+ <key>PlaceOfUse</key>
+ <value>Verwendungsort</value>
+ </entry>
+ <entry>
+ <key>DocumentPlaceOfUseId</key>
+ <value>DokumentVerwendungsortsId</value>
+ </entry>
+ <entry>
+ <key>Documenttemplate Places Of Useage</key>
+ <value>Verwendungsorte</value>
+ </entry>
+ <entry>
+ <key>Place Of Use</key>
+ <value>Verwendungsort</value>
+ </entry>
+ <entry>
+ <key>pComingFrom is not defined. 'ExportTemplateUtils.buildExport:63'</key>
+ <value>pComingFrom is not defined. 'ExportTemplateUtils.buildExport:63'</value>
+ </entry>
+ <entry>
+ <key>Separator</key>
+ <value>Trennzeichen</value>
+ </entry>
+ <entry>
+ <key>File from this template could not be found anymore. </key>
+ </entry>
+ <entry>
+ <key>delete linked permissions and hierarchies</key>
+ </entry>
+ <entry>
+ <key>Child Roles</key>
+ </entry>
+ <entry>
+ <key>Parent Roles</key>
+ </entry>
+ <entry>
+ <key>Export columns using a exporttemplate</key>
+ <value>Exportiere Spalten mithilfe einer Exportvorlage</value>
</entry>
<entry>
<key>Permission procurer</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index fcac10f43ec09a0db4ddd7e92190b5da1a2be4c7..b0da6010d1aff2811cce50445d837f6a0dd96146 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -6253,9 +6253,165 @@
<entry>
<key>Resume</key>
</entry>
+ <entry>
+ <key>Workflow signal</key>
+ </entry>
+ <entry>
+ <key>Seperator</key>
+ </entry>
+ <entry>
+ <key>Place of use</key>
+ </entry>
+ <entry>
+ <key>ExportTemplateID</key>
+ </entry>
+ <entry>
+ <key>Context</key>
+ </entry>
+ <entry>
+ <key>ExportTemplateFieldID</key>
+ </entry>
+ <entry>
+ <key>Signal</key>
+ </entry>
+ <entry>
+ <key>Export Template Field</key>
+ </entry>
+ <entry>
+ <key>Export Template Fields</key>
+ </entry>
+ <entry>
+ <key>Scope</key>
+ </entry>
+ <entry>
+ <key>Export Template</key>
+ </entry>
+ <entry>
+ <key>ExportTemplate</key>
+ </entry>
+ <entry>
+ <key>Export Templates</key>
+ </entry>
+ <entry>
+ <key>Claim date</key>
+ </entry>
+ <entry>
+ <key>Comma</key>
+ </entry>
+ <entry>
+ <key>Semicolon</key>
+ </entry>
+ <entry>
+ <key>EXPORTTEMPLATEPLACEOFUSEID</key>
+ </entry>
+ <entry>
+ <key>Places of Usage</key>
+ </entry>
+ <entry>
+ <key>Export</key>
+ </entry>
+ <entry>
+ <key>Field and Position</key>
+ </entry>
+ <entry>
+ <key>AExport fields of this table</key>
+ </entry>
+ <entry>
+ <key>Place of Use</key>
+ </entry>
+ <entry>
+ <key>Export fields of this table</key>
+ </entry>
+ <entry>
+ <key>Exporttemplate</key>
+ </entry>
+ <entry>
+ <key>Exporttempalte Selection</key>
+ </entry>
+ <entry>
+ <key>Export CSV \"%0\" can now be downloaded</key>
+ </entry>
+ <entry>
+ <key>ExportTemplate Selection</key>
+ </entry>
+ <entry>
+ <key>Export Template PlaceOfUse</key>
+ </entry>
+ <entry>
+ <key>Exportfile \"%0\" can now be downloaded</key>
+ </entry>
+ <entry>
+ <key>Automatically generates an defaulttitle if left Blank</key>
+ </entry>
+ <entry>
+ <key>Templatename</key>
+ </entry>
+ <entry>
+ <key>Export coloumns using a exporttemplate</key>
+ </entry>
+ <entry>
+ <key>Organisationname</key>
+ </entry>
+ <entry>
+ <key>Lettersalutation</key>
+ </entry>
+ <entry>
+ <key>Fulladdress</key>
+ </entry>
+ <entry>
+ <key>Senderemail</key>
+ </entry>
+ <entry>
+ <key>Senderphone</key>
+ </entry>
+ <entry>
+ <key>Sendername</key>
+ </entry>
+ <entry>
+ <key>FullAddress</key>
+ </entry>
+ <entry>
+ <key>Documenttemplate Place Of Use</key>
+ </entry>
+ <entry>
+ <key>Documenttemplate_Id</key>
+ </entry>
+ <entry>
+ <key>PlaceOfUse</key>
+ </entry>
+ <entry>
+ <key>DocumentPlaceOfUseId</key>
+ </entry>
+ <entry>
+ <key>Documenttemplate Places Of Useage</key>
+ </entry>
+ <entry>
+ <key>Place Of Use</key>
+ </entry>
+ <entry>
+ <key>pComingFrom is not defined. 'ExportTemplateUtils.buildExport:63'</key>
+ </entry>
+ <entry>
+ <key>Separator</key>
+ </entry>
<entry>
<key>Finished tasks</key>
</entry>
+ <entry>
+ <key>File from this template could not be found anymore. </key>
+ </entry>
+ <entry>
+ <key>delete linked permissions and hierarchies</key>
+ </entry>
+ <entry>
+ <key>Child Roles</key>
+ </entry>
+ <entry>
+ <key>Parent Roles</key>
+ </entry>
+ <entry>
+ <key>Export columns using a exporttemplate</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/DocumentTemplatePlaceOfUse/DocumentTemplatePlaceOfUse.aod b/neonContext/DocumentTemplatePlaceOfUse/DocumentTemplatePlaceOfUse.aod
new file mode 100644
index 0000000000000000000000000000000000000000..32463ebbcd64371ea9b60df93ad30442b7fde96f
--- /dev/null
+++ b/neonContext/DocumentTemplatePlaceOfUse/DocumentTemplatePlaceOfUse.aod
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>DocumentTemplatePlaceOfUse</name>
+ <title>Documenttemplate Place Of Use</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>DocumentTemplatePlaceOfUse_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>d602ddab-8a53-4f53-921d-5acb93e9bbe4</name>
+ <view>DocumentTemplateplaceOfUseList_viewasd</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>884cc1b0-6698-476e-a1ae-44fa6b88434d</name>
+ <view>DocumentTemplatePlaceOfUseMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5ff2e8d4-2834-466b-bd11-7339244e3b45</name>
+ <view>DocumentTemplatePlaceOfUseTitledList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ExportTemplate/ExportTemplate.aod b/neonContext/ExportTemplate/ExportTemplate.aod
new file mode 100644
index 0000000000000000000000000000000000000000..40c9ea289209b23bad28b2eb33ebc1c65fd1273e
--- /dev/null
+++ b/neonContext/ExportTemplate/ExportTemplate.aod
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ExportTemplate</name>
+ <title>Export Template</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>NEON:EXPORT</icon>
+ <filterView>ExportTemplateFilter_view</filterView>
+ <editView>ExportTemplateEdit_view</editView>
+ <previewView>ExportTemplatePreview_view</previewView>
+ <lookupView>ExportTemplateFilter_view</lookupView>
+ <entity>ExportTemplate_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>15d73263-e983-432a-b1b2-dde533c7ce2e</name>
+ <view>ExportTemplateFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f9dc177a-a990-4f37-9e05-63dbf48e4795</name>
+ <view>ExportTemplatePreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>6986af0d-95a1-4e6c-8687-da99296b9c7d</name>
+ <view>ExportTemplateEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ExportTemplateField/ExportTemplateField.aod b/neonContext/ExportTemplateField/ExportTemplateField.aod
new file mode 100644
index 0000000000000000000000000000000000000000..155383faabb6c58f1d4a3f0356aad7965ee7cc46
--- /dev/null
+++ b/neonContext/ExportTemplateField/ExportTemplateField.aod
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ExportTemplateField</name>
+ <title>Export Template Field</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <editView>ExportTemplateFieldMultiEdit_view</editView>
+ <entity>ExportTemplateField_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>9fd98eee-d750-48e1-818a-9c85ea64ed25</name>
+ <view>ExportTemplateFieldMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>f015edb3-3dd0-431f-ac6f-3f23a350e36c</name>
+ <view>ExportTemplateFieldList_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ExportTemplatePlaceofUse/ExportTemplatePlaceofUse.aod b/neonContext/ExportTemplatePlaceofUse/ExportTemplatePlaceofUse.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3b3b7eeb6424a266cff34a2711b89e67d1cb17f4
--- /dev/null
+++ b/neonContext/ExportTemplatePlaceofUse/ExportTemplatePlaceofUse.aod
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ExportTemplatePlaceofUse</name>
+ <title>Export Template PlaceOfUse</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>ExportTemplatePlaceOfUse_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>99e2e84f-a46a-4dd4-a312-254eb2d4c935</name>
+ <view>ExportTemplatePlaceOfUseList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>5b1a0851-93c8-451e-b10e-ef3defa1e9f4</name>
+ <view>ExportTemplatePlaceOfUseMultiEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/ExportTemplateSelection/ExportTemplateSelection.aod b/neonContext/ExportTemplateSelection/ExportTemplateSelection.aod
new file mode 100644
index 0000000000000000000000000000000000000000..25d9ae707c2a85a1a5c1903f6c3bb65a23de25d9
--- /dev/null
+++ b/neonContext/ExportTemplateSelection/ExportTemplateSelection.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>ExportTemplateSelection</name>
+ <title>ExportTemplate Selection</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <editView>ExportTemplateSelectionEdit_view</editView>
+ <entity>ExportTemplateSelection_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>3aab1133-d52a-486c-82f2-89ac34e64813</name>
+ <view>ExportTemplateSelectionEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
index 0eb0c87373c12c85644db9745d4ee51acb871721..c21e2204ae06b424af7e208eca0e948088608de8 100644
--- a/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
+++ b/neonView/DocumentTemplateEdit_view/DocumentTemplateEdit_view.aod
@@ -72,5 +72,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>77b6af60-1694-4967-980c-6830d569b594</name>
+ <entityField>DocumentTemplatePlaceOfUse</entityField>
+ <view>DocumentTemplatePlaceOfUseMultiEdit_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod b/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1ed442ea7033795d86100aecf6ee2be72dc91e4c
--- /dev/null
+++ b/neonView/DocumentTemplatePlaceOfUseList_view/DocumentTemplatePlaceOfUseList_view.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DocumentTemplatePlaceOfUseList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+</neonView>
diff --git a/neonView/DocumentTemplatePlaceOfUseMultiEdit_view/DocumentTemplatePlaceOfUseMultiEdit_view.aod b/neonView/DocumentTemplatePlaceOfUseMultiEdit_view/DocumentTemplatePlaceOfUseMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..63f2c9dd13712b349690318fe2b5d8dde8dae0db
--- /dev/null
+++ b/neonView/DocumentTemplatePlaceOfUseMultiEdit_view/DocumentTemplatePlaceOfUseMultiEdit_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DocumentTemplatePlaceOfUseMultiEdit_view</name>
+ <title>Documenttemplate Place Of Use</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>genericMultiple</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonGenericMultipleTableColumn>
+ <name>b7302c30-4e38-4de0-8bd0-fec2cf5cd94c</name>
+ <entityField>PLACEOFUSE</entityField>
+ </neonGenericMultipleTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplatePlaceOfUseTitledList_view/DocumentTemplatePlaceOfUseTitledList_view.aod b/neonView/DocumentTemplatePlaceOfUseTitledList_view/DocumentTemplatePlaceOfUseTitledList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c625c14dd3cf49d68af90686c21d80f9cd1849c6
--- /dev/null
+++ b/neonView/DocumentTemplatePlaceOfUseTitledList_view/DocumentTemplatePlaceOfUseTitledList_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>DocumentTemplatePlaceOfUseTitledList_view</name>
+ <title>Documenttemplate Place Of Use</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>titledList</name>
+ <titleField>PLACEOFUSE</titleField>
+ <entityField>#ENTITY</entityField>
+ <isEditable v="true" />
+ <isCreatable v="true" />
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
index a8af039b6b4411e55fdde38e4e66d2a1dc06630e..58d8c23792645e4dffae235a4469a9d4f40077e3 100644
--- a/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
+++ b/neonView/DocumentTemplatePreview_view/DocumentTemplatePreview_view.aod
@@ -52,5 +52,10 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <neonViewReference>
+ <name>da824384-69a9-4f5e-a48d-057bb2975fdb</name>
+ <entityField>DocumentTemplatePlaceOfUse</entityField>
+ <view>DocumentTemplatePlaceOfUseTitledList_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/ExportTemplateEdit_view/ExportTemplateEdit_view.aod b/neonView/ExportTemplateEdit_view/ExportTemplateEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..d9148704a0d327cb6ec923b627e4e15e9a8a0b97
--- /dev/null
+++ b/neonView/ExportTemplateEdit_view/ExportTemplateEdit_view.aod
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplateEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>generic</name>
+ <editMode v="true" />
+ <hideEmptyFields v="true" />
+ <entityField>#ENTITY</entityField>
+ <isEditable v="true" />
+ <fields>
+ <entityFieldLink>
+ <name>2a4aa4f8-9e88-4a2b-80a4-976037fe11a6</name>
+ <entityField>TITLE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>161e141c-a552-48f1-a53a-3eeb774c48e5</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>dcca079e-66b5-4b12-b7f7-60b53966bb43</name>
+ <entityField>ISOLANGUAGE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>18007c82-d594-4408-9e26-7ee86872d1a8</name>
+ <entityField>SEPARATOR</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>d4fc40d7-96c2-4260-b749-dd0fee481b52</name>
+ <entityField>ExportTemplateFields</entityField>
+ <view>ExportTemplateFieldMultiEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>115345f0-5b8a-4a94-ad7d-bf5bf986da7a</name>
+ <entityField>ExportTemplateplaceOfUseCon</entityField>
+ <view>ExportTemplatePlaceOfUseMultiEdit_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateFieldList_view/ExportTemplateFieldList_view.aod b/neonView/ExportTemplateFieldList_view/ExportTemplateFieldList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c76b3911ada32f3151a5bbe762c0f71609619c60
--- /dev/null
+++ b/neonView/ExportTemplateFieldList_view/ExportTemplateFieldList_view.aod
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplateFieldList_view</name>
+ <title>Field and Position</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="false" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>titledList</name>
+ <titleField>FIELD</titleField>
+ <entityField>#ENTITY</entityField>
+ <title>Field and Position</title>
+ <columns>
+ <neonTitledListTableColumn>
+ <name>a0e7e2ce-b8fc-417c-bf7e-9907b75fec59</name>
+ <entityField>SORTING</entityField>
+ <fullWidth v="false" />
+ </neonTitledListTableColumn>
+ </columns>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateFieldMultiEdit_view/ExportTemplateFieldMultiEdit_view.aod b/neonView/ExportTemplateFieldMultiEdit_view/ExportTemplateFieldMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..32fe782b9baef53197521cc23aa5602e4f0460db
--- /dev/null
+++ b/neonView/ExportTemplateFieldMultiEdit_view/ExportTemplateFieldMultiEdit_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplateFieldMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>genericMultiple</name>
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonGenericMultipleTableColumn>
+ <name>6e30e825-4fd4-4503-b81c-ac1a9971275d</name>
+ <entityField>FIELD</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>014ddcf8-3933-47fe-a282-eefbde4ec1ea</name>
+ <entityField>SORTING</entityField>
+ </neonGenericMultipleTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateFilter_view/ExportTemplateFilter_view.aod b/neonView/ExportTemplateFilter_view/ExportTemplateFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..fd023d245502fdbbcab910304560cca02e3ff691
--- /dev/null
+++ b/neonView/ExportTemplateFilter_view/ExportTemplateFilter_view.aod
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplateFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>table</name>
+ <entityField>#ENTITY</entityField>
+ <isEditable v="true" />
+ <columns>
+ <neonTableColumn>
+ <name>76bc9ab0-8294-4df1-bdcb-6a86daef2170</name>
+ <entityField>TITLE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>29cd8f19-a002-40be-b91b-9c0eab447129</name>
+ <entityField>ISOLANGUAGE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>f7f6a5c7-be6a-4e25-ae05-a02709b8277b</name>
+ <entityField>SEPARATOR</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>e598db0e-f2d9-43d4-97c4-f1122edf6751</name>
+ <entityField>DESCRIPTION</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplatePlaceOfUseList_view/ExportTemplatePlaceOfUseList_view.aod b/neonView/ExportTemplatePlaceOfUseList_view/ExportTemplatePlaceOfUseList_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..45306dbb7234ea9b481ded9d1608679fed3d7cac
--- /dev/null
+++ b/neonView/ExportTemplatePlaceOfUseList_view/ExportTemplatePlaceOfUseList_view.aod
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplatePlaceOfUseList_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <titledListViewTemplate>
+ <name>titledList</name>
+ <titleField>PLACEOFUSE</titleField>
+ <entityField>#ENTITY</entityField>
+ </titledListViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplatePlaceOfUseMultiEdit_view/ExportTemplatePlaceOfUseMultiEdit_view.aod b/neonView/ExportTemplatePlaceOfUseMultiEdit_view/ExportTemplatePlaceOfUseMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3bb9efc85f45fd404c7e51c946b5fd4516a9e292
--- /dev/null
+++ b/neonView/ExportTemplatePlaceOfUseMultiEdit_view/ExportTemplatePlaceOfUseMultiEdit_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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplatePlaceOfUseMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>genericmultiple</name>
+ <entityField>#ENTITY</entityField>
+ <title>Place of Use</title>
+ <columns>
+ <neonGenericMultipleTableColumn>
+ <name>faec9114-95cf-4d47-8f0e-d7d392bff188</name>
+ <entityField>PLACEOFUSE</entityField>
+ </neonGenericMultipleTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ecbdd01aa2e45dcd3a448f4d7e464ece9e1cbf0d
--- /dev/null
+++ b/neonView/ExportTemplatePreview_view/ExportTemplatePreview_view.aod
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplatePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>card</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>card</name>
+ <titleField>TITLE</titleField>
+ <subtitleField>ISOLANGUAGE</subtitleField>
+ <entityField>#ENTITY</entityField>
+ </cardViewTemplate>
+ <genericViewTemplate>
+ <name>generic</name>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>7666c443-e85c-43ce-bfc0-0541c2855f93</name>
+ <entityField>DESCRIPTION</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>d40a27a1-e4e2-4605-a5ba-f9b347fbb78f</name>
+ <entityField>SEPARATOR</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>44ad5c03-ae3d-495f-b0ff-141a64e256e4</name>
+ <entityField>ExportTemplateFields</entityField>
+ <view>ExportTemplateFieldList_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>97e15126-23f9-474d-8dec-8c9175214b92</name>
+ <entityField>ExportTemplateplaceOfUseCon</entityField>
+ <view>ExportTemplatePlaceOfUseList_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..8f4438e929b58e38b9a8a6ae8dff7649bdf20e92
--- /dev/null
+++ b/neonView/ExportTemplateSelectionEdit_view/ExportTemplateSelectionEdit_view.aod
@@ -0,0 +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.6" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.6">
+ <name>ExportTemplateSelectionEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <size>SMALL</size>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>35ff004c-98a7-43fe-8739-3e74adb30a1a</name>
+ <entityField>EXPORTTEMPLATE_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>afcb5cf1-7c78-4649-9178-1635226620ad</name>
+ <entityField>FILENAME</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
index 1bb6ae6c7671063fd2ca641f193cefbebf38ef3e..90abf63f4003d63aaad0590a57405845f10329a6 100644
--- a/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
+++ b/neonView/OrganisationFilter_view/OrganisationFilter_view.aod
@@ -49,8 +49,9 @@
<children>
<tableViewTemplate>
<name>Organisations</name>
- <favoriteActionGroup1>campaignActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
+ <favoriteActionGroup3>exportTemplateActionGroup</favoriteActionGroup3>
<subtitleField>CUSTOMERCODE_DISPLAY_fieldGroup</subtitleField>
<entityField>#ENTITY</entityField>
<linkedColumns>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index c5bf3e4d37ca16591aeb316262eeea4b69ef5740..92c24c81f17e75d96a3a82386bf3e27a778b0020 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -49,8 +49,9 @@
<children>
<tableViewTemplate>
<name>Persons</name>
- <favoriteActionGroup1>campaignActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<favoriteActionGroup2>DuplicateActions</favoriteActionGroup2>
+ <favoriteActionGroup3>exportTemplateActionGroup</favoriteActionGroup3>
<hideActions v="false" />
<iconField>PICTURE</iconField>
<titleField>NAME_fieldGroup</titleField>
diff --git a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
index e7301e0cfbe7cfbc88fc15905c432c95f8bda73f..74abb3a7a145cecbc7f641a7a5d6ab0db63c5dff 100644
--- a/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
+++ b/neonView/PersonSimpleList_view/PersonSimpleList_view.aod
@@ -11,7 +11,7 @@
<children>
<tableViewTemplate>
<name>Persons</name>
- <favoriteActionGroup1>campaignActionGroup</favoriteActionGroup1>
+ <favoriteActionGroup1>filterViewActionGroup</favoriteActionGroup1>
<iconField>PICTURE</iconField>
<titleField>NAME_fieldGroup</titleField>
<subtitleField>LANGUAGE</subtitleField>
diff --git a/process/Address_lib/process.js b/process/Address_lib/process.js
index ea7f26689d317f860f72a4dc2611aeb83e0b5617..ab96ff44aba00e918364a3285ef68eff07439b95 100644
--- a/process/Address_lib/process.js
+++ b/process/Address_lib/process.js
@@ -52,7 +52,7 @@ function AddrObject(pContactId, pPerson, pAddressId)
*
* @return {[]} Daten
*/
-function getAddressesData( pCondition, pConfig, pSenderID, pAddressID )
+function getAddressesData( pCondition, pConfig, pSenderID, pAddressID)
{
var returndata = [];
var senderconfig = [];
@@ -75,7 +75,7 @@ function getAddressesData( pCondition, pConfig, pSenderID, pAddressID )
}
}
var data = getAddressData(pCondition, config, pAddressID);
- if (pSenderID == undefined) pSenderID = vars.get("$global.user").relationid;
+ if (pSenderID == undefined) pSenderID = EmployeeUtils.getCurrentContactId();
if (senderconfig.length > 0)
var senderdata = getAddressData([pSenderID], senderconfig);
if (employeeconfig.length > 0)
@@ -104,12 +104,14 @@ function getAddressesData( pCondition, pConfig, pSenderID, pAddressID )
* @param {String} pCondition req SQL-Where-Condition
* @param {Placeholder[]} pConfig req array of placeholders
* @param {String} AddressID opt addressid
+* @param {boolean} pPerson opt if person
+* @param {boolean} pOrganisation opt if organisation
*
* @return {[]} Daten
*/
-function getAddressData( pCondition, pConfig, AddressID )
+function getAddressData( pCondition, pConfig, AddressID, pPerson)
{
- return setAddressData( fetchAddressData( pCondition, pConfig, AddressID ) );
+ return setAddressData( fetchAddressData( pCondition, pConfig, AddressID, pPerson) );
}
/*
@@ -118,11 +120,11 @@ function getAddressData( pCondition, pConfig, AddressID )
* @param {String} pCondition req SQL-Where-Condition
* @param {Placeholder[]} pConfig req array of placeholders
* @param {String} AddressID opt addressid
-* @param {boolean} pPerson opt if private person
+* @param {boolean} pPerson opt if person
*
* @return {Array} 2d-Array, structure: [[ data, output, header, addrfields ]]
*/
-function fetchAddressData( pCondition, pConfig, AddressID, pPerson )
+function fetchAddressData( pCondition, pConfig, AddressID, pPerson)
{
// TODO: load entity?
if ( typeof(pCondition) == "object") pCondition = "CONTACT.CONTACTID in ('" + pCondition.join("','") + "')";
diff --git a/process/CustomPlaceholder_lib/process.js b/process/CustomPlaceholder_lib/process.js
index 6d863bbe629573b7f0da920526dbb32247b34522..51d9a63216a7d2d26b809951ea634b2ae16c9f4e 100644
--- a/process/CustomPlaceholder_lib/process.js
+++ b/process/CustomPlaceholder_lib/process.js
@@ -28,26 +28,26 @@ CustomPlaceholderUtils.getPlaceholders = function ()
/**
* add an address format placeholder to placeholders
*/
- function _addAddressFormat (pName, pFormat, pTarget)
+ function _addAddressFormat (pName, pFormat, pTarget, pTitle)
{
- customPlaceholders.push(new Placeholder(pName, Placeholder.types.ADDRESSFORMAT, pFormat, pTarget));
+ customPlaceholders.push(new Placeholder(pName, Placeholder.types.ADDRESSFORMAT, pFormat, pTarget, pTitle));
}
/**
* Add a sub-sql placeholder to placeholders. For further information regarding the full query, you can take
* a look at the function 'fetchAddressData' in Address_lib. You can use fields from CONTACT, ADDRESS, ORGANISATION and PERSON.
*/
- function _addSqlPart (pName, pSqlPart, pTarget)
+ function _addSqlPart (pName, pSqlPart, pTarget, pTitle)
{
- customPlaceholders.push(new Placeholder(pName, Placeholder.types.SQLPART, "(" + pSqlPart + ")", pTarget));
+ customPlaceholders.push(new Placeholder(pName, Placeholder.types.SQLPART, "(" + pSqlPart + ")", pTarget, pTitle));
}
/**
* Add a placeholder to placeholders with a function that returns a sub-sql. The function will be called
* with no parameters. You have to deliver an actual function, don't call it here.
*/
- function _addSqlPartFunction (pName, pSqlPartFunction, pTarget)
+ function _addSqlPartFunction (pName, pSqlPartFunction, pTarget, pTitle)
{
- customPlaceholders.push(new Placeholder(pName, Placeholder.types.SQLPARTFUNCTION, pSqlPartFunction, pTarget));
+ customPlaceholders.push(new Placeholder(pName, Placeholder.types.SQLPARTFUNCTION, pSqlPartFunction, pTarget, pTitle));
}
}
\ No newline at end of file
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 79562b7f6456483b106022366d8b58a4e8b9ddf2..3c5b6496b4e3f1cef3bea17b27c212dc43761af4 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -764,11 +764,13 @@ function LetterUtils () {}
* opens a new letter
*
* @param {String} pContactId id of the contact to fetch the data from
+ * @param {String} pComingFrom source from where you started (e.g. "PERSON", "ORGANISATION" )
*/
-LetterUtils.openNewLetter = function (pContactId)
+LetterUtils.openNewLetter = function (pContactId, pComingFrom)
{
var params = {
- "ContactId_param" : pContactId
+ "ContactId_param" : pContactId,
+ "ComingFrom_param" : pComingFrom
};
neon.openContext("Letter", "LetterEdit_view", null, neon.OPERATINGSTATE_NEW, params);
}
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index bec721b62832b81a51e5d0588808762c5fe4dbc4..e980038b20d54714836d850c4d72c2aa07099675 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -56,11 +56,13 @@ EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId,
*
* @param {String} pToContactId contactId with contacts to filter the communication-addresses
* @param {String} [pToEmailAddress] email address as string that shall be used as recipient-preset
+ * @param {String} pComingFrom source from where you started (e.g. "PERSON", "ORGANISATION" )
*/
-EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress)
+EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress, pComingFrom)
{
var params = {
- "ContactId_param" : pToContactId
+ "ContactId_param" : pToContactId,
+ "ComingFrom_param" : pComingFrom
};
if (pToEmailAddress)
params.Recipient_param = pToEmailAddress;
diff --git a/process/ExportTemplate_lib/ExportTemplate_lib.aod b/process/ExportTemplate_lib/ExportTemplate_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..7caa047e49c2fef06484706319038c76196b7408
--- /dev/null
+++ b/process/ExportTemplate_lib/ExportTemplate_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>ExportTemplate_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/ExportTemplate_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/ExportTemplate_lib/process.js b/process/ExportTemplate_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..081f301f16438de02dc023fb91f9c1345f74528b
--- /dev/null
+++ b/process/ExportTemplate_lib/process.js
@@ -0,0 +1,234 @@
+import("Address_lib");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+import("Placeholder_lib");
+import("Sql_lib");
+import("system.datetime");
+import("system.text");
+import("system.translate");
+import("system.util");
+
+/**
+ * Methods used for ExportTemplates and exporting Fieldvalues using those templates
+ * Do not create an instance of this!
+ *
+ * @class
+ */
+function ExportTemplateUtils() {}
+
+/**
+ * Builds the exportCSV via the exportTemplateId
+ *
+ * @param {String} pExportTemplateId export template id
+ * @param {Array} pSelection Contacts/Organisations you want to export (either via selecion by filterconditions)
+ * @param {String} pComingFrom source from where you started (e.g. "PERSON", "ORGANISATION" )
+ * @param {String} pFilename (opt.) name of the exported file (if left blank -> "templateTitle_dd.MM.yyyy.HH:mm:ss")
+ *
+ * @return {Object} {content: base64-encoded CSV;
+ * filename: filename}
+ *
+ */
+ExportTemplateUtils.buildExport = function (pExportTemplateId,pSelection, pComingFrom, pFilename)
+{
+ //Gets all the relevant data from the chosen template
+ var templateId = pExportTemplateId;
+ var separator = ExportTemplateUtils.formatSeparator(ExportTemplateUtils.getTemplateSeparator(templateId)); // gets the formatted Separator
+ var language = ExportTemplateUtils.getTemplateLanguage(templateId); // language is needed in order to translate the field titles
+ var filename = pFilename;
+ var fields = ExportTemplateUtils.getTemplateFields(templateId);
+ var comingFrom = pComingFrom;
+ var selection = pSelection;
+ var filteredIdcondition;
+ var csvTable;
+ var fieldtitles = [];
+
+ if(!selection.includes("{", 0)) //checks if data is selected
+ {
+ selection = [];
+ selection = JSON.parse(pSelection); //makes an array of the ContactIds/OrganisationIds of the selected data
+ }
+ else
+ {
+ filteredIdcondition = JSON.parse(selection).condition;
+ if(comingFrom == "Person")
+ selection = ExportTemplateUtils.contactIdsFilter(filteredIdcondition); //selects all ContactIds of the filtered data
+ else if(comingFrom == "Organisation")
+ selection = ExportTemplateUtils.contactIdsOrganisationFilter(filteredIdcondition); //selects all OrganisationIds of the filtered data
+ else
+ throw new Error(translate.text("pComingFrom is not defined. 'ExportTemplateUtils.buildExport:66'"));
+ }
+
+ if(filename == null || filename == undefined || filename.trim() == "") //if the user didn't choose a filename => generate one automatically
+ filename = ExportTemplateUtils.getExportFileName(templateId, "UTC");
+ filename += ".csv";
+
+ //selects all the placeholders needed in the correct order
+ var placeholders = PlaceholderUtils.getPlaceholders(language); //selects all placeholders
+ var affectedPlaceholders = [];
+ for (var i = 0; i < fields.length; i++) {
+ var placeholderField = placeholders.find(function(placeholder){
+ return placeholder.placeholderName == fields[i];
+ })
+ if(placeholderField)
+ affectedPlaceholders.push(placeholderField);
+ }
+
+
+ var replaced = getAddressesData(selection, affectedPlaceholders, null, null); //replaces all the placeholders with values
+ replaced = replaced.slice(1,replaced.length); //needed in order to remove the weird first line of the Array
+
+ for (i = 0; i < affectedPlaceholders.length; i++)
+ {
+ fieldtitles[i] = affectedPlaceholders[i].title; //gets the translations for the Labelling
+ }
+
+ replaced.unshift(fieldtitles); //adds the translated Titles at the top of the table (columnHeadlines basically)
+
+ csvTable = text.toCSV(replaced, "\r\n", separator, '"'); //generates the CSV with the correct separator
+ csvTable = util.encodeBase64String(csvTable); //converts to Base64 (for neon.Download)
+
+ return {content : csvTable,
+ filename : filename
+ };
+}
+
+/**
+ * Gets the Separator of a Template
+ *
+ * @param {pExportTemplateId} pExportTemplateId the unique templateId of the template you want the separator of
+ *
+ * @return {String} The correct separator of the template (not in usable form yet, use ExportTemplateUtils.formatSeparator for usable format)
+ */
+ExportTemplateUtils.getTemplateSeparator = function (pExportTemplateId)
+{
+ return newSelect("EXPORTTEMPLATE.SEPARATOR")
+ .from("EXPORTTEMPLATE")
+ .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
+ .cell(true);
+}
+
+/**
+ * Gets the isolanguage of a Template
+ *
+ * @param {pExportTemplateId} pExportTemplateId the unique templateId of the template you want the language of
+ *
+ * @return {String} The correct language of the template in usable format for translating
+ */
+ExportTemplateUtils.getTemplateLanguage = function (pExportTemplateId)
+{
+ var isoLanguage = newSelect("EXPORTTEMPLATE.ISOLANGUAGE")
+ .from("EXPORTTEMPLATE")
+ .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
+ .cell(true);
+
+ lang = LanguageKeywordUtils.Iso2FromIso3(isoLanguage)
+ return lang;
+}
+
+/**
+ * Gets the Title of a Template
+ *
+ * @param {pExportTemplateId} pExportTemplateId the unique templateId of the template you want the Title of
+ *
+ * @return {String} The correct Title of the template
+ */
+ExportTemplateUtils.getExportTemplateTitle = function (pExportTemplateId)
+{
+ return newSelect("EXPORTTEMPLATE.TITLE")
+ .from("EXPORTTEMPLATE")
+ .where("EXPORTTEMPLATE.EXPORTTEMPLATEID", pExportTemplateId)
+ .cell(true);
+}
+
+/**
+ * Gets an Array of all the Fields of a ExportTemplate using it's unique exportTemplateId.
+ * The Fields are already ordered by the corresponding sorting.
+ *
+ * @param {String} pExportTemplateId the unique export template id.
+ *
+ * @return {Array} All fields of the Template in correct order.
+ */
+ExportTemplateUtils.getTemplateFields = function (pExportTemplateId)
+{
+ return newSelect("EXPORTTEMPLATEFIELD.FIELD")
+ .from("EXPORTTEMPLATEFIELD")
+ .where("EXPORTTEMPLATEFIELD.EXPORTTEMPLATE_ID", pExportTemplateId)
+ .orderBy("EXPORTTEMPLATEFIELD.SORTING")
+ .arrayColumn();
+}
+
+/**
+ * Generates a practical filename, with the templateName, and the date + time of the download, using it's unique exportTemplateId.
+ *
+ * @param {String} pExportTemplateId the unique id of the export template
+ * @param {String} pTimeZone the timezone (if left Blank -> UTC)
+ *
+ * @return {String} "templateTitle_dd.MM.yyyy.HH:mm:ss" in the chosen timezone
+ */
+ExportTemplateUtils.getExportFileName = function (pExportTemplateId, pTimeZone)
+{
+ var templateTitle = ExportTemplateUtils.getExportTemplateTitle(pExportTemplateId);
+ if(pTimeZone == null || pTimeZone == undefined)
+ pTimeZone = "UTC";
+ var exportFileName = templateTitle + "_" + datetime.toDate(datetime.date(), "dd.MM.yyyy.HH:mm:ss", pTimeZone);
+
+ return exportFileName;
+}
+
+/**
+ * Converts the separatorKeyword into a useable format if its eaither tab, comma or semicolon
+ *
+ * @param {String} pSeparator the separator as a keyword
+ *
+ * @return {String} "," instead of "COMMA", ";" instead of "SEMICOLON", "\t" instead of "TAB"
+ *
+ */
+ExportTemplateUtils.formatSeparator = function (pSeparator)
+{
+ if(pSeparator == $KeywordRegistry.exportTemplateSeparator$comma())
+ return ",";
+ else if(pSeparator == $KeywordRegistry.exportTemplateSeparator$semicolon())
+ return ";";
+ else if(pSeparator == $KeywordRegistry.exportTemplateSeparator$tab())
+ return "\t";
+ else
+ return null;
+}
+
+/**
+ * Generates an Array of all the contactIds using the filtercondition
+ *
+ * @param {String} pCondition the condition of the filter
+ *
+ * @return {Array} all the contactids limited by the filtercondition
+ */
+ExportTemplateUtils.contactIdsFilter = function (pCondition)
+{
+ let query = newSelect("CONTACT.CONTACTID").from("CONTACT");
+
+ query.join("PERSON", "CONTACT.PERSON_ID = PERSON.PERSONID")
+ .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+ .where(pCondition);
+
+ return query.arrayColumn();
+}
+
+/**
+ * Generates an Array of all the organisationIds (=contactIds of the organisations) using the filtercondition
+ *
+ * @param {String} pCondition the condition of the filter
+ *
+ * @return {Array} all the organisationids (=contactIds of the organisations) limited by the filtercondition
+ */
+ExportTemplateUtils.contactIdsOrganisationFilter = function (pCondition)
+{
+ let query = newSelect("ORGANISATION.ORGANISATIONID").from("ORGANISATION");
+
+ query.leftJoin("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .leftJoin("ADDRESS", "ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
+ .where(pCondition);
+
+ return query.arrayColumn();
+}
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 68564a9f84cd71fa036da02e0fba6690ee940f56..801b54f6451ac4f0547b7b24bd8a51c74955ea97 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -157,6 +157,8 @@ $KeywordRegistry.documentTemplateTypeCategory$single = function(){return "1";};
$KeywordRegistry.documentTemplateTypeCategory$serial = function(){return "2";};
$KeywordRegistry.documentTemplateTypeCategory$htmlTemplate = function(){return "7";};
+$KeywordRegistry.documentTemplatePlaceOfUse = function(){return "DocumentTemplatePlaceOfUse";};
+
$KeywordRegistry.classificationType = function(){return "ClassificationType";};
$KeywordRegistry.classificationType$salesproject = function(){return "SALESPROJ";};
@@ -182,8 +184,6 @@ $KeywordRegistry.dsgvoDeadline$complex = function(){return "DSGVODEADLINECOMPLEX
$KeywordRegistry.dsgvoDeadline$count = function(){return "DSGVODEADLINECOUNT";};
$KeywordRegistry.dsgvoGuarantee = function() {return "DSGVOGuarantee";};
-$KeywordRegistry.textPlaceholder = function(){return "textPlaceholder";};
-
$KeywordRegistry.communicationMediumCampaign = function(){return "CommunicationMediumCampaign";};
$KeywordRegistry.communicationMediumCampaign$mail = function(){return "CAMPAIGNEMAIL";};
$KeywordRegistry.communicationMediumCampaign$letter = function(){return "CAMPAIGNLETTER";};
@@ -248,4 +248,9 @@ $KeywordRegistry.workflowSignalTrigger$delete = function(){return "TRIGGEREVENTD
$KeywordRegistry.permissionCalendarCategory = function(){return "PermissionCalendarCategory";};
$KeywordRegistry.permissionCalendarCategory$readwrite = function(){return "READWRITE";};
-$KeywordRegistry.permissionCalendarType = function(){return "PermissionCalendarType";};
\ No newline at end of file
+$KeywordRegistry.permissionCalendarType = function(){return "PermissionCalendarType";};
+$KeywordRegistry.exportTemplatePlaceOfUse = function(){return "ExportTemplatePlaceOfUse";};
+$KeywordRegistry.exportTemplateSeparator = function(){return "ExportTemplateSeparator";};
+$KeywordRegistry.exportTemplateSeparator$comma = function(){return "COMMA";};
+$KeywordRegistry.exportTemplateSeparator$semicolon = function(){return "SEMICOLON";};
+$KeywordRegistry.exportTemplateSeparator$tab = function(){return "TAB";};
\ No newline at end of file
diff --git a/process/Placeholder_lib/process.js b/process/Placeholder_lib/process.js
index fc110b9bf6098879ec79727538897237013bb7c5..d3d4fca7aea97df4a891abee264d57242d6ab8f4 100644
--- a/process/Placeholder_lib/process.js
+++ b/process/Placeholder_lib/process.js
@@ -18,47 +18,61 @@ function PlaceholderUtils () {}
/**
* basic placeholder configuration
*
- * @return {Array} array of placeholders
+ * @param {String} pLocale the Language for the translated title
+ * @param {Boolean} pIsExportTemplateField (opt.) whether or not you use the Placeholders for the ExportTemplatefields
+ * @return {Array} array of placeholders (if pIsExportTemplateField is true without the unnecessary Placeholders)
*/
-PlaceholderUtils.getPlaceholders = function ()
+PlaceholderUtils.getPlaceholders = function (pLocale, pIsExportTemplateField)
{
var placeholders = [];
var sqlUtil = new SqlMaskingUtils();
-
+ var locale = null;
+ if(pLocale != null && pLocale != undefined)
+ locale = pLocale;
/***************************************************************************************************************/
//Definition of available basic Placeholders. For project specific Placeholders, use CustomPlaceholder_lib
- _addAddressFormat("address", "{street} {buildingno}");
- _addAddressFormat("zipCode", "{zip}");
- _addAddressFormat("city", "{city}");
- _addAddressFormat("district", "{district}");
- _addAddressFormat("region", "{region}");
- _addAddressFormat("country", "{country}");
- _addAddressFormat("letterSalutation", "{letter_salutation}");
- _addAddressFormat("fullAddress", "");
+ _addAddressFormat("address", "{street} {buildingno}", null, translate.text("Address", locale));
+ _addAddressFormat("zipCode", "{zip}", null , translate.text("Zip", locale));
+ _addAddressFormat("city", "{city}", null , translate.text("City", locale));
+ _addAddressFormat("district", "{district}", null , translate.text("District", locale));
+ _addAddressFormat("region", "{region}", null , translate.text("Region", locale));
+ _addAddressFormat("country", "{country}", null , translate.text("Country", locale));
+ _addAddressFormat("letterSalutation", "{letter_salutation}", null);
+ _addAddressFormat("fullAddress", "", null, translate.text("FullAddress", locale));
_addAddressFormat("senderOrgname", "{organisation_name}", Placeholder.targets.SENDER);
_addAddressFormat("senderAddress", "{street} {buildingno}", Placeholder.targets.SENDER);
_addAddressFormat("senderZipCity", "{country} - {zip} {city}", Placeholder.targets.SENDER);
- _addAddressFormat("senderFullAddress", "", Placeholder.targets.SENDER);
+ _addAddressFormat("senderFullAddress", "", Placeholder.targets.SENDER), translate.text("FullAddress", locale);
- _addSqlPart("orgname", "ORGANISATION.NAME");
- _addSqlPart("firstname", "PERSON.FIRSTNAME");
- _addSqlPart("middlename", "PERSON.MIDDLENAME");
- _addSqlPart("lastname", "PERSON.LASTNAME");
- _addSqlPart("salutation", "PERSON.SALUTATION");
- _addSqlPart("title", "PERSON.TITLE");
- _addSqlPart("phone", CommUtil.getStandardSubSqlPhone());
- _addSqlPart("email", CommUtil.getStandardSubSqlMail());
- _addSqlPart("name", sqlUtil.concat(["SALUTATION", "TITLE", "FIRSTNAME", "LASTNAME"]));
- _addSqlPart("senderPhone", CommUtil.getStandardSubSqlPhone(), Placeholder.targets.SENDER);
- _addSqlPart("senderEmail", CommUtil.getStandardSubSqlMail(), Placeholder.targets.SENDER);
- _addSqlPart("senderName", sqlUtil.concat(["SALUTATION", "TITLE", "FIRSTNAME", "LASTNAME"]), Placeholder.targets.SENDER);
- _addSqlPart("date", "'" + datetime.toDate(vars.get("sys.date"), translate.text("dd.MM.yyyy")) + "'", Placeholder.targets.SENDER);
+ _addSqlPart("orgname", "ORGANISATION.NAME", null , translate.text("Organisationname", locale));
+ _addSqlPart("firstname", "PERSON.FIRSTNAME", null , translate.text("Firstname", locale));
+ _addSqlPart("middlename", "PERSON.MIDDLENAME", null , translate.text("Middlename", locale));
+ _addSqlPart("lastname", "PERSON.LASTNAME", null , translate.text("Lastname", locale));
+ _addSqlPart("salutation", "PERSON.SALUTATION", null , translate.text("Salutation", locale));
+ _addSqlPart("title", "PERSON.TITLE", null , translate.text("Title", locale));
+ _addSqlPart("phone", CommUtil.getStandardSubSqlPhone(), null , translate.text("Phone", locale));
+ _addSqlPart("email", CommUtil.getStandardSubSqlMail(), null , translate.text("Email", locale));
+ _addSqlPart("name", sqlUtil.concat(["SALUTATION", "TITLE", "FIRSTNAME", "LASTNAME"]), null , translate.text("Name", locale));
+ _addSqlPart("senderPhone", CommUtil.getStandardSubSqlPhone(), Placeholder.targets.SENDER, null);
+ _addSqlPart("senderEmail", CommUtil.getStandardSubSqlMail(), Placeholder.targets.SENDER, null);
+ _addSqlPart("senderName", sqlUtil.concat(["SALUTATION", "TITLE", "FIRSTNAME", "LASTNAME"]), Placeholder.targets.SENDER, null);
+ _addSqlPart("date", "'" + datetime.toDate(vars.get("sys.date"), translate.text("dd.MM.yyyy")) + "'", Placeholder.targets.SENDER, null);
/***************************************************************************************************************/
placeholders = placeholders.concat(CustomPlaceholderUtils.getPlaceholders());
+ if(pIsExportTemplateField){ //rempove unnecessary Placeholders that are not needed as exportfields
+ for (var i = 0; i < placeholders.length; i++) {
+ if(placeholders[i]["target"] != "RECIPIENT"){
+ placeholders.splice(i, 1);
+ i--}
+ else if(placeholders[i]["placeholderName"] == "{@letterSalutation@}"){
+ placeholders.splice(i, 1);
+ i--}
+ }
+ }
return placeholders;
//these functions should make adding placeholders easier and require less code:
@@ -66,27 +80,27 @@ PlaceholderUtils.getPlaceholders = function ()
/**
* add an address format placeholder to placeholders
*/
- function _addAddressFormat (pName, pFormat, pTarget)
+ function _addAddressFormat (pName, pFormat, pTarget, pTitle)
{
- placeholders.push(new Placeholder(pName, Placeholder.types.ADDRESSFORMAT, pFormat, pTarget));
+ placeholders.push(new Placeholder(pName, Placeholder.types.ADDRESSFORMAT, pFormat, pTarget, pTitle));
}
/**
* Add a sub-sql placeholder to placeholders. For further information regarding the full query, you can take
* a look at the function 'fetchAddressData' in Address_lib. You can use fields from CONTACT, ADDRESS, ORGANISATION and PERSON.
*/
- function _addSqlPart (pName, pSqlPart, pTarget)
+ function _addSqlPart (pName, pSqlPart, pTarget, pTitle)
{
- placeholders.push(new Placeholder(pName, Placeholder.types.SQLPART, "(" + pSqlPart + ")", pTarget));
+ placeholders.push(new Placeholder(pName, Placeholder.types.SQLPART, "(" + pSqlPart + ")", pTarget, pTitle));
}
/**
* Add a placeholder to placeholders with a function that returns a sub-sql. The function will be called
* with no parameters. You have to deliver an actual function, don't call it here.
*/
- function _addSqlPartFunction (pName, pSqlPartFunction, pTarget)
+ function _addSqlPartFunction (pName, pSqlPartFunction, pTarget, pTitle)
{
- placeholders.push(new Placeholder(pName, Placeholder.types.SQLPARTFUNCTION, pSqlPartFunction, pTarget));
+ placeholders.push(new Placeholder(pName, Placeholder.types.SQLPARTFUNCTION, pSqlPartFunction, pTarget, pTitle));
}
}
@@ -123,13 +137,15 @@ PlaceholderUtils.getRegexpMatchAll = function (pSpecialCharFilterRegexpPart)
* @param {String} pType type of the placeholder, see PlaceholderUtils.types
* @param {String|Function} pValueDef string or function (depends on the type) defining the value
* @param {String} [pTarget] what contact is used to get the data, see PlaceholderUtils.targets
+ * @param {String} [pTitle] to use an Title e.g for ExportTemplateFields
*/
-function Placeholder (pName, pType, pValueDef, pTarget)
+function Placeholder (pName, pType, pValueDef, pTarget, pTitle)
{
this.placeholderName = PlaceholderUtils.formatPlaceholder(pName);
this.type = pType;
this.target = pTarget || Placeholder.targets.RECIPIENT;
this.valueDefinition = pValueDef;
+ this.title = pTitle;
}
Placeholder.prototype.toString = function ()