diff --git a/.aditoprj/project.version b/.aditoprj/project.version
index 29ef21541c254e6310d18f5e2321fe2c0b42f24a..de72e6b0e88876034e7c2bd459c0dc5297e57f7e 100644
--- a/.aditoprj/project.version
+++ b/.aditoprj/project.version
@@ -1,3 +1,3 @@
#This file is generated by ADITO designer. Do NOT delete or modify!
-#Fri Jul 26 06:57:10 CEST 2019
-version=6.0.0
+#Thu Aug 01 14:30:02 CEST 2019
+version=6.0.1
diff --git a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml
index ba2bdc4fb1d1e794b0e24d2da6d1ac2de7ae22fa..aeab847c94b732991397ea433804c7be13cd2d4d 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/BulkMail/create_bulkmail.xml
@@ -12,6 +12,9 @@
<column name="SENDER" type="NVARCHAR(50)"/>
<column name="NAME" type="NVARCHAR(50)"/>
<column name="SUBJECT" type="NVARCHAR(100)"/>
+ <column name="CREATEACTIVITIES" type="TINYINT"/>
+ <column name="TESTING_CONTACT_ID" type="CHAR(36)"/>
+ <column name="TESTING_EMAIL_ADDRESS" type="NVARCHAR(50)"/>
</createTable>
</changeSet>
</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/2019.1.4/create_documenttemplate.xml b/.liquibase/Data_alias/basic/2019.1.4/create_documenttemplate.xml
index efb355a6c323a5034ff0c3cd1e8eaace8c68e844..e5e037f53b7f69c3b9dac5de520615c5f99b838c 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/create_documenttemplate.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/create_documenttemplate.xml
@@ -13,11 +13,11 @@
<column name="USER_NEW" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
- <column name="DATE_NEW" type="DATE">
+ <column name="DATE_NEW" type="DATETIME">
<constraints nullable="false"/>
</column>
<column name="USER_EDIT" type="NVARCHAR(50)" />
- <column name="DATE_EDIT" type="DATE" />
+ <column name="DATE_EDIT" type="DATETIME" />
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
index 2bac627c2176f1b6daab7f250d37291a9838a363..ad2cfa2445e950d478f0b1f5b3aa18b7f05a2170 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/DOCUMENTTEMPLATE.xml
@@ -2,7 +2,7 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="autogenerated" id="6bbd2406-6a0d-4181-a3af-a0bf75eced39">
<insert tableName="DOCUMENTTEMPLATE">
- <column name="DATE_NEW" valueDate="2019-05-24"/>
+ <column name="DATE_NEW" valueDate="2019-05-29T00:00:00"/>
<column name="DOCUMENTTEMPLATEID" value="f032c593-f108-47dd-9fc2-357c14757a9d"/>
<column name="ISOLANGUAGE" value="deu"/>
<column name="NAME" value="Erstkontakt "/>
@@ -10,7 +10,7 @@
<column name="USER_NEW" value="Admin"/>
</insert>
<insert tableName="DOCUMENTTEMPLATE">
- <column name="DATE_NEW" valueDate="2019-05-29"/>
+ <column name="DATE_NEW" valueDate="2019-05-29T00:00:00"/>
<column name="DESCRIPTION" value="Rahmenvertrag"/>
<column name="DOCUMENTTEMPLATEID" value="1269c31d-4173-434f-b2db-9154fa651a25"/>
<column name="ISOLANGUAGE" value="deu"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index a3feff6d5a00f34ad0a89bd000ae8d182b062067..3a1e06039ed4f7d26e3b4d28a998808143623352 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -9676,6 +9676,48 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CREATEACTIVITIES</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>TESTING_CONTACT_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TESTING_EMAIL_ADDRESS</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>
diff --git a/entity/360Degree_entity/360Degree_entity.aod b/entity/360Degree_entity/360Degree_entity.aod
index 8667de236826041378e55242ad5c4542f39c8943..cdeab537951f0d5e6e2cc62e94a246e25de72125 100644
--- a/entity/360Degree_entity/360Degree_entity.aod
+++ b/entity/360Degree_entity/360Degree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>360Degree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>360 Degree</title>
diff --git a/entity/ActivityLink_entity/ActivityLink_entity.aod b/entity/ActivityLink_entity/ActivityLink_entity.aod
index e0908b3c1d9ae9fed4d93d9825b95639dde7e2a8..dd052b4473a40c0225d4e1e32bc95e80d07685d6 100644
--- a/entity/ActivityLink_entity/ActivityLink_entity.aod
+++ b/entity/ActivityLink_entity/ActivityLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ActivityLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Connection</title>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 5f23c46537951e40ba3bff13bca090f9af6ffdd6..4a1a53820ea07a09de3b14ef18186965ea0a5f96 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Activity_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Activity_entity/documentation.adoc</documentation>
diff --git a/entity/Activity_entity/recordcontainers/db/conditionProcess.js b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
index c3afc35018132f81d6ec3e3d82a081ad5c539595..9f488eeee91343b281765163cd04b54c0f48157c 100644
--- a/entity/Activity_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Activity_entity/recordcontainers/db/conditionProcess.js
@@ -19,7 +19,7 @@ if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param") && vars.
from CONTACT \n\
where CONTACT.PERSON_ID = (select CONTACT.PERSON_ID from CONTACT", null, ")"));
}
- var activityLinkCond = SqlCondition.begin().and("ACTIVITYLINK.OBJECT_ROWID in ('" + rowIds.join(", ") + "')")
+ var activityLinkCond = SqlCondition.begin().andIn("ACTIVITYLINK.OBJECT_ROWID", rowIds)
.andPrepareVars("ACTIVITYLINK.OBJECT_TYPE", "$param.ObjectId_param");
// TODO: more performant way than IN. Maybe a join??
diff --git a/entity/AddressType_entity/AddressType_entity.aod b/entity/AddressType_entity/AddressType_entity.aod
index 0786cd7bd1f717b8c5fd79c6f614b735aad8d181..3fbbc3eeaff693e01c33055c56ccd48f45fa0c32 100644
--- a/entity/AddressType_entity/AddressType_entity.aod
+++ b/entity/AddressType_entity/AddressType_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>AddressType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/AddressType_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/AddressValidation_entity/AddressValidation_entity.aod b/entity/AddressValidation_entity/AddressValidation_entity.aod
index e6a4c6beccf9980ece4521959844b1ebf4494afb..3b44b38b5d25db3aa2097bbb4ff5414881bc0ead 100644
--- a/entity/AddressValidation_entity/AddressValidation_entity.aod
+++ b/entity/AddressValidation_entity/AddressValidation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>AddressValidation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/AddressValidation_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index ec9bd9ac4585868981f9c82dcd4c3ddf50171f48..e8d7c87318a80c316dba31bd8b307876fc67a7c2 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Address_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
diff --git a/entity/AdminViewRow_entity/AdminViewRow_entity.aod b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
index 6a82a6b3d8e9d93b6297ecc3b5db9763bcf4a282..7ec5b609a00bb0b06b69797b29266df70521f709 100644
--- a/entity/AdminViewRow_entity/AdminViewRow_entity.aod
+++ b/entity/AdminViewRow_entity/AdminViewRow_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>AdminViewRow_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/Analyses_entity/Analyses_entity.aod b/entity/Analyses_entity/Analyses_entity.aod
index 7baa10fc7658119a221a838126e6fca5792089ba..bc2c77e31f4cc4021ae69dbe62fa3434ef549b00 100644
--- a/entity/Analyses_entity/Analyses_entity.aod
+++ b/entity/Analyses_entity/Analyses_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Analyses_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GRID_BIG_O</icon>
diff --git a/entity/AnyContact_entity/AnyContact_entity.aod b/entity/AnyContact_entity/AnyContact_entity.aod
index d12d867666e5d066748f5b9c1053f76bc2b85c6f..6f36172e79513e874e73272cc1ccdc7eabe2aec3 100644
--- a/entity/AnyContact_entity/AnyContact_entity.aod
+++ b/entity/AnyContact_entity/AnyContact_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>AnyContact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/AnyContact_entity/contentTitleProcess.js</contentTitleProcess>
@@ -56,6 +56,18 @@
<fieldName>AnyContacts</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>aca9e52c-9138-4ef1-b039-1efeb3deb822</name>
+ <entityName>BulkMailTesting_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>bbd2bf84-7cad-4156-b736-32749949f97c</name>
+ <entityName>BulkMail_entity</entityName>
+ <fieldName>Contacts</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
</entityProvider>
<entityField>
diff --git a/entity/AppointmentLink_entity/AppointmentLink_entity.aod b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
index 0ab25f680e8a20a36930eade037a2d07a086bc9a..092996034c1a7593a76ee2e45d5735dafd69b16f 100644
--- a/entity/AppointmentLink_entity/AppointmentLink_entity.aod
+++ b/entity/AppointmentLink_entity/AppointmentLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>AppointmentLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Connection</title>
diff --git a/entity/Appointment_entity/Appointment_entity.aod b/entity/Appointment_entity/Appointment_entity.aod
index 898c8ed33ccc440c63ee5c79beb2aadb955572cf..8df4714f502f274317ac3494694e278133d4b0c0 100644
--- a/entity/Appointment_entity/Appointment_entity.aod
+++ b/entity/Appointment_entity/Appointment_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Appointment_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Appointment_entity/documentation.adoc</documentation>
@@ -124,6 +124,7 @@
</entityParameter>
<entityField>
<name>ORGANIZER</name>
+ <valueProcess>%aditoprj%/entity/Appointment_entity/entityfields/organizer/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>RRULE</name>
diff --git a/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js b/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js
index b32031361cda543dc371943b8db3ba13d92aa3d6..2ca0974708bebf947414e02acea304389cdad456 100644
--- a/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js
+++ b/entity/Appointment_entity/entityfields/deleteseries/stateProcess.js
@@ -1,23 +1,27 @@
-import("system.logging");
-import("system.tools");
-import("system.vars");
-import("system.result");
-import("system.calendars");
-import("system.neon");
-import("system.text");
-
-
-var event = JSON.parse(vars.getString("$param.Entry_param"));
-
-if(event) //event not empty
-{
- var orgaCn = event[calendars.ORGANIZER2]["cn"];
- var currentUserTitle = vars.getString("$sys.user");
-
- if(event[calendars.RECURRENCEID] && ((orgaCn == currentUserTitle)))//) || calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)) //serientermin und currentUser der TerminOwner
- result.object(neon.COMPONENTSTATE_AUTO);
- else
- result.object(neon.COMPONENTSTATE_INVISIBLE);
-}
-else
+import("system.logging");
+import("system.tools");
+import("system.vars");
+import("system.result");
+import("system.calendars");
+import("system.neon");
+import("system.text");
+
+
+var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+if(event) //event not empty
+{
+ var orga = event[calendars.ORGANIZER2];
+ var orgaCn;
+ if(orga)
+ orgaCn = orga["cn"];
+
+ var currentUserTitle = vars.getString("$sys.user");
+
+ if(event[calendars.RECURRENCEID] && ((orgaCn == currentUserTitle)))//) || calendars.getBackendType() == calendars.BACKEND_EXCHANGEWS)) //serientermin und currentUser der TerminOwner
+ result.object(neon.COMPONENTSTATE_AUTO);
+ else
+ result.object(neon.COMPONENTSTATE_INVISIBLE);
+}
+else
result.object(neon.COMPONENTSTATE_AUTO);
\ No newline at end of file
diff --git a/entity/Appointment_entity/entityfields/organizer/valueProcess.js b/entity/Appointment_entity/entityfields/organizer/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6b6bc2ad590eb64263ab1584a2e78b7c1e3bfaea
--- /dev/null
+++ b/entity/Appointment_entity/entityfields/organizer/valueProcess.js
@@ -0,0 +1,19 @@
+import("system.logging");
+import("system.neon");
+import("system.vars");
+import("system.calendars");
+import("system.result");
+
+/**
+ * Following if() is only for passing param-parts from "new Appointment"-Dialog to AppointmentEditViewTemplate
+ */
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
+{
+ var event = JSON.parse(vars.getString("$param.Entry_param"));
+
+ if(vars.get("$this.value"))
+ result.object(vars.get("$this.value"));
+
+ else if(event[calendars.ORGANIZER2])
+ result.object(event[calendars.ORGANIZER2]["paramvalue"]);
+}
\ No newline at end of file
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
index fe7f38a0fba3c871e577a04aa0d70fee4f8f95e8..a10d6981b7cb7688e62071048e10588f7d1cfc58 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onDelete.js
@@ -11,7 +11,8 @@ if (vars.exists("$param.Entry_param"))
var reccurenceid = entry[calendars.RECURRENCEID];
if (reccurenceid == undefined)
reccurenceid = null;
- calendars.removeEntryByUID(calendars.VEVENT, vars.get("$sys.user"), entry[calendars.ID], reccurenceid)
+
+ calendars.removeEntryByUID(calendars.VEVENT, entry[calendars.USER2]["cn"], entry[calendars.ID], reccurenceid)
/**
diff --git a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
index 48de276e373ecf0609caaa3afddb841660a3fc38..0fae64a0fc169097998751a3476c91180f32f7a6 100644
--- a/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Appointment_entity/recordcontainers/jdito/onInsert.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.neon");
import("system.calendars");
import("system.vars");
@@ -15,18 +16,6 @@ var fields = vars.get("$local.rowdata");
event[calendars.TYPE] = calendars.VEVENT;
event[calendars.ID] = ""; //wenn hier neue id erstellt und mitgegeben wird, wird versucht einen termin mit dieser id zu finden, den es nicht gibt. also leer.
-//event[calendars.AFFECTEDUSERS] = vars.get("$field.ATTENDEES");
-//event[calendars.STATUS] = vars.getString("$field.STATUS");
-//event[calendars.SUMMARY] = vars.getString("$field.SUMMARY");
-//event[calendars.LOCATION] = vars.get("$field.LOCATION");
-//event[calendars.DESCRIPTION] = vars.get("$field.DESCRIPTION");
-//event[calendars.DTSTART] = vars.get("$field.BEGIN");
-//event[calendars.DTEND] = vars.get("$field.END");
-//event["X-ADITO-ISALLDAYEVENT"] = vars.get("$field.ALLDAY");
-//event[calendars.CLASSIFICATION] = vars.get("$field.CLASSIFICATION");
-//event[calendars.TRANSPARENCY] = vars.get("$field.TRANSPARENCY");
-//event[calendars.CATEGORIES] = vars.get("$field.CATEGORIES");
-
event[calendars.AFFECTEDUSERS] = fields["ATTENDEES.value"];
event[calendars.STATUS] = fields["STATUS.value"];
event[calendars.SUMMARY] = fields["SUMMARY.value"];
@@ -38,6 +27,7 @@ event["X-ADITO-ISALLDAYEVENT"] = fields["ALLDAY.value"];
event[calendars.CLASSIFICATION] = fields["CLASSIFICATION.value"];
event[calendars.TRANSPARENCY] = fields["TRANSPARENCY.value"];
event[calendars.CATEGORIES] = fields["CATEGORIES.value"];
+event[calendars.ORGANIZER] = fields["ORGANIZER.value"];
if(fields["RRULE.value"])
event[calendars.RRULE] = [fields["RRULE.value"]];
@@ -46,264 +36,10 @@ if (fields["REMINDER.value"])
event[calendars.HASREMINDER] = "true";
event[calendars.REMINDER_DURATION] = fields["REMINDER.value"];
}
+
+
var idstringarray = calendars.insert([event]);
event[calendars.ID] = idstringarray[0];
neon.setFieldValue("$field.UID", event[calendars.ID]);
vars.set("$context.editmode", calendars.MODE_UPDATE);
-
-
-
-// Liefert die Benutzer zurück, auf die keine Schreibrechte bestehen
-function getReadOnlyUser()
-{
- var writeable = calendars.getFullCalendarUsers(calendars.RIGHT_WRITE);
- var affectedusers = vars.get("$context.affectedusers");
- var readonly = new Array();
-
- for ( i = 0; i < affectedusers.length; i++)
- {
- var user = affectedusers[i][0];
- if (!isWriteable(user, writeable))
- readonly.push(affectedusers[i][3]);
- }
- return readonly;
-}
-
-// Liefert TRUE, wenn der Benutzer bei denen mit Schreibberechtigungen enthalten ist
-function isWriteable(user, writeable)
-{
- for (var i = 0; i < writeable.length; i++)
- {
- if (writeable[i][0] == calendars.getCalendarUser(user))
- return true;
- }
- return false;
-}
-
-// Berechnet das Ende der Recurrence
-function recurrencend(event)
-{
- var rec_end = vars.getString("$field.rec_end");
-
- // Automatische Erkennung, was gewollt ist
- if (rec_end == "")
- {
- if (vars.get("$field.rec_end_count") != "")
- rec_end = "Endet nach Anzahl Terminen";
- else if (vars.get("$field.rec_end_date") != "")
- rec_end = "Endet am";
- }
-
- if (rec_end == "" || rec_end == "Kein Enddatum")
- {
- // Nichts
- }
- else if (rec_end == "Endet nach Anzahl Terminen")
- {
- event[calendars.RRULE][0] += (";COUNT=" + vars.get("$field.rec_end_count"));
- }
- else if (rec_end == "Endet am")
- {
- var dat = vars.get("$field.rec_end_date");
- var start = vars.get("$field.start_date");
- var localTime = datetime.toDate(dat, translate.text("yyyyMMdd")) + datetime.toDate(start, "HHmmss");
- var utcTime = datetime.toLong(localTime, "yyyyMMddHHmmss");
- event[calendars.RRULE][0] += (";UNTIL=" + datetime.toDate(utcTime, "yyyyMMdd\'T\'HHmmss\'Z\'", "UTC"));
- }
-}
-
-/**
- * Berechnet die Wiederholung
- *
- * @param event Das fertige Event. Hier die Reccurrence speichern
- */
-function calcrecurrence(event)
-{
- var rec_type = vars.get("$field.rec_type");
-
- if (rec_type == "")
- {
- // Nichts
- }
- else if (rec_type == "Keine")
- {
- }
- else if (rec_type == "Täglich")
- {
- rec_daily(event);
- }
- else if (rec_type == "Wöchentlich")
- {
- rec_weekly(event);
- }
- else if (rec_type == "Monatlich")
- {
- rec_monthly(event);
- }
- else if (rec_type == "Jährlich")
- {
- rec_yearly(event);
- }
- else
- {
- question.showMessage("Internal (1) " + rec_type);
- }
-}
-/***********************/
-function rec_yearly(event)
-{
- var rec_year = vars.get("$field.rec_yearly");
- var rec_yearly_month = vars.get("$field.rec_yearly_month");
- var rec_yearly_day = vars.get("$field.rec_yearly_day");
- var month;
- var day;
-
- if (rec_year == "")
- {
- if (rec_yearly_month != "" && rec_yearly_day != "")
- rec_year = "Jeden # #";
- else if (rec_yearly_month != "" && vars.get("$field.rec_yearly_day2") != "" && vars.get("$field.rec_yearly_number2") != "")
- rec_year = "Am #. # im #";
- }
-
- if (rec_year == "" || (rec_yearly_month == "" && rec_yearly_day == "" ))
- {
- question.showMessage(translate.text("yearly series not specified"));
- }
- else if (rec_year == "Jeden # #")
- {
- month = rec_yearly_month;
- day = rec_yearly_day;
- event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTHDAY="+day+";BYMONTH="+month);
- }
- else if (rec_year == "Am #. # im #")
- {
- month = vars.get("$field.rec_yearly_month2");
- day = vars.get("$field.rec_yearly_day2");
- var number = vars.get("$field.rec_yearly_number2");
- event[calendars.RRULE] = new Array("FREQ=YEARLY;BYMONTH="+month+";BYDAY="+number+day);
- }
-}
-/***********************/
-function rec_monthly(event)
-{
- var rec_month = vars.get("$field.rec_month");
- var rec_monthly_day = vars.get("$field.rec_monthly_day");
- var rec_monthly_interval = vars.get("$field.rec_monthly_interval");
- var day;
- var interval;
-
- if (rec_month == "")
-
- {
- if (rec_monthly_day != "" && rec_monthly_interval != "")
- rec_month = "Am #. jedes #. Monat";
- else if (vars.get("$field.rec_monthly_day2") != "" && vars.get("$field.rec_monthly_interval2") != "" && vars.get("$field.rec_monthly_weekday2") != "")
- rec_month = "Am #. # jeden #. Monat";
- }
-
- if (rec_month == "" || (rec_monthly_day == "" && rec_monthly_interval != ""))
- {
- question.showMessage(translate.text("Ignore series"));
- }
- else if (rec_month == "Am #. jedes #. Monat")
- {
- day = rec_monthly_day;
- interval = rec_monthly_interval;
- event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYMONTHDAY=" + day);
- }
- else if(rec_month == "Am #. # jeden #. Monat")
- {
- day = vars.get("$field.rec_monthly_day2");
- interval = vars.get("$field.rec_monthly_interval2");
- var weekday = vars.get("$field.rec_monthly_weekday2");
- event[calendars.RRULE] = new Array("FREQ=MONTHLY;INTERVAL=" + interval + ";BYDAY=" + day + weekday);
- }
-}
-/***********************/
-function rec_weekly(event)
-{
-
- var rec_weekly_intervall = vars.get("$field.rec_weekly_intervall");
- if (rec_weekly_intervall == "")
- rec_weekly_intervall = "1";
-
- var days = new Array();
- var count = 0;
- if (vars.get("$field.rec_weekly_mo") == "true")
- {
- days[count] = "MO";
- count++;
- }
- if (vars.get("$field.rec_weekly_di") == "true")
- {
- days[count] = "TU";
- count++;
- }
- if (vars.get("$field.rec_weekly_mi") == "true")
- {
- days[count] = "WE";
- count++;
- }
- if (vars.get("$field.rec_weekly_do") == "true")
- {
- days[count] = "TH";
- count++;
- }
- if (vars.get("$field.rec_weekly_fr") == "true")
- {
- days[count] = "FR";
- count++;
- }
- if (vars.get("$field.rec_weekly_sa") == "true")
- {
- days[count] = "SA";
- count++;
- }
- if (vars.get("$field.rec_weekly_so") == "true")
- {
- days[count] = "SU";
- count++;
- }
- if (count > 0)
- {
- event[calendars.RRULE] = new Array("FREQ=WEEKLY;INTERVAL=" + rec_weekly_intervall + ";WKST=MO;BYDAY=");
- for (var i = 0; i < count; i++)
- {
- event[calendars.RRULE][0] += days[i];
- if (i+1 < count)
- {
- event[calendars.RRULE][0] += ",";
- }
- }
- }
-}
-/***********************/
-function rec_daily(event)
-{
- var rec_dailytype = vars.get("$field.rec_dailytype");
- var rec_dailydays = vars.get("$field.rec_daily_days");
- if (rec_dailytype == "")
- {
- if (rec_dailydays != "")
- rec_dailytype = "Alle # Tage";
- }
-
- if (rec_dailytype == "" || rec_dailydays == "")
- {
- question.showMessage(translate.text("Ignore daily series"));
- }
- else if (rec_dailytype == "Alle # Tage")
- {
- event[calendars.RRULE] = new Array("FREQ=DAILY;INTERVAL=" + rec_dailydays);
- }
- else if (rec_dailytype == "Jeden Arbeitstag")
- {
- event[calendars.RRULE][0] = new Array("FREQ=WEEKLY;WKST=MO;BYDAY=MO,TU,WE,TH,FR");
- }
- else
- {
- question.showMessage(translate.text("Internal (2)") + " " + rec_dailytype);
- }
-}
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index fc042d7551a23d9f02845b31dfb68556f81670de..1c859024a974f4d7bf3116280656e74d8eeb3101 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>AttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Attribute</title>
diff --git a/entity/AttributeUsage_entity/AttributeUsage_entity.aod b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
index ce64c4a8f1d368979331b866644ab9c37af5920e..f585a185e5427229444a837f3d15b2e53e9b7dbd 100644
--- a/entity/AttributeUsage_entity/AttributeUsage_entity.aod
+++ b/entity/AttributeUsage_entity/AttributeUsage_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>AttributeUsage_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/AttributeUsage_entity/documentation.adoc</documentation>
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index 8ea004bc50a01695f2cb4e130c793c61aeb8bfb1..40f63107d36acb1924c34229e46566d54d7fa599 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Attribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
diff --git a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
index 046b1dca18f622ac02623b1f82cb419c9d0d5d81..7368edfb0952b1e71b18ab71f9925a8a4e3df075 100644
--- a/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/Attribute_entity/recordcontainers/jdito/onDelete.js
@@ -14,21 +14,21 @@ var attributeId = vars.get("$field.UID");
var childIds = AttributeUtil.getAllChildren(attributeId).concat(attributeId);
condition = SqlCondition.begin()
- .and("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+ .andIn("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", childIds)
.build();
//delete all entries in AB_ATTRIBUTEUSAGE belonging to the attribute to avoid unrelated entries
db.deleteData("AB_ATTRIBUTEUSAGE", condition);
condition = SqlCondition.begin()
- .and("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID in ('" + childIds.join("','") + "')")
+ .andIn("AB_ATTRIBUTERELATION.AB_ATTRIBUTE_ID", childIds)
.build();
//delete all entries in AB_ATTRIBUTERELATION for the attributes
db.deleteData("AB_ATTRIBUTERELATION", condition);
condition = SqlCondition.begin()
- .and("AB_ATTRIBUTE.AB_ATTRIBUTEID in ('" + childIds.join("','") + "')")
+ .andIn("AB_ATTRIBUTE.AB_ATTRIBUTEID", childIds)
.build();
//delete all attribute children
diff --git a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
index ce79087e8176de958d53dee76ce95ec255ea7aae..cad21609437cceb956e8ad82e0eb6a586addac78 100644
--- a/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
+++ b/entity/BulkMailAddRecipients_entity/BulkMailAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>BulkMailAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js b/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js
index d47a0319721d5b49a4e57fcce24ca7009dd1fc34..cce82d39abe4867c83b6b4289e6d5dfe284ace9a 100644
--- a/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/BulkMailAddRecipients_entity/recordcontainers/jdito/onInsert.js
@@ -5,3 +5,4 @@ var contactIds = JSON.parse(vars.getString("$field.recipientContactIds"));
var bulkMailId = vars.get("$field.BULKMAIL_ID");
BulkMailUtils.addRecipients(bulkMailId, contactIds);
+BulkMailUtils.openBulkMail(bulkMailId);
\ No newline at end of file
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 93f4a351857896cfe83ae0ced85b84772f41f86b..cfdc84490dd7b9e30d2622127a94c2b6bb404a0f 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>BulkMailRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Recipient</title>
@@ -174,6 +174,7 @@
<dbRecordFieldMapping>
<name>STATUS.value</name>
<recordfield>BULKMAILRECIPIENT.STATUS</recordfield>
+ <isFilterable v="true" />
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORGANISATION_ID.value</name>
diff --git a/entity/BulkMailRecipient_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js b/entity/BulkMailRecipient_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js
index ed3b8531d70d092278f787ddb54e289b20931b4e..06d12d80f3fab307d4bd3964b3c62928786447a2 100644
--- a/entity/BulkMailRecipient_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js
+++ b/entity/BulkMailRecipient_entity/entityfields/statuskeyword/children/containername_param/valueProcess.js
@@ -1,3 +1,4 @@
+import("KeywordRegistry_basic");
import("system.result");
-result.string("BulkMailSentStatus"); //TODO: keyword registry
\ No newline at end of file
+result.string($KeywordRegistry.bulkMailRecipientStatus());
\ No newline at end of file
diff --git a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
index 0c0b218c5fab7dd9f6e4a0298bce8d70ba0078c8..fbcdd8dd9bd296ecb6d66f763651a557a5420d72 100644
--- a/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
+++ b/entity/BulkMailStatusChart_entity/BulkMailStatusChart_entity.aod
@@ -1,8 +1,11 @@
<?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.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>BulkMailStatusChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Recipient status</title>
+ <siblings>
+ <element>BulkMailRecipient_entity</element>
+ </siblings>
<titlePlural>Recipient status</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..da34a9438ea7faa052ff3b0a29f523d53aef2a46
--- /dev/null
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
@@ -0,0 +1,61 @@
+<?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.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
+ <name>BulkMailTesting_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <siblings>
+ <element>BulkMail_entity</element>
+ </siblings>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityField>
+ <name>TESTING_CONTACT_ID</name>
+ <title>Contact</title>
+ <consumer>Contacts</consumer>
+ <linkedContext>AnyContact</linkedContext>
+ <valueProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testing_contact_id/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testing_contact_id/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>TESTING_EMAIL_ADDRESS</name>
+ <title>Recipient address</title>
+ <valueProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testing_email_address/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>SAVESETTINGS</name>
+ <title>Save settings</title>
+ <contentType>BOOLEAN</contentType>
+ <dropDownProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/savesettings/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityParameter>
+ <name>BulkMailId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>Contacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <onInsert>%aditoprj%/entity/BulkMailTesting_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>UID.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/BulkMailTesting_entity/entityfields/savesettings/dropDownProcess.js b/entity/BulkMailTesting_entity/entityfields/savesettings/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea87f0cb35f482786bbea6794140e8926fca3935
--- /dev/null
+++ b/entity/BulkMailTesting_entity/entityfields/savesettings/dropDownProcess.js
@@ -0,0 +1,7 @@
+import("system.translate");
+import("system.result");
+
+result.object([
+ ["1", translate.text("Yes")],
+ ["0", translate.text("No")],
+]);
\ No newline at end of file
diff --git a/entity/BulkMailTesting_entity/entityfields/testing_contact_id/displayValueProcess.js b/entity/BulkMailTesting_entity/entityfields/testing_contact_id/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3cfd8a80f6d4914aa8636462e5fa8aaa63cb702e
--- /dev/null
+++ b/entity/BulkMailTesting_entity/entityfields/testing_contact_id/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Contact_lib");
+
+result.string(ContactUtils.getTitleByContactId(vars.get("$field.TESTING_CONTACT_ID")));
\ No newline at end of file
diff --git a/entity/BulkMailTesting_entity/entityfields/testing_contact_id/valueProcess.js b/entity/BulkMailTesting_entity/entityfields/testing_contact_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..49dff7de739727af391d894fa9afd4d63d0a5f0c
--- /dev/null
+++ b/entity/BulkMailTesting_entity/entityfields/testing_contact_id/valueProcess.js
@@ -0,0 +1,15 @@
+import("Sql_lib");
+import("system.db");
+import("Employee_lib");
+import("system.vars");
+import("system.result");
+
+var contactId = db.cell(SqlCondition.begin()
+ .andPrepareVars("BULKMAIL.BULKMAILID", "$param.BulkMailId_param")
+ .buildSql("select TESTING_CONTACT_ID from BULKMAIL")
+);
+if (!contactId)
+ contactId = EmployeeUtils.getCurrentContactId();
+
+if (vars.get("$this.value") == null)
+ result.string(contactId);
\ No newline at end of file
diff --git a/entity/BulkMailTesting_entity/entityfields/testing_email_address/valueProcess.js b/entity/BulkMailTesting_entity/entityfields/testing_email_address/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..261b02cb666e2bdeb75a544dd1ad646dece04c1e
--- /dev/null
+++ b/entity/BulkMailTesting_entity/entityfields/testing_email_address/valueProcess.js
@@ -0,0 +1,12 @@
+import("Sql_lib");
+import("system.db");
+import("Employee_lib");
+import("system.vars");
+import("system.result");
+
+var email = db.cell(SqlCondition.begin()
+ .andPrepareVars("BULKMAIL.BULKMAILID", "$param.BulkMailId_param")
+ .buildSql("select TESTING_EMAIL_ADDRESS from BULKMAIL")
+);
+if (vars.get("$this.value") == null)
+ result.string(email);
\ No newline at end of file
diff --git a/entity/BulkMailTesting_entity/recordcontainers/jdito/onInsert.js b/entity/BulkMailTesting_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..a2489e0b7b3772dbf08cb0cf881774f3bc0193c4
--- /dev/null
+++ b/entity/BulkMailTesting_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,16 @@
+import("Sql_lib");
+import("system.db");
+import("Bulkmail_lib");
+import("system.vars");
+
+var testingContact = vars.get("$field.TESTING_CONTACT_ID");
+var testingEmail = vars.get("$field.TESTING_EMAIL_ADDRESS");
+var bulkMailId = vars.get("$param.BulkMailId_param");
+
+BulkMailUtils.sendBulkMailOnServer(bulkMailId, [[testingContact, testingEmail]]);
+
+if (vars.get("$field.SAVESETTINGS") == "1")
+{
+ db.updateData("BULKMAIL", ["TESTING_CONTACT_ID", "TESTING_EMAIL_ADDRESS"], null, [testingContact, testingEmail],
+ SqlCondition.equals("BULKMAIL.BULKMAILID", bulkMailId));
+}
\ No newline at end of file
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 74c3e84fb824e7dc5aed402646e584b712db7510..828cdf95b844d3f22b4bf1fef6d0d8a2d7b2d79a 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>BulkMail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:AT</icon>
@@ -31,6 +31,7 @@
<entityField>
<name>SUBJECT</name>
<title>Subject</title>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/subject/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DESCRIPTION</name>
@@ -88,14 +89,6 @@
<mandatory v="true" />
<onValidation>%aditoprj%/entity/BulkMail_entity/entityfields/sender/onValidation.js</onValidation>
</entityField>
- <entityActionField>
- <name>sendMail</name>
- <title>Send</title>
- <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PAPERPLANE</iconId>
- <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess>
- <tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/tooltipProcess.js</tooltipProcess>
- </entityActionField>
<entityField>
<name>ICON</name>
<contentType>IMAGE</contentType>
@@ -127,13 +120,6 @@
<element>SUBJECT</element>
</fields>
</entityFieldGroup>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityParameter>
<name>PresetRecipients_param</name>
<expose v="true" />
@@ -180,12 +166,49 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityField>
+ <name>TESTING_CONTACT_ID</name>
+ <title>Contact</title>
+ <consumer>Contacts</consumer>
+ <linkedContext>AnyContact</linkedContext>
+ </entityField>
+ <entityField>
+ <name>TESTING_EMAIL_ADDRESS</name>
+ <title>Recipient address</title>
+ </entityField>
+ <entityParameter>
+ <name>SendTestMail_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>Contacts</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>AnyContact_entity</entityName>
+ <fieldName>#PROVIDER</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityActionField>
+ <name>sendMail</name>
+ <title>Send</title>
+ <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PAPERPLANE</iconId>
+ <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess>
+ <tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
<entityActionField>
<name>testMail</name>
<title>Test email</title>
<onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CLIPBOARD_CHECK</iconId>
</entityActionField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -253,6 +276,22 @@
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CREATEACTIVITIES.value</name>
+ <recordfield>BULKMAIL.CREATEACTIVITIES</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TESTING_CONTACT_ID.value</name>
+ <recordfield>BULKMAIL.TESTING_CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TESTING_EMAIL_ADDRESS.value</name>
+ <recordfield>BULKMAIL.TESTING_EMAIL_ADDRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TESTING_CONTACT_ID.displayValue</name>
+ <expression>%aditoprj%/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/testing_contact_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/BulkMail_entity/entityfields/subject/valueProcess.js b/entity/BulkMail_entity/entityfields/subject/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..396141a13a13363ebe15621cd3fe7c0ca2f34ff2
--- /dev/null
+++ b/entity/BulkMail_entity/entityfields/subject/valueProcess.js
@@ -0,0 +1,20 @@
+import("system.result");
+import("Email_lib");
+import("Document_lib");
+import("DocumentTemplate_lib");
+import("system.neon");
+import("system.vars");
+
+if (vars.get("$this.value") == null && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ var upload = vars.get("$field.BINDATA");
+ var template;
+ if (upload)
+ {
+ var binData = DocumentUtil.getBindataFromUpload(upload);
+ var filename = DocumentUtil.getFilenameFromUpload(upload);
+ var type = DocumentUtil.getFileExtensionFromUpload(filename);
+ if (DocumentTemplate.types.fromFileExtension(type) == DocumentTemplate.types.EML)
+ result.string(Email.fromRFC(binData).subject);
+ }
+}
\ No newline at end of file
diff --git a/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js b/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js
index 9dcf990316b9b824b8377fc6f18a362be936f684..e388a53ee6f1dd001a55727837a83cd302bfd1d7 100644
--- a/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js
+++ b/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js
@@ -1,4 +1,17 @@
+import("system.neon");
+import("system.db");
+import("Employee_lib");
import("system.vars");
import("Bulkmail_lib");
-BulkMailUtils.sendBulkMailOnServer(vars.get("$field.BULKMAILID"));
\ No newline at end of file
+var testingContact = vars.get("$field.TESTING_CONTACT_ID");
+var testingEmail = vars.get("$field.TESTING_EMAIL_ADDRESS");
+
+if (testingContact && testingEmail)
+ BulkMailUtils.sendBulkMailOnServer(vars.get("$field.BULKMAILID"), [[testingContact, testingEmail]]);
+else
+ neon.openContext("BulkMailTesting", "BulkMailTesting_view", null, neon.OPERATINGSTATE_NEW, {
+ "BulkMailId_param" : vars.get("$field.BULKMAILID")
+ });
+
+
diff --git a/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/testing_contact_id.displayvalue/expression.js b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/testing_contact_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..11979e350e55cd52f6940d5ded3a206a89448002
--- /dev/null
+++ b/entity/BulkMail_entity/recordcontainers/db/recordfieldmappings/testing_contact_id.displayvalue/expression.js
@@ -0,0 +1,4 @@
+import("Contact_lib");
+import("system.result");
+
+result.string(ContactUtils.getResolvingDisplaySubSql("BULKMAIL.TESTING_CONTACT_ID"));
\ No newline at end of file
diff --git a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
index 0743ddc489a56f8922181282fa9dcead53595555..69a341c52f67c6e70c2af1d1ed1a31937e23cf87 100644
--- a/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
+++ b/entity/CampaignAddParticipants_entity/CampaignAddParticipants_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignAddParticipants_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Add participants to Campaign</title>
diff --git a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
index 2be0da86b96330f7cb84facbde2c9ded75b6e2bb..e590ec8804c0bff64723a9fdfb29fdd968a72b3e 100644
--- a/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
+++ b/entity/CampaignAnalysis_entity/CampaignAnalysis_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignAnalysis_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
diff --git a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
index 2c72ec98478a862290a0817b931a565f52a6a2e9..b4cf94c82b38cf54ec79af1a5af77e86847dea75 100644
--- a/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
+++ b/entity/CampaignCostChart_entity/CampaignCostChart_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignCostChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
diff --git a/entity/CampaignCost_entity/CampaignCost_entity.aod b/entity/CampaignCost_entity/CampaignCost_entity.aod
index 772e72e68bddab6f85c6d76da49789fe1f9fbdde..830b03dd1cc322346e11b8cd85e30550b0556b68 100644
--- a/entity/CampaignCost_entity/CampaignCost_entity.aod
+++ b/entity/CampaignCost_entity/CampaignCost_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignCost_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
diff --git a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
index 4320fef4746a870b5f9f2f14b38803fa0a39511e..757e4b633760c6df973760d30fd9c2da6e19f491 100644
--- a/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
+++ b/entity/CampaignParticipantChart_entity/CampaignParticipantChart_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignParticipantChart_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<siblings>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 71f472999b3fec4e91d5e5d067cc1facd1872730..62f9bbabc73bf2f542a760fe0eda65c59019d8a3 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignParticipant_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Participant</title>
diff --git a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
index fb7b300018359c637ca7739a9c25e48db81586a4..f3a29a7c24402e085c1ce01cdfa5f00abd36664f 100644
--- a/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
+++ b/entity/CampaignPlanning_entity/CampaignPlanning_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignPlanning_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Campaign planning</title>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index fd0f7b4310d0c03f1787759d9f35045a26d0b677..76a4c4cdb8f82ae577c0bce945d3914c644f1427 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CampaignStep_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>NEON:GROUP_APPOINTMENT</icon>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index 177e7d9fbbdac4d15c175fb3ea6a4c0a39380365..1b3a4609cc16c2e524dd3299e527af15c60096b7 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Campaign_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:GROUP</icon>
diff --git a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
index 752f40d13e406aa9d5422c9c1c547c4428318f7e..be89d052752f9821aba3165aa52fd8ad0d417a99 100644
--- a/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
+++ b/entity/ClassificationAdmin_entity/ClassificationAdmin_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ClassificationAdmin_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:LIST_OL</icon>
diff --git a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
index 6901154a99c22389e87606037be6cc96fc7467fc..e7a8808ba546564d7f4565de131191311bc07bcc 100644
--- a/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
+++ b/entity/ClassificationGroupAnalyses_entity/ClassificationGroupAnalyses_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ClassificationGroupAnalyses_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/ClassificationGroupAnalyses_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/ClassificationScore_entity/ClassificationScore_entity.aod b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
index 98cd7ccf99ea0f54ef43280eb4eb287219bb0d4b..cb85bf9e4154e3f55d8cf04c48addf35054e2f17 100644
--- a/entity/ClassificationScore_entity/ClassificationScore_entity.aod
+++ b/entity/ClassificationScore_entity/ClassificationScore_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ClassificationScore_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Possible Value</title>
diff --git a/entity/ClassificationType_entity/ClassificationType_entity.aod b/entity/ClassificationType_entity/ClassificationType_entity.aod
index e74bfa2a0f311fa711fa4fd2b41735e551ae1cea..eff736c9316a2e0e8d4d609fa74ac6d0753639eb 100644
--- a/entity/ClassificationType_entity/ClassificationType_entity.aod
+++ b/entity/ClassificationType_entity/ClassificationType_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ClassificationType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityFields>
diff --git a/entity/Classification_entity/Classification_entity.aod b/entity/Classification_entity/Classification_entity.aod
index aaacd764ed315f775a840ba1d6ade16927d76e6e..70d4f2038f27e04d5188e7629d9eeb5cd639fe3f 100644
--- a/entity/Classification_entity/Classification_entity.aod
+++ b/entity/Classification_entity/Classification_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Classification_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Classification</title>
diff --git a/entity/CommRestriction_Entity/CommRestriction_Entity.aod b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
index a992064e10ac838b1bf976fc3d115f3ed577c33d..ac6b66211199b6399f29d5678b612d5d03d2c14e 100644
--- a/entity/CommRestriction_Entity/CommRestriction_Entity.aod
+++ b/entity/CommRestriction_Entity/CommRestriction_Entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>CommRestriction_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Advertising ban</title>
diff --git a/entity/Communication_entity/Communication_entity.aod b/entity/Communication_entity/Communication_entity.aod
index b282b32ce6d64ca1e0b1a408362dc31226710a28..c9d117fe06fd0f181bd4e136b7e4d2cba56fae64 100644
--- a/entity/Communication_entity/Communication_entity.aod
+++ b/entity/Communication_entity/Communication_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Communication_entity</name>
<description>former Comm</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Communication_entity/recordcontainers/db/conditionProcess.js b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
index d5630c83570b49da80815e0fe47b0a01457d3688..37c61938b1dbac04b6054ddcc63ebb26a8bed8db 100644
--- a/entity/Communication_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Communication_entity/recordcontainers/db/conditionProcess.js
@@ -12,6 +12,6 @@ if (vars.exists("$param.CommMediumIds_param"))
{
var mediumIds = JSON.parse(vars.getString("$param.CommMediumIds_param"));
if(mediumIds.length > 0)
- cond.and("COMMUNICATION.MEDIUM_ID in ('" + mediumIds.join("', '") + "')");
+ cond.andIn("COMMUNICATION.MEDIUM_ID", mediumIds);
}
-result.string(db.translateCondition([cond.toString("1 = 2"), cond.preparedValues]));
\ No newline at end of file
+result.string(db.translateCondition(cond.build("1 = 2")));
\ No newline at end of file
diff --git a/entity/Competition_entity/Competition_entity.aod b/entity/Competition_entity/Competition_entity.aod
index da041d148539f436d8615e237c131ce4539ef817..ff1e4363a8bf6c313c032c77c11ca071ce84fd79 100644
--- a/entity/Competition_entity/Competition_entity.aod
+++ b/entity/Competition_entity/Competition_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Competition_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Competition</title>
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 8dafc56608261fd1a6e25f5bd54db05bb33d2ef7..38b5ede02171c98390b2cee907bcf1a5b5b43dee 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Contact_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
diff --git a/entity/Contact_entity/entityfields/address_id/valueProcess.js b/entity/Contact_entity/entityfields/address_id/valueProcess.js
index 75bc8b76629a25525a31db6b5de14a517a9a403a..a1fd89ea38d52b2df99d15d9a6848c68fb6ecc90 100644
--- a/entity/Contact_entity/entityfields/address_id/valueProcess.js
+++ b/entity/Contact_entity/entityfields/address_id/valueProcess.js
@@ -8,6 +8,9 @@ if (vars.get("$this.value") === null || vars.get("$this.value") === "" || vars.g
.onPersonValueChange(vars.get("$field.ORGANISATION_ID"));
// If a possible standard addrss was found it should get applied to the field.
- if (possibleStandardAddressID !== null)
+ // The secondary condition is specifically for a new "private" person, because
+ // it has placeholder address with the id "0<35 whitespaces>" (whitspaces due
+ // to char36 and uuid format).
+ if (possibleStandardAddressID !== null && possibleStandardAddressID.trim() !== "0")
result.string(possibleStandardAddressID);
-}
\ No newline at end of file
+}
diff --git a/entity/Context_entity/Context_entity.aod b/entity/Context_entity/Context_entity.aod
index 6cad5fcef7de0ba7bca0d0a4f34eb72dacac9a49..95285692f1ee0c680ec64642e56e851d99d2d4fc 100644
--- a/entity/Context_entity/Context_entity.aod
+++ b/entity/Context_entity/Context_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Context_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Context_entity/documentation.adoc</documentation>
diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod
index 368ab12dee80471005b1f0e8338ff39a459b5e97..d8e64f5aacd76dce17ca86d5cafe8414cde1308f 100644
--- a/entity/Contract_entity/Contract_entity.aod
+++ b/entity/Contract_entity/Contract_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Contract_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contract_entity/documentation.adoc</documentation>
diff --git a/entity/Countries_Entity/Countries_Entity.aod b/entity/Countries_Entity/Countries_Entity.aod
index a6102873b61b1c2fc02b4e898db769a91e16ce5c..ac44406fd6e6be1bb9410c10404fbf46a5e82876 100644
--- a/entity/Countries_Entity/Countries_Entity.aod
+++ b/entity/Countries_Entity/Countries_Entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Countries_Entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Countries_Entity/documentation.adoc</documentation>
diff --git a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
index c9ab498676ff9c85fd43413c9000f63c2b168627..63799aa5b51f135558faf9a76e2e1521d47936b5 100644
--- a/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
+++ b/entity/DSGVOInfo_entity/DSGVOInfo_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DSGVOInfo_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<onValidation>%aditoprj%/entity/DSGVOInfo_entity/onValidation.js</onValidation>
diff --git a/entity/DSGVO_entity/DSGVO_entity.aod b/entity/DSGVO_entity/DSGVO_entity.aod
index 4419339c1c80bc55a24c765690d4308ac38ca4a1..0d673ba4b18194ec6f895509d890ab1cf87e32f1 100644
--- a/entity/DSGVO_entity/DSGVO_entity.aod
+++ b/entity/DSGVO_entity/DSGVO_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DSGVO_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:LOCK</icon>
diff --git a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
index 2c1f9b4bd1d9fb8e9e12c3b5139954d4ac51ecdd..93080c0b9269dc99f9f0aad73e6d7fda37bc0df4 100644
--- a/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
+++ b/entity/DefaultAdminView_entity/DefaultAdminView_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DefaultAdminView_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
index 7d7a65a40ee53fe2d680c379a2963abb9f2362dc..a363513e906fc4d0ed343a4e325d5c2b28c8ec71 100644
--- a/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
+++ b/entity/DescriptionTranslation_entity/DescriptionTranslation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DescriptionTranslation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Description</title>
diff --git a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
index cc67c563183634baf1234a9f8a6e6b1be3a5614b..cf36cf798beb709571f6badf82127b08418cf767 100644
--- a/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
+++ b/entity/DocumentTemplateLink_entity/DocumentTemplateLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DocumentTemplateLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Attachment</title>
diff --git a/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js b/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
index 12b4334475dd3a1eb6a42d373d13213d351414a3..1b78adcb2e7eaa40ed24326ae14f942607602bf2 100644
--- a/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
+++ b/entity/DocumentTemplateLink_entity/entityfields/opendocument/onActionProcess.js
@@ -1,8 +1,11 @@
+import("Sql_lib");
import("system.db");
import("system.vars");
import("system.neon");
-var fileInformation = db.array(db.ROW, "select ID, FILENAME from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATE_ID_CHILD") + "'", "_____SYSTEMALIAS");
+var fileInformation = db.array(db.ROW, SqlCondition.begin()
+ .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.DOCUMENTTEMPLATE_ID_CHILD")
+ .buildSql("select ID, FILENAME from ASYS_BINARIES"), "_____SYSTEMALIAS");
var data = db.getBinaryContent(fileInformation[0], "_____SYSTEMALIAS");
neon.download(data, fileInformation[1]);
diff --git a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
index 320ac2a498291bd423ddd29d47f6c138fa6fb8da..3b69d2d67f8871f88a416e7728cc2cc582fa2ebb 100644
--- a/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
+++ b/entity/DocumentTemplateTypeCategory_entity/DocumentTemplateTypeCategory_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DocumentTemplateTypeCategory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/DocumentTemplateTypeCategory_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
index 311e715e9f1f50e8c714506a67f788dde56e21c3..8d4b79be20e1cb9bd76b48e48bf772199977214e 100644
--- a/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
+++ b/entity/DocumentTemplate_entity/DocumentTemplate_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DocumentTemplate_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:FILE_FONT</icon>
diff --git a/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
index df7e9f85d746e33d8a0361796a8a5a0c69d1b62b..7c52687169d59f207a63f94857ffd60137a12fba 100644
--- a/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
+++ b/entity/DocumentTemplate_entity/entityfields/textext/valueProcess.js
@@ -1,3 +1,4 @@
+import("Sql_lib");
import("Document_lib");
import("system.util");
import("system.db");
@@ -11,7 +12,9 @@ if(vars.get("$field.KIND").trim() == "TEX" && vars.get("$field.BINDATA") == "" &
if(fileExtension == "txt")
{
- var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+ var binaryId = db.cell(SqlCondition.begin()
+ .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.DOCUMENTTEMPLATEID")
+ .buildSql("select ID from ASYS_BINARIES"), "_____SYSTEMALIAS");
result.string(util.decodeBase64String(db.getBinaryContent(binaryId, "_____SYSTEMALIAS")));
}
}
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js
index 4c36144ce13ea38637c86f83aa94e3a0d36c3796..8936ad8b3e3fe2373001a1fab17e4833577efcef 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBDelete.js
@@ -1,6 +1,9 @@
+import("Sql_lib");
import("system.vars");
import("system.db");
-var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$field.DOCUMENTTEMPLATEID") + "'", "_____SYSTEMALIAS");
+var binaryId = db.cell(SqlCondition.begin()
+ .andPrepareVars("ASYS_BINARIES.ROW_ID", "$field.DOCUMENTTEMPLATEID")
+ .buildSql("select ID from ASYS_BINARIES"), "_____SYSTEMALIAS");
db.deleteBinary(binaryId, "_____SYSTEMALIAS");
\ No newline at end of file
diff --git a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
index f0b959264e4d376b480cdfd3d3a7f132f74d4a6b..58d13c2ae560227626e58c523453fa9072343102 100644
--- a/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/DocumentTemplate_entity/recordcontainers/db/onDBUpdate.js
@@ -1,3 +1,4 @@
+import("Binary_lib");
import("system.util");
import("system.vars");
import("system.db");
@@ -28,6 +29,12 @@ else if(rowdata["DOCUMENTTEMPLATE.KIND"].trim() == "TEX" && vars.get("$field.tex
if(bindata != "" && filename != "")
{
- var binaryId = db.cell("select ID from ASYS_BINARIES where ROW_ID = '" + vars.get("$local.uid") + "'", SqlUtils.getSystemAlias());
- db.updateBinary(binaryId, "", bindata, filename, "", "", SqlUtils.getSystemAlias());
+ var assignmentTable = "DOCUMENTTEMPLATE";
+ var assignmentName= "DOCUMENT";
+ var rowId = vars.get("$local.uid");
+ var binMeta = db.getBinaryMetadata(assignmentTable, assignmentName, rowId, false, SqlUtils.getSystemAlias(), "MAINDOCUMENT");
+ if (binMeta.length == 0)
+ SingleBinaryUtils.insertMainDocument(assignmentTable, assignmentName, rowId, bindata, filename, null, SqlUtils.getSystemAlias());
+ else
+ db.updateBinary(binMeta[0][db.BINARY_ID], "", bindata, filename, "", "MAINDOCUMENT", SqlUtils.getSystemAlias());
}
\ No newline at end of file
diff --git a/entity/Document_entity/Document_entity.aod b/entity/Document_entity/Document_entity.aod
index 25017d5b811f8442429068c0576530b9f13c87cd..95b5a2f31e1cf5438c32550866aa08d032e042f8 100644
--- a/entity/Document_entity/Document_entity.aod
+++ b/entity/Document_entity/Document_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Document_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Document</title>
diff --git a/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod b/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod
index f692c1451d83338809984e9059a2b93024fd9f67..3bea30df79a0051352390834eec0d096967310dd 100644
--- a/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod
+++ b/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DuplicateScanConditionConfig_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Condition Configuration</title>
diff --git a/entity/DuplicateScan_entity/DuplicateScan_entity.aod b/entity/DuplicateScan_entity/DuplicateScan_entity.aod
index a0f3f3e1d7cb7c084f4c97aff148c67eb23bce74..b54570a4b2d86c8176a9edc79e8c9d10a6f619da 100644
--- a/entity/DuplicateScan_entity/DuplicateScan_entity.aod
+++ b/entity/DuplicateScan_entity/DuplicateScan_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>DuplicateScan_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Duplicatescan</title>
diff --git a/entity/Email_entity/Email_entity.aod b/entity/Email_entity/Email_entity.aod
index 640922cfa53c5ebc96855c499f99aca75a3e5de0..515b74b324531fcc0c48e8bba2c2409c08693f4f 100644
--- a/entity/Email_entity/Email_entity.aod
+++ b/entity/Email_entity/Email_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Email_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/EmployeeRole_entity/EmployeeRole_entity.aod b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
index 6b3c8f87b4b33dd8a633a4e54ee8fc7640083319..15d9a0eaab08122f50224cad06b074069d32b842 100644
--- a/entity/EmployeeRole_entity/EmployeeRole_entity.aod
+++ b/entity/EmployeeRole_entity/EmployeeRole_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>EmployeeRole_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Role</title>
diff --git a/entity/Employee_entity/Employee_entity.aod b/entity/Employee_entity/Employee_entity.aod
index 9394acc2fa771e1ecef3f8521ca2bf57df7e4e10..fa2500aaca97890966d3dc7ff913a04b4f892a96 100644
--- a/entity/Employee_entity/Employee_entity.aod
+++ b/entity/Employee_entity/Employee_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Employee_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Employee</title>
diff --git a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
index 1e6f7e670fc70b7c1fcdd6f78318b624d9c9cf07..0bcb8c5ea63dcf7a9224f05f033ad5b418997eff 100644
--- a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
@@ -10,7 +10,7 @@ if (contactId && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || va
{
var sql = SqlCondition.begin()
.andPrepare("COMMUNICATION.CONTACT_ID", contactId)
- .and("COMMUNICATION.MEDIUM_ID in ('" + CommUtil.getMediumIdsByCategory("EMAIL").join("', '") + "')")
+ .andIn("COMMUNICATION.MEDIUM_ID", CommUtil.getMediumIdsByCategory("EMAIL"))
.buildSql("select ADDR, ADDR from COMMUNICATION");
var addresses = db.table(sql);
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index bf01588b8ea3bb679cce40bc0b73212654758c90..f261ba72391e70de0ffa8503885fca03c7f22c18 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Forecast_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>${FORECAST_ENGLISH}</title>
diff --git a/entity/Gender_keyword/Gender_keyword.aod b/entity/Gender_keyword/Gender_keyword.aod
index 7d8966a537ec825d4139214fc47b7a921bfbb413..21d9c978dd60f2a83c1b282f0012bfae6137cc51 100644
--- a/entity/Gender_keyword/Gender_keyword.aod
+++ b/entity/Gender_keyword/Gender_keyword.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Gender_keyword</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/Gender_keyword/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/IndexSearchEntity/IndexSearchEntity.aod b/entity/IndexSearchEntity/IndexSearchEntity.aod
index 82476fa2aa8390eea0d7ca3bab9efc4e4e24739e..fd3f5f8121a967c17566f01624ad0f1b31b8e0fe 100644
--- a/entity/IndexSearchEntity/IndexSearchEntity.aod
+++ b/entity/IndexSearchEntity/IndexSearchEntity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>IndexSearchEntity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityFields>
diff --git a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
index 770faadea2c766788b2025b061f66e924a272781..4078a79be269559d5cecb18c579432400c64b629 100644
--- a/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
+++ b/entity/KeywordAttributeRelation_entity/KeywordAttributeRelation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>KeywordAttributeRelation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttributeRelation_entity/documentation.adoc</documentation>
diff --git a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
index eb6e94c66218e461dac769d2af975250db6be7c9..51527c153e05af4fd0f766560af876d11a62d49d 100644
--- a/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
+++ b/entity/KeywordAttribute_entity/KeywordAttribute_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>KeywordAttribute_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordAttribute_entity/documentation.adoc</documentation>
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index b746205d4d53678307bd278289e2a1fc1f0ba14d..c407f92b638a4758efc976de7c404503020b29de 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>KeywordEntry_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/KeywordEntry_entity/documentation.adoc</documentation>
diff --git a/entity/Language_entity/Language_entity.aod b/entity/Language_entity/Language_entity.aod
index 37a597e4748aba77fa7aa9e931c897cb53163f57..b9b83b6e231e6c962d6fdc28f601b7f52a442715 100644
--- a/entity/Language_entity/Language_entity.aod
+++ b/entity/Language_entity/Language_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Language_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/Language_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/LetterRecipient_entity/LetterRecipient_entity.aod b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
index eb34d0f56486a42e1d2abafbb9bd1cf5c72bfa4e..53f48de51f57cf56d1723d5b824da4cac5f24b77 100644
--- a/entity/LetterRecipient_entity/LetterRecipient_entity.aod
+++ b/entity/LetterRecipient_entity/LetterRecipient_entity.aod
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>LetterRecipient_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
+ <siblings>
+ <element>Address_entity</element>
+ </siblings>
<titlePlural>Recipients</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
diff --git a/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js b/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js
index 7c74f6cb350f07fa5bd57c5825bda302d6d167a7..2284141675c76efe4d00742da5cc858c9b3b97c9 100644
--- a/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js
+++ b/entity/LetterRecipient_entity/entityfields/icon/colorProcess.js
@@ -2,5 +2,5 @@ import("system.vars");
import("system.result");
import("system.neon");
-if (vars.get("$field.HASCOMMRESTRICTION") == "true")
+if (vars.get("$field.HASCOMMRESTRICTION") == "true" || !vars.get("$field.ADDRESS_ID.displayValue").trim())
result.string(neon.PRIORITY_HIGH_COLOR);
\ No newline at end of file
diff --git a/entity/Letter_entity/Letter_entity.aod b/entity/Letter_entity/Letter_entity.aod
index fb7891dfb581525c7fea729b73238a38d9a0965d..4d953eb6ccf971c21035853c4bc88f635f5f6bd0 100644
--- a/entity/Letter_entity/Letter_entity.aod
+++ b/entity/Letter_entity/Letter_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Letter_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
diff --git a/entity/Letter_entity/recordcontainers/jdito/onInsert.js b/entity/Letter_entity/recordcontainers/jdito/onInsert.js
index 1248954c4ed301dc2822e207a534f449dba7e9b5..98716cf13537f97b52b5c9dd9de70c6e1311af64 100644
--- a/entity/Letter_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/Letter_entity/recordcontainers/jdito/onInsert.js
@@ -8,7 +8,8 @@ import("KeywordRegistry_basic");
var template = DocumentTemplate.loadTemplate(vars.get("$field.DOCUMENT_TEMPLATE"));
var contactId = vars.get("$param.ContactId_param");
var content = template.getReplacedContentByContactId(contactId, true);
-neon.download(content, template.filename);
+if (template.type)
+ neon.download(content, template.filename);
var links = [];
if (contactId)
diff --git a/entity/LogHistory_entity/LogHistory_entity.aod b/entity/LogHistory_entity/LogHistory_entity.aod
index 55a1bf21490d283ff2ddebfaab00ccea39dd60ae..c12c22eeca9d5f4ca428e09334f31568f4778b51 100644
--- a/entity/LogHistory_entity/LogHistory_entity.aod
+++ b/entity/LogHistory_entity/LogHistory_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>LogHistory_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Log</title>
diff --git a/entity/Member_entity/Member_entity.aod b/entity/Member_entity/Member_entity.aod
index f7afe0f14ff4b8acb92f77457b68eba480663d57..3429f3c4a57310cc7e412134e99437c6bbe8c384 100644
--- a/entity/Member_entity/Member_entity.aod
+++ b/entity/Member_entity/Member_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Member_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>${SALESPROJECT_MEMBER}</title>
diff --git a/entity/Member_entity/entityfields/icon/valueProcess.js b/entity/Member_entity/entityfields/icon/valueProcess.js
index 73958ed988bcd4b2fedafe9a1d903e419af75db0..651348a3412866e0f61382d02cc2ba71b5804236 100644
--- a/entity/Member_entity/entityfields/icon/valueProcess.js
+++ b/entity/Member_entity/entityfields/icon/valueProcess.js
@@ -4,7 +4,7 @@ import("system.neon");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var role = vars.get("$field.ROLE");
+var role = vars.get("$field.MEMBERROLE");
var isIntern = false, icon;
if(role)
diff --git a/entity/Member_entity/entityfields/memberrole/displayValueProcess.js b/entity/Member_entity/entityfields/memberrole/displayValueProcess.js
index bbdef4d21bb53e36e3bc3b9f9757470915f57d4c..9e896b0a5c9122b1d5b6e4e57ee0904b2c2397e9 100644
--- a/entity/Member_entity/entityfields/memberrole/displayValueProcess.js
+++ b/entity/Member_entity/entityfields/memberrole/displayValueProcess.js
@@ -3,4 +3,4 @@ import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-result.string(KeywordUtils.getViewValue($KeywordRegistry.MemberRole(), vars.get("$field.ROLE")));
+result.string(KeywordUtils.getViewValue($KeywordRegistry.MemberRole(), vars.get("$field.MEMBERROLE")));
diff --git a/entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js b/entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js
index a86d4135fdf038b0bdc2ca73bb8fbabcfe7dc9f2..4d35e5b7c1bd955fa24f58328c90e9a63e72a929 100644
--- a/entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js
+++ b/entity/Member_entity/recordcontainers/db/recordfieldmappings/memberrole.displayvalue/expression.js
@@ -2,5 +2,5 @@ import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.MemberRole(), "OBJECTMEMBER.ROLE");
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.MemberRole(), "OBJECTMEMBER.MEMBERROLE");
result.string(sql);
\ No newline at end of file
diff --git a/entity/ModuleTree_entity/ModuleTree_entity.aod b/entity/ModuleTree_entity/ModuleTree_entity.aod
index 5c2a5a382a890cbe4c84a57d33eb4f2c6f5bba1f..c30b413d21e550d71f8b224a5fd404c9ffe22195 100644
--- a/entity/ModuleTree_entity/ModuleTree_entity.aod
+++ b/entity/ModuleTree_entity/ModuleTree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ModuleTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>History</title>
diff --git a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
index 5f23c2b53932ccdcd2ef263d4a073dd0af681ec2..730e0e483ab0e04421d6fdecc95c8cf5a7e74080 100644
--- a/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ModuleTree_entity/recordcontainers/jdito/contentProcess.js
@@ -99,7 +99,9 @@ function queryChildrenElements (pContextName, pID) {
function queryRootElement (pContextName, pID, pGetFirst) {
var resultArray;
if (pContextName === "Task") {
- resultArray = db.array(db.ROW, "select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK where TASKID = '" + pID + "'");
+ resultArray = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("TASK.TASKID", pID)
+ .buildSql("select TASKID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TASK"));
if (resultArray.length === 0) {
return null;
}
@@ -112,7 +114,9 @@ function queryRootElement (pContextName, pID, pGetFirst) {
}
return augmentData(resultArray, "Task");
} else if (pContextName === "Activity") {
- resultArray = db.array(db.ROW, "select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY where ACTIVITYID = '" + pID +"'");
+ resultArray = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("ACTIVITY.ACTIVITYID", pID)
+ .buildSql("select ACTIVITYID, PARENT_ID, PARENT_CONTEXT, SUBJECT, INFO from ACTIVITY"));
if (resultArray.length === 0) {
return null;
}
@@ -126,7 +130,9 @@ function queryRootElement (pContextName, pID, pGetFirst) {
return augmentData(resultArray, "Activity");
}
else if (pContextName === "SupportTicket") {
- resultArray = db.array(db.ROW, "select TICKETID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TICKET left join TASK on TASK_ID = TASKID where TICKETID = '" + pID +"'");
+ resultArray = db.array(db.ROW, SqlCondition.begin()
+ .andPrepare("TICKET.TICKETID", pID)
+ .buildSql("select TICKETID, PARENT_ID, PARENT_CONTEXT, SUBJECT, DESCRIPTION from TICKET left join TASK on TASK_ID = TASKID"));
if (resultArray.length === 0) {
return null;
}
diff --git a/entity/Notification_entity/Notification_entity.aod b/entity/Notification_entity/Notification_entity.aod
index 91310f5bfb2d4efdb18fffd9402fbb1fd205e6d9..264b358cf3d2917a84c2a719ec718a2bc9d96204 100644
--- a/entity/Notification_entity/Notification_entity.aod
+++ b/entity/Notification_entity/Notification_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Notification_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Notifications</title>
diff --git a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
index 696d07ca489a8b84343a3999459a9fe43303362d..d3cc2bdd8ba7382f32c82e32f42705152c1e210b 100644
--- a/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
+++ b/entity/ObjectRelationType_entity/ObjectRelationType_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ObjectRelationType_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:SPLIT</icon>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 8ede388f92d042fdbffb06da322ad74d1e96cae6..259bd6141a2a047250f710b49d550d13b326f1fc 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>ObjectTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Object relation</title>
diff --git a/entity/Object_entity/Object_entity.aod b/entity/Object_entity/Object_entity.aod
index 7396acca1bd8a2cb4aeba6e3f323099138ef009a..2677926bfe6d320f5c878827d407bd87ac713563 100644
--- a/entity/Object_entity/Object_entity.aod
+++ b/entity/Object_entity/Object_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Object_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Object_entity/documentation.adoc</documentation>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 73a50c1716e7238b74b0981d0dd0186b76ec47ae..62a2d841e53c3413d52cd3afba223d9f24a7b70f 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Offer_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offer_entity/documentation.adoc</documentation>
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 925128cee578dd779edb74e8821a819df5102a3d..6739e1f48f06139913d430a3b9d7dd267d1a9b31 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Offeritem_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Offeritem_entity/documentation.adoc</documentation>
diff --git a/entity/Options_Entity/Options_Entity.aod b/entity/Options_Entity/Options_Entity.aod
index a719bbd02b149f65170c5d87ada4780e91a2a114..2498e4e74d10038dca8ab77f82d60cbd172b203a 100644
--- a/entity/Options_Entity/Options_Entity.aod
+++ b/entity/Options_Entity/Options_Entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Options_Entity</name>
<description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index ce0237dfa566bd4288478beee6d0c628293e8760..37243fe0fc679f208fe3ce2d5c23b8e8d7193fdb 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Order_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Order_entity/documentation.adoc</documentation>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index 354e344e87d406a9363dad14c406698e1e213c46..19aaa8070ded774c542d456da89d3c97af5d5b93 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Orderitem_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Orderitem_entity/documentation.adoc</documentation>
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 9ef1193c6003969ad128dff7831b03d6c0033d38..57236fe7a5073a4254134c34ffaf37dd373baa4e 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Organisation_entity</name>
<description>former Org</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Organisation_entity/entityfields/attributes/onValidation.js b/entity/Organisation_entity/entityfields/attributes/onValidation.js
index 508c2b5e9491f486c6c9ceb574b1b951dd5acc62..7fd206a2b41c15ada50e1cee5d0468e6e8f4607f 100644
--- a/entity/Organisation_entity/entityfields/attributes/onValidation.js
+++ b/entity/Organisation_entity/entityfields/attributes/onValidation.js
@@ -3,4 +3,4 @@ import("system.vars");
import("Attribute_lib");
import("system.result");
-result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
diff --git a/entity/PermissionAction_entity/PermissionAction_entity.aod b/entity/PermissionAction_entity/PermissionAction_entity.aod
index cd867971b4e9eb6bf463622825c4af3c58ac8cac..96c5c67d0f9d96a2cc7b678df60e606df25c4d56 100644
--- a/entity/PermissionAction_entity/PermissionAction_entity.aod
+++ b/entity/PermissionAction_entity/PermissionAction_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>PermissionAction_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Action</title>
diff --git a/entity/PermissionDetail_entity/PermissionDetail_entity.aod b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
index bcacf9e74ba1b543ba42c577e3d76d5e7cf475e4..62d48dbd8e368f71c1fa3bda319bb1ff5731a460 100644
--- a/entity/PermissionDetail_entity/PermissionDetail_entity.aod
+++ b/entity/PermissionDetail_entity/PermissionDetail_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>PermissionDetail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Permission Detail</title>
diff --git a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
index f6a5ecd4edcc9eec0b40f41d8eade0d82155e310..30d3eb0280aa68d88e5767095c7682c7dc95ac8f 100644
--- a/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
+++ b/entity/PermissionMetaData_entity/PermissionMetaData_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>PermissionMetaData_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:CONNECT</icon>
diff --git a/entity/PermissionOverview_entity/PermissionOverview_entity.aod b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
index edef5ff7c42e82adb9415c8dd3cc176290cd5d24..5d8ddb516a6ce6b1f10540a884f38c968b54f87d 100644
--- a/entity/PermissionOverview_entity/PermissionOverview_entity.aod
+++ b/entity/PermissionOverview_entity/PermissionOverview_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>PermissionOverview_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Permission Overview</title>
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index f637a79ed63fca53f5efd66008441ef0beca7bf2..173c4ae05abc00a61d9958578128942a1e0b80f0 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Person_entity</name>
<description>former Pers</description>
<majorModelMode>DISTRIBUTED</majorModelMode>
diff --git a/entity/Person_entity/entityfields/attributes/onValidation.js b/entity/Person_entity/entityfields/attributes/onValidation.js
index 508c2b5e9491f486c6c9ceb574b1b951dd5acc62..7fd206a2b41c15ada50e1cee5d0468e6e8f4607f 100644
--- a/entity/Person_entity/entityfields/attributes/onValidation.js
+++ b/entity/Person_entity/entityfields/attributes/onValidation.js
@@ -3,4 +3,4 @@ import("system.vars");
import("Attribute_lib");
import("system.result");
-result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$sys.uid"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
+result.string(AttributeRelationUtils.validateAttributeCount(vars.get("$field.CONTACTID"), ContextUtils.getCurrentContextId(), "Attributes"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
index 81d6fafaa074b4e9a0a599fa3ee245d63f9bd42b..76c0ea1a0d6fa4b8dadbd4eca545c544935d477b 100644
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
+++ b/entity/Person_entity/entityfields/campaignactiongroup/children/addtobulkmailfromtable/tooltipProcess.js
@@ -1,4 +1,4 @@
import("system.translate");
import("system.result");
-result.string(translate.text("Adds the selection to a bulk mail"));
\ No newline at end of file
+result.string(translate.text("Add the selection to a bulk mail"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js b/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js
index a8ad9436e617cbbbf896c21479e267e5c16374d3..d00822c123e56419934a9e98a623e3863e7a83ed 100644
--- a/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js
+++ b/entity/Person_entity/entityfields/campaignactiongroup/children/addtoserialletter/tooltipProcess.js
@@ -1,4 +1,4 @@
import("system.translate");
import("system.result");
-result.string(translate.text("Adds the selection to a serial letter"));
\ No newline at end of file
+result.string(translate.text("Add the selection to a serial letter"));
\ No newline at end of file
diff --git a/entity/Prod2prod_entity/Prod2prod_entity.aod b/entity/Prod2prod_entity/Prod2prod_entity.aod
index b4721e7460ed28ff920e35a593a533563dcd6132..f580faaec9590c336e26a55b0c7f43129405b0d7 100644
--- a/entity/Prod2prod_entity/Prod2prod_entity.aod
+++ b/entity/Prod2prod_entity/Prod2prod_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Prod2prod_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Prod2prod_entity/documentation.adoc</documentation>
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index 8663ddc8633f81f4255b72ef120582c298564b59..75d32f10f632ee2e1e66618a76b20692e3bfcae6 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Product_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Product_entity/documentation.adoc</documentation>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 7830dbbf61a1d6316c3a4c744319ecf9e1f464e8..f1f3f109b920bef5c6d2ffe7b6197ee526609eeb 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Productprice_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Productprice_entity/documentation.adoc</documentation>
diff --git a/entity/Role_entity/Role_entity.aod b/entity/Role_entity/Role_entity.aod
index ed56ab6ba0c92c040be4f3fe36ddfc98e809917c..5d325465a52a0162d7948d28a58544fd2d1b9680 100644
--- a/entity/Role_entity/Role_entity.aod
+++ b/entity/Role_entity/Role_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Role_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:USER_CHECK</icon>
diff --git a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
index de71fce8c427575dabbdda4e07f76acdd048e69d..4b857c463d4b9a395f38fcafc633b2a717565cc6 100644
--- a/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
+++ b/entity/SalesprojectAnalyses_entity/SalesprojectAnalyses_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SalesprojectAnalyses_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/SalesprojectAnalyses_entity/documentation.adoc</documentation>
diff --git a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
index a199a94e1aac80bc54934eb80c2170c8cf9f7e1c..bafb1559f232afd27db8a500277221514961ae26 100644
--- a/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
+++ b/entity/SalesprojectMilestone_entity/SalesprojectMilestone_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SalesprojectMilestone_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title></title>
diff --git a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
index 7de985a6e96776cfd5660484191b4a18fff5c9df..be7968a149ceeea00c2c0bfd9a802cfa3c886372 100644
--- a/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
+++ b/entity/SalesprojectPhase_entity/SalesprojectPhase_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SalesprojectPhase_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Phase</title>
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index e83c243807ab2a04c12555156ba2e28590c7b66f..6df54dec07218ba41a79471d288814b7d7ce7b26 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SalesprojectSource_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Touchpoint</title>
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index 97b2881d77d50de2f3351fe6daa089d74854787d..37e1e92c7abadc9b01876129f1de17e5eb60bb20 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Salesproject_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Salesproject</title>
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
index 4a0367cc1198637e5bf08871420eafd770b522b1..44840af9ffe6b8e78b8b308c8aadb8e33a4e5cb4 100644
--- a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SalutationDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/SalutationDistinct_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
index 557acbeeb0e6b722006b555b91f3742603e396f2..c1d96647d6ed7c3998449b259b26acbade11d648 100644
--- a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SalutationTitleDistinct_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<contentTitleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/contentTitleProcess.js</contentTitleProcess>
diff --git a/entity/Salutation_entity/Salutation_entity.aod b/entity/Salutation_entity/Salutation_entity.aod
index fffe4cdcf468dce4a2ee996a60fdec97a5dd9bdb..bfc64038579eb494311e3d0f4490e96a6b15d11f 100644
--- a/entity/Salutation_entity/Salutation_entity.aod
+++ b/entity/Salutation_entity/Salutation_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Salutation_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Salutation</title>
diff --git a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
index 99394b27762e744c7e711d6d83417e4666087742..66768fb7f3e15a14ba0ddc984d193e7e7b88c4f7 100644
--- a/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
+++ b/entity/SerialLetterAddRecipients_entity/SerialLetterAddRecipients_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SerialLetterAddRecipients_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>jdito</recordContainer>
@@ -11,6 +11,7 @@
<name>SERIALLETTER_ID</name>
<title>Serial letter</title>
<consumer>SerialLetters</consumer>
+ <mandatory v="true" />
</entityField>
<entityField>
<name>UID</name>
diff --git a/entity/SerialLetterAddRecipients_entity/recordcontainers/jdito/onInsert.js b/entity/SerialLetterAddRecipients_entity/recordcontainers/jdito/onInsert.js
index 3afb7c68f28e9a1ca239132f704d76ceece13f40..e5d6b8596f1c2451faed96bf983c0993a864faee 100644
--- a/entity/SerialLetterAddRecipients_entity/recordcontainers/jdito/onInsert.js
+++ b/entity/SerialLetterAddRecipients_entity/recordcontainers/jdito/onInsert.js
@@ -5,3 +5,4 @@ var contactIds = JSON.parse(vars.getString("$field.recipientContactIds"));
var letterId = vars.get("$field.SERIALLETTER_ID");
SerialLetterUtils.addRecipients(letterId, contactIds);
+SerialLetterUtils.openSerialLetter(letterId);
\ No newline at end of file
diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod
index e495082159a746f52d5a5b64d8cb5bf661ecf009..0e103f8692b96d8d00d7a706dde5c88de13d2937 100644
--- a/entity/SerialLetter_entity/SerialLetter_entity.aod
+++ b/entity/SerialLetter_entity/SerialLetter_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SerialLetter_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<icon>VAADIN:ENVELOPES</icon>
@@ -93,6 +93,10 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
+ <entityField>
+ <name>BINDATA</name>
+ <contentType>FILE</contentType>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Social_entity/Social_entity.aod b/entity/Social_entity/Social_entity.aod
index f43935bbe23895b63a97c6ba08da80dbe4a3770f..2c398b28fd6016e1cc2f2e5b7c0483d055c74588 100644
--- a/entity/Social_entity/Social_entity.aod
+++ b/entity/Social_entity/Social_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Social_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Social Media</title>
diff --git a/entity/Stock_entity/Stock_entity.aod b/entity/Stock_entity/Stock_entity.aod
index e9adced8c4cd20feeea31a1e9ce1e9c2dde8120b..3445689a6fc6fe1001727198ca5abc420cd7ffc4 100644
--- a/entity/Stock_entity/Stock_entity.aod
+++ b/entity/Stock_entity/Stock_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Stock_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Stock_entity/documentation.adoc</documentation>
diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod
index 1142784be4e0b3fe8d5ed81f991d0cc072722b04..55bb20dcf129a71f68038c8d61c240ebd87828f4 100644
--- a/entity/SupportTicket_entity/SupportTicket_entity.aod
+++ b/entity/SupportTicket_entity/SupportTicket_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>SupportTicket_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Support Ticket</title>
diff --git a/entity/TaskLink_entity/TaskLink_entity.aod b/entity/TaskLink_entity/TaskLink_entity.aod
index b8ffe707c0f328b863e7c12b5de3aa7ae9cc3500..7eaef2f0d25a43c6306dc369095485d36221ada2 100644
--- a/entity/TaskLink_entity/TaskLink_entity.aod
+++ b/entity/TaskLink_entity/TaskLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>TaskLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Connection</title>
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 34f0c91d29cf11a24bfc8732f96032996dc5b7d9..e86a9791de5f7858bcf746cf246ee58dd36db2c1 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Task_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Task_entity/documentation.adoc</documentation>
diff --git a/entity/Timetracking_entity/Timetracking_entity.aod b/entity/Timetracking_entity/Timetracking_entity.aod
index 28c5be869ea146b444e8799b18bf884f5ed67a9c..f2aee77b56396053d2d2eed051f4b9464ee3fe89 100644
--- a/entity/Timetracking_entity/Timetracking_entity.aod
+++ b/entity/Timetracking_entity/Timetracking_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Timetracking_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Timetracking</title>
diff --git a/entity/TurnoverTree_entity/TurnoverTree_entity.aod b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
index be75aa5929ede06dd4830a0888f10324ae11edc3..a7a5c0bbd16f8741b812b8b823cd25e5115bc543 100644
--- a/entity/TurnoverTree_entity/TurnoverTree_entity.aod
+++ b/entity/TurnoverTree_entity/TurnoverTree_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>TurnoverTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Tree</title>
diff --git a/entity/Turnover_entity/Turnover_entity.aod b/entity/Turnover_entity/Turnover_entity.aod
index 8de2741a74609f8d6b65c45f0e73462abb617985..5917a75329edd0c5b6b362855b5ecc01f57b20de 100644
--- a/entity/Turnover_entity/Turnover_entity.aod
+++ b/entity/Turnover_entity/Turnover_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>Turnover_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Turnover_entity/documentation.adoc</documentation>
diff --git a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
index b79180764c8f99b374055eb72fac2a817bf2b50b..fad730eb5633e1628ea7c992a6784b77f5ff1fc1 100644
--- a/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
+++ b/entity/UniversalFileProcessor_entity/UniversalFileProcessor_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>UniversalFileProcessor_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<entityFields>
diff --git a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
index e45cc75f203c1db73629918656c668970112d6cc..e749b7a469ea1c59b1eb16dd07699dcbd560acaf 100644
--- a/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
+++ b/entity/UnlinkedMailMappingLink_entity/UnlinkedMailMappingLink_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>UnlinkedMailMappingLink_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>${UNLINKEDMAILMAPPING_ADDITIONAL_LINK}</title>
diff --git a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
index 2a5c16c01b0d4a3d75a47c87fc84faae6fb16105..d2162015a96e47ffa3f5f2f12430233ee1a4d881 100644
--- a/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
+++ b/entity/UnlinkedMailMappingWrapper_entity/UnlinkedMailMappingWrapper_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>UnlinkedMailMappingWrapper_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Link unlinked e-mail</title>
diff --git a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
index 7c228edfc1435f9156c678f264de362ff1ae2d2b..b302dcc9e402e4a3aee51f032a65db4ae2ecc5dd 100644
--- a/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
+++ b/entity/UnlinkedMail_entity/UnlinkedMail_entity.aod
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.10" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.10">
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
<name>UnlinkedMail_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Unlinked e-mail</title>
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index d7607e213cb1e5b9446199d4c1edcf9d417abc67..1efcf5392ad2540a48a4fa92588dd91d135b8ec7 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -5025,6 +5025,27 @@
<entry>
<key>Due</key>
</entry>
+ <entry>
+ <key>Create activities</key>
+ </entry>
+ <entry>
+ <key>Testing contact</key>
+ </entry>
+ <entry>
+ <key>Recipient address</key>
+ </entry>
+ <entry>
+ <key>Testing</key>
+ </entry>
+ <entry>
+ <key>Save settings</key>
+ </entry>
+ <entry>
+ <key>Test email</key>
+ </entry>
+ <entry>
+ <key>Recipient status</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 0aeb0b7a1372ab452568a60e5c5ad1fa409e6c93..26fe539ab9a1e570435dca64c7c27d1b8ec5bef0 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -10,14 +10,30 @@
<key>DSGVO Information</key>
<value>DSGVO Informationen</value>
</entry>
+ <entry>
+ <key>Recipient address</key>
+ <value>Empfängeradresse</value>
+ </entry>
<entry>
<key>Data Privacy</key>
<value>Datenschutz</value>
</entry>
+ <entry>
+ <key>No letters</key>
+ <value>Keine Briefe</value>
+ </entry>
+ <entry>
+ <key>No SMS</key>
+ <value>Keine SMS</value>
+ </entry>
<entry>
<key>Add the selection to a bulk mail</key>
<value>Fügt die Auswahl einer Serienmail hinzu</value>
</entry>
+ <entry>
+ <key>Testing</key>
+ <value>Testen</value>
+ </entry>
<entry>
<key>Number of activities</key>
<value>Anzahl Aktivitäten</value>
@@ -34,6 +50,10 @@
<key>No data has been anonymized.</key>
<value>Keine Daten wurden anonymisiert.</value>
</entry>
+ <entry>
+ <key>No fax</key>
+ <value>Kein Fax</value>
+ </entry>
<entry>
<key>Excreted can't be in the future</key>
<value>Ausgeschieden darf nicht in der Zukunft liegen</value>
@@ -58,14 +78,26 @@
<key>MAX</key>
<value>maximal</value>
</entry>
+ <entry>
+ <key>No mails</key>
+ <value>Keine E-Mails</value>
+ </entry>
<entry>
<key>Create activities</key>
<value>Aktivitäten erstellen</value>
</entry>
+ <entry>
+ <key>No calls</key>
+ <value>Keine Anrufe</value>
+ </entry>
<entry>
<key>NONE</key>
<value>keine</value>
</entry>
+ <entry>
+ <key>Recipient status</key>
+ <value>Empfängerstatus</value>
+ </entry>
<entry>
<key>LOW</key>
<value>gering</value>
@@ -4793,6 +4825,10 @@
<key>${HIGHER_THAN_MAX} max: %0</key>
<value>Der eingegebene Wert ist über dem Maximalwert %0.</value>
</entry>
+ <entry>
+ <key>Test email</key>
+ <value>E-Mail testen</value>
+ </entry>
<entry>
<key>Rating</key>
<value>Bewertung</value>
@@ -4917,7 +4953,7 @@
</entry>
<entry>
<key>Price Condition</key>
- <value>Preis Konditionen</value>
+ <value>Preiskonditionen</value>
</entry>
<entry>
<key>Entität</key>
@@ -5411,10 +5447,18 @@
<key>Treat</key>
<value>Genuss</value>
</entry>
+ <entry>
+ <key>Testing contact</key>
+ <value>Testkontakt</value>
+ </entry>
<entry>
<key>Motor cycle</key>
<value>Motorrad</value>
</entry>
+ <entry>
+ <key>Save settings</key>
+ <value>Einstellung speichern</value>
+ </entry>
<entry>
<key>Revolution speed (rpm)</key>
<value>Drehzahl (rpm)</value>
@@ -6132,6 +6176,7 @@
</entry>
<entry>
<key>Campaign costs</key>
+ <value>Kampagnenkosten</value>
</entry>
<entry>
<key>Shows all campaigns</key>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 6b76019babbf290bf10914dec60b0d002607019e..b18ee22f70c670840c3b02c2d0a57628d03714f4 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -5074,6 +5074,27 @@
<entry>
<key>Due</key>
</entry>
+ <entry>
+ <key>Create activities</key>
+ </entry>
+ <entry>
+ <key>Testing contact</key>
+ </entry>
+ <entry>
+ <key>Recipient address</key>
+ </entry>
+ <entry>
+ <key>Testing</key>
+ </entry>
+ <entry>
+ <key>Save settings</key>
+ </entry>
+ <entry>
+ <key>Test email</key>
+ </entry>
+ <entry>
+ <key>Recipient status</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/BulkMail/BulkMail.aod b/neonContext/BulkMail/BulkMail.aod
index ae4fd6a6791f4b9330470b0107eb1069f9c818f9..b6e2ea9a7a328a517cbb068c11196aec2e4d4826 100644
--- a/neonContext/BulkMail/BulkMail.aod
+++ b/neonContext/BulkMail/BulkMail.aod
@@ -29,5 +29,9 @@
<name>6b057fb0-94ac-4bca-88b2-c97fdfcf9d6e</name>
<view>BulkMailContent_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>fb5bc6ed-d3c9-45ef-a0c7-17b190e3ce74</name>
+ <view>BulkMailMainPreview_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonContext/BulkMailTesting/BulkMailTesting.aod b/neonContext/BulkMailTesting/BulkMailTesting.aod
new file mode 100644
index 0000000000000000000000000000000000000000..bd41c66175b414b5760d29f1ac787d6658501b30
--- /dev/null
+++ b/neonContext/BulkMailTesting/BulkMailTesting.aod
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>BulkMailTesting</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>BulkMailTesting_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>5ed51616-707d-4418-b63a-2e884f903cb3</name>
+ <view>BulkMailTesting_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod b/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..27aab06baf390b03d2bb4a685c0cfe31b604f13a
--- /dev/null
+++ b/neonView/BulkMailMainPreview_view/BulkMailMainPreview_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.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2">
+ <name>BulkMailMainPreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <footer>e8f0200f-3447-4196-8aba-f2966e83689a</footer>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <neonViewReference>
+ <name>2a1f719c-1838-4f30-8fb7-27cd7bbf16ee</name>
+ <entityField>#ENTITY</entityField>
+ <view>BulkMailPreview_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>e8f0200f-3447-4196-8aba-f2966e83689a</name>
+ <entityField>RecipientStatusChart</entityField>
+ <view>BulkMailStatusChart_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index 0f6a248d7ebcb16708fb96898fab4572dfd5fcc3..d5529d583077bcfee3707cf20cca98d2b8928d40 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -5,15 +5,10 @@
<layout>
<masterSlaveLayout>
<name>layout</name>
- <master>9f5528f7-230e-42e5-8831-66bdee9a9588</master>
+ <master>3f7fc7d4-7cda-428c-8acb-364addc5239c</master>
</masterSlaveLayout>
</layout>
<children>
- <neonViewReference>
- <name>9f5528f7-230e-42e5-8831-66bdee9a9588</name>
- <entityField>#ENTITY</entityField>
- <view>BulkMailPreview_view</view>
- </neonViewReference>
<neonViewReference>
<name>8be4ed02-1c54-41d0-9bba-3b785346a550</name>
<entityField>Recipients</entityField>
@@ -29,5 +24,10 @@
<entityField>LogHistories</entityField>
<view>LogHistoryFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>3f7fc7d4-7cda-428c-8acb-364addc5239c</name>
+ <entityField>#ENTITY</entityField>
+ <view>BulkMailMainPreview_view</view>
+ </neonViewReference>
</children>
</neonView>
diff --git a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
index bd3f635140211001485e5f0458d86cf2620525b6..a9bdee7f245a104ebe54b6a5fd5d47fbaa9f6189 100644
--- a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
+++ b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod
@@ -6,7 +6,6 @@
<headerFooterLayout>
<name>layout</name>
<header>Card</header>
- <footer>6def3a7a-c9a0-4f2d-a36f-e53a631d8261</footer>
</headerFooterLayout>
</layout>
<children>
@@ -49,10 +48,21 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>6def3a7a-c9a0-4f2d-a36f-e53a631d8261</name>
- <entityField>RecipientStatusChart</entityField>
- <view>BulkMailStatusChart_view</view>
- </neonViewReference>
+ <genericViewTemplate>
+ <name>Testing</name>
+ <showDrawer v="true" />
+ <drawerCaption>Testing</drawerCaption>
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>ea406803-6189-4de0-aa41-f09f7e1b2336</name>
+ <entityField>TESTING_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>f8963199-c89b-48e5-a92c-8f655c05acab</name>
+ <entityField>TESTING_EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
</children>
</neonView>
diff --git a/neonView/BulkMailTesting_view/BulkMailTesting_view.aod b/neonView/BulkMailTesting_view/BulkMailTesting_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..6fee3e30ccdab6233676b7af3d8242fad0e5f2fa
--- /dev/null
+++ b/neonView/BulkMailTesting_view/BulkMailTesting_view.aod
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2">
+ <name>BulkMailTesting_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <isSmall v="true" />
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>Generic</name>
+ <editMode v="true" />
+ <entityField>#ENTITY</entityField>
+ <fields>
+ <entityFieldLink>
+ <name>d99dbdae-54cf-432c-8aba-ccb220d330b9</name>
+ <entityField>TESTING_CONTACT_ID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>43ce58eb-76c8-4b6d-9aa7-1b63d5415895</name>
+ <entityField>TESTING_EMAIL_ADDRESS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>7d83d5ca-52a9-4770-894d-d91d81e3ca14</name>
+ <entityField>SAVESETTINGS</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/process/Bulkmail_lib/process.js b/process/Bulkmail_lib/process.js
index d143652488115d6ebd2f2bc51e718b0ff6b75721..f7a62e3785104f2c08651246f26d992b91297432 100644
--- a/process/Bulkmail_lib/process.js
+++ b/process/Bulkmail_lib/process.js
@@ -1,3 +1,5 @@
+import("system.translate");
+import("ActivityTask_lib");
import("system.util");
import("Contact_lib");
import("system.datetime");
@@ -22,18 +24,18 @@ function BulkMailUtils () {}
* Executes a process to send bulk mails on the server and creates a notification when finished.
*
* @param {String} pBulkMailId id of the bulk mail
- * @param {Array} [pRecipients=bulkMailRecipients] overwrite the recipients (e.g. for testing)
+ * @param {Array} [pTestRecipients] overwrite the recipients (e.g. for testing)
* @param {String} [pUser=currentUser] User that will get the notification, if null (not undefined!), no notification
* will be created.
*/
-BulkMailUtils.sendBulkMailOnServer = function (pBulkMailId, pRecipients, pUser)
+BulkMailUtils.sendBulkMailOnServer = function (pBulkMailId, pTestRecipients, pUser)
{
if (pUser === undefined)
pUser = EmployeeUtils.getCurrentUserId();
process.execute("sendBulkMail_serverProcess",
{
bulkMailId : pBulkMailId,
- recipients : JSON.stringify(pRecipients),
+ testRecipients : JSON.stringify(pTestRecipients),
user : pUser || ""
}
);
@@ -44,29 +46,39 @@ BulkMailUtils.sendBulkMailOnServer = function (pBulkMailId, pRecipients, pUser)
* can take some time to execute, use BulkMailUtils.sendBulkMailOnServer instead.
*
* @param {String} pBulkMailId id of the bulk mail
- * @param {Array} [pRecipients=bulkMailRecipients] overwrite the recipients (e.g. for testing)
+ * @param {Array} [pTestRecipients] overwrite the recipients (e.g. for testing)
*
* @return {Object} count of sucessful and failed mails
*/
-BulkMailUtils.sendBulkMail = function (pBulkMailId, pRecipients)
+BulkMailUtils.sendBulkMail = function (pBulkMailId, pTestRecipients)
{
- var [templateId, subject, emailSender] = db.array(db.ROW, SqlCondition.begin()
+ var [templateId, subject, emailSender, createActivity, bulkMailName] = db.array(db.ROW, SqlCondition.begin()
.andPrepare("BULKMAIL.BULKMAILID", pBulkMailId)
- .buildSql("select DOCUMENTTEMPLATE_ID, SUBJECT, SENDER from BULKMAIL", "1=2")
+ .buildSql("select DOCUMENTTEMPLATE_ID, SUBJECT, SENDER, CREATEACTIVITIES, NAME from BULKMAIL", "1=2")
);
var template = BulkMailUtils.getBulkMailTemplate(pBulkMailId, templateId);
- var sql = SqlBuilder.begin()
- .select("BULKMAILRECIPIENTID, BULKMAILRECIPIENT.CONTACT_ID, (" + CommUtil.getStandardSubSqlMail() + ")")
- .from("BULKMAILRECIPIENT")
- .join("CONTACT", "BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
- .where(SqlCondition.begin()
- .andPrepare("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
- .andPrepare("BULKMAILRECIPIENT.STATUS", $KeywordRegistry.bulkMailRecipientStatus$sent(), "# != ?")
- .andSqlCondition(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail(), true)))
- .build();
-
- var recipientData = db.table(sql);
+ var recipientData;
+ if (pTestRecipients)
+ {
+ recipientData = pTestRecipients.map(function (row)
+ {
+ return ["", row[0], row[1], "", ""];
+ });
+ }
+ else
+ {
+ recipientData = db.table(SqlBuilder.begin()
+ .select("BULKMAILRECIPIENTID, BULKMAILRECIPIENT.CONTACT_ID, (" + CommUtil.getStandardSubSqlMail() + "), PERSON_ID, ORGANISATION_ID")
+ .from("CONTACT")
+ .join("BULKMAILRECIPIENT", "BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID")
+ .where(SqlCondition.begin()
+ .andPrepare("BULKMAILRECIPIENT.BULKMAIL_ID", pBulkMailId)
+ .andPrepare("BULKMAILRECIPIENT.STATUS", $KeywordRegistry.bulkMailRecipientStatus$sent(), "# != ?")
+ .andSqlCondition(ContactUtils.getCommRestrictionCondition($KeywordRegistry.communicationMediumCampaign$mail(), true)))
+ .build()
+ );
+ }
var contactIds = recipientData.map(function (e) {return e[1];});
var successIds = [];
var failedIds = [];
@@ -76,6 +88,9 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pRecipients)
var subjectTemplate = new DocumentTemplate(subject, DocumentTemplate.types.PLAIN);
var subjects = subjectTemplate.getReplacedContentByContactIds(contactIds);
+ var bulkMailLink = [["BulkMail", pBulkMailId]];
+ var activitySubject = translate.withArguments("Bulk mail \"%0\" sent", [bulkMailName]);
+
for (let i = 0, l = recipientData.length; i < l; i++)
{
let isSuccess = false;
@@ -89,24 +104,38 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pRecipients)
isSuccess = email.send();
}
- if (isSuccess)
- successIds.push(recipientData[i][0]); //set the recipient status to 'sent'
- else
- failedIds.push(recipientData[i][0]); //set the recipient status to 'failed'
+ if (recipientData[i][0]) //set the recipient status to 'sent' or 'failed'
+ {
+ Array.prototype.push.call(isSuccess ? successIds : failedIds, recipientData[i][0]);
+ if (isSuccess && createActivity == "1")
+ {
+ let activityData = {
+ categoryKeywordId : $KeywordRegistry.activityCategory$mail(),
+ directionKeywordId : $KeywordRegistry.activityDirection$outgoing(),
+ subject : activitySubject,
+ content : email.body
+ };
+ let contactLink = [[ContactUtils.getContextByPersOrg(recipientData[i][3], recipientData[i][4]), recipientData[i][1]]];
+ ActivityUtils.insertNewActivity(activityData, bulkMailLink.concat(contactLink));
+ }
+ }
}
- db.updateData("BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$sent(), sentDate],
- SqlCondition.begin()
- .andIn("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", successIds)
- .build("1=2")
- );
- db.updateData("BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$failed(), sentDate],
- SqlCondition.begin()
- .andIn("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", failedIds)
- .build("1=2")
- );
-
- db.updateData("BULKMAIL", ["STATUS"], null, [$KeywordRegistry.bulkMailStatus$sent()],
- SqlCondition.equals("BULKMAIL.BULKMAILID", pBulkMailId, "1=2"));
+ if (successIds.length > 0)
+ db.updateData("BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$sent(), sentDate],
+ SqlCondition.begin()
+ .andIn("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", successIds)
+ .build("1=2")
+ );
+ if (failedIds.length > 0)
+ db.updateData("BULKMAILRECIPIENT", ["STATUS", "SENTDATE"], null, [$KeywordRegistry.bulkMailRecipientStatus$failed(), sentDate],
+ SqlCondition.begin()
+ .andIn("BULKMAILRECIPIENT.BULKMAILRECIPIENTID", failedIds)
+ .build("1=2")
+ );
+
+ if (!pTestRecipients) //if its just a test run, don't set the status to sent
+ db.updateData("BULKMAIL", ["STATUS"], null, [$KeywordRegistry.bulkMailStatus$sent()],
+ SqlCondition.equals("BULKMAIL.BULKMAILID", pBulkMailId, "1=2"));
return {
sucessful : successIds.length,
@@ -114,7 +143,11 @@ BulkMailUtils.sendBulkMail = function (pBulkMailId, pRecipients)
};
}
-
+/**
+ * opens a context to select a bulk mail to add recipients to
+ *
+ * @param {String[]} pContactIds recipients that should be added
+ */
BulkMailUtils.openAddRecipientView = function (pContactIds)
{
var params = {
@@ -187,6 +220,13 @@ BulkMailUtils.getBulkMailTemplate = function (pBulkMailId, pDocumentTemplateId)
return template;
}
+/**
+ * checks if a contact is a recipient of a bulk mail
+ *
+ * @param {String} pBulkMailId bulkmail id
+ * @param {String} pContactId contact id
+ * @return {boolean} true, if the contact is a recipient
+ */
BulkMailUtils.isRecipient = function (pBulkMailId, pContactId)
{
return db.cell(SqlCondition.begin()
@@ -196,6 +236,11 @@ BulkMailUtils.isRecipient = function (pBulkMailId, pContactId)
) != "0";
}
+/**
+ * opens the BulkMail context in new mode
+ *
+ * @param {String[]} [pRecipients] recipients that should be added after creation
+ */
BulkMailUtils.newBulkMail = function (pRecipients)
{
var params = {
@@ -204,6 +249,14 @@ BulkMailUtils.newBulkMail = function (pRecipients)
neon.openContext("BulkMail", "BulkMailEdit_view", null, neon.OPERATINGSTATE_NEW, params);
}
+/**
+ * Filters the given contactIds if they can be added as new recipients.
+ * Checks if a contact is already a recipient or if there is a advertising ban.
+ *
+ * @param {String} pBulkMailId id of the bulk mail the contacts should be added to
+ * @param {String[]} pContactIds contacts to filter
+ * @return {String[]} contacts that can be added as recipients
+ */
BulkMailUtils.filterNewRecipients = function (pBulkMailId, pContactIds)
{
var existsQuery = "not exists(select BULKMAILRECIPIENTID from BULKMAILRECIPIENT where BULKMAILRECIPIENT.CONTACT_ID = CONTACT.CONTACTID and # = ?)";
@@ -216,6 +269,14 @@ BulkMailUtils.filterNewRecipients = function (pBulkMailId, pContactIds)
return db.array(db.COLUMN, query);
}
+/**
+ * opens the given bulk mail
+ */
+BulkMailUtils.openBulkMail = function (pBulkMailId)
+{
+ neon.openContext("BulkMail", "BulkMailMain_view", [pBulkMailId], neon.OPERATINGSTATE_VIEW, null);
+}
+
function SerialLetterUtils () {}
/**
@@ -239,7 +300,11 @@ SerialLetterUtils.addRecipients = function (pSerialLetterId, pContactIds)
db.inserts(inserts);
}
-
+/**
+ * opens a context to select a serial letter to add recipients to
+ *
+ * @param {String[]} pContactIds recipients that should be added
+ */
SerialLetterUtils.openAddRecipientView = function (pContactIds)
{
var params = {
@@ -263,6 +328,13 @@ SerialLetterUtils.buildSerialLetter = function (pSerialLetterId, pRecipientIds)
});
}
+/**
+ * checks if a contact is a recipient of a serial letter
+ *
+ * @param {String} pSerialLetterId serial letter id
+ * @param {String} pContactId contact id
+ * @return {boolean} true, if the contact is a recipient
+ */
SerialLetterUtils.isRecipient = function (pSerialLetterId, pContactId)
{
return db.cell(SqlCondition.begin()
@@ -270,4 +342,9 @@ SerialLetterUtils.isRecipient = function (pSerialLetterId, pContactId)
.andPrepare("LETTERRECIPIENT.SERIALLETTER_ID", pSerialLetterId)
.buildSql("select count(*) from LETTERRECIPIENT") //TODO: is there a way exists could be used?
) != "0";
+}
+
+SerialLetterUtils.openSerialLetter = function (pSerialLetterId)
+{
+ neon.openContext("SerialLetter", "SerialLetterMain_view", [pSerialLetterId], neon.OPERATINGSTATE_VIEW, null);
}
\ No newline at end of file
diff --git a/process/Calendar_lib/process.js b/process/Calendar_lib/process.js
index 5dad254dcf67ad94d1cf11c3a77e0bcadc2288b3..38539e6ee4e3d85bbc6110a9453e60414fbbccfc 100644
--- a/process/Calendar_lib/process.js
+++ b/process/Calendar_lib/process.js
@@ -281,6 +281,7 @@ CalendarUtil.createEntry = function( pType, pSummary, pDescription, pWithLink, p
Entry[calendars.STATUS] = pStatus;
Entry[calendars.CLASSIFICATION] = calendars.CLASSIFICATION_PUBLIC;
Entry[calendars.CATEGORIES] = pCategory;
+ Entry[calendars.TRANSPARENCY] = "OPAQUE";
if( pPriority != undefined )
diff --git a/process/DocumentTemplate_lib/process.js b/process/DocumentTemplate_lib/process.js
index 6327fbf8a15ca61cd53c30328ae2c8004713724a..4434b77bb3e6fbd8198be854e22aa20dc211f42f 100644
--- a/process/DocumentTemplate_lib/process.js
+++ b/process/DocumentTemplate_lib/process.js
@@ -26,6 +26,16 @@ import("Email_lib");
*
* @class
*/
+var DocumentTemplate = (function ()
+{
+
+/**
+ * constructor for DocumentTemplate
+ *
+ * @param {String} pTemplateContent content, as base64 string (except for DocumentTemplate.types.PLAIN, then it's a normal string)
+ * @param {String} pType type of the template, use the DocumentTemplate.types constants here
+ * @param {String} [pFilename] file name of the template
+ */
function DocumentTemplate (pTemplateContent, pType, pFilename)
{
this.content = pTemplateContent;
@@ -33,6 +43,9 @@ function DocumentTemplate (pTemplateContent, pType, pFilename)
this.filename = pFilename;
}
+/**
+ * @return {String} the text of the content
+ */
DocumentTemplate.prototype.toString = function ()
{
if (this.type == DocumentTemplate.types.PLAIN)
@@ -114,37 +127,6 @@ DocumentTemplate.loadTemplate = function (pAssignmentRowId, pAssignmentTable)
return new DocumentTemplate(db.getBinaryContent(binaryId, alias), type, filename);
}
-/**
- * Replace function that works with strings instead of regular expressions
- * so that control characters (for example '{', '}') don't have to be escaped.
- *
- * @private
- */
-DocumentTemplate._replaceText = function (pText, pReplacements)
-{
- for (let placeholder in pReplacements)
- pText = pText.replace(placeholder, pReplacements[placeholder], "ig");
- return pText;
-}
-
-/**
- * returns the 'simpleName' of all placeholders that are used in the template
- *
- * @private
- */
-DocumentTemplate.prototype._getRequiredPlaceholders = function ()
-{
- var allPlaceholders = PlaceholderUtils.getPlaceholders();
- var plainText = this.toString();
- var usedPlaceholders = [];
- for (let i = 0, l = allPlaceholders.length; i < l; i++)
- {
- if (plainText.indexOf(allPlaceholders[i]) !== -1)
- usedPlaceholders.push(allPlaceholders[i]);
- }
- return usedPlaceholders;
-}
-
/**
* Returns the template content with replaced placeholders by choosing the right
* replace function for the type.
@@ -164,21 +146,21 @@ DocumentTemplate.prototype.getReplacedContent = function (pReplacements, pEncode
pReplacements[i] = text.text2html(pReplacements[i], false);
case DocumentTemplate.types.TXT:
let decodedContent = util.decodeBase64String(this.content);
- let encodedContent = DocumentTemplate._replaceText(decodedContent, pReplacements);
+ let encodedContent = TemplateHelper._replaceText(decodedContent, pReplacements);
if (pEncoded)
encodedContent = util.encodeBase64String(encodedContent);
return encodedContent;
case DocumentTemplate.types.EML:
- let content = this._getReplacedEML(pReplacements);
+ let content = TemplateHelper._getReplacedEML(this, pReplacements);
if (pEncoded)
content = util.encodeBase64String(content);
return content;
case DocumentTemplate.types.ODT:
- return this._getReplacedODT(pReplacements);
+ return TemplateHelper._getReplacedODT(this, pReplacements);
case DocumentTemplate.types.DOCX:
- return this._getReplacedDOCX(pReplacements);
+ return TemplateHelper._getReplacedDOCX(this, pReplacements);
case DocumentTemplate.types.PLAIN:
- let plainText = DocumentTemplate._replaceText(this.content, pReplacements);
+ let plainText = TemplateHelper._replaceText(this.content, pReplacements);
if (pEncoded)
plainText = util.encodeBase64String(plainText);
return plainText;
@@ -192,7 +174,7 @@ DocumentTemplate.prototype.getReplacedContent = function (pReplacements, pEncode
*/
DocumentTemplate.prototype.getReplacedContentByContactId = function (pContactId, pEncoded)
{
- var replacements = this._getReplacementsByContactIds([pContactId]);
+ var replacements = TemplateHelper._getReplacementsByContactIds(this, [pContactId]);
var content = this.getReplacedContent(replacements[pContactId], pEncoded);
return content;
@@ -208,7 +190,7 @@ DocumentTemplate.prototype.getReplacedContentByContactId = function (pContactId,
*/
DocumentTemplate.prototype.getReplacedContentByContactIds = function (pContactIds, pEncoded)
{
- var replacements = this._getReplacementsByContactIds(pContactIds);
+ var replacements = TemplateHelper._getReplacementsByContactIds(this, pContactIds);
var contents = {};
for (let contactId in replacements)
{
@@ -253,11 +235,11 @@ DocumentTemplate.prototype.getSerialLetterByContactIds = function (pContactIds,
{
if (this.type == DocumentTemplate.types.ODT)
{
- let replacements = this._getReplacementsByContactIds(pContactIds);
+ let replacements = TemplateHelper._getReplacementsByContactIds(this, pContactIds);
let replaceArray = [];
for (let i = 0, l = pContactIds.length; i < l; i++)
replaceArray.push(replacements[pContactIds[i]]);
- return this._getReplacedODT(replaceArray, pTableData);
+ return TemplateHelper._getReplacedODT(this, replaceArray, pTableData);
}
return null;
}
@@ -272,14 +254,14 @@ DocumentTemplate.prototype.getSerialLetterByContactIds = function (pContactIds,
*/
DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds)
{
- var replacements = this._getReplacementsByContactIds(pContactIds);
+ var replacements = TemplateHelper._getReplacementsByContactIds(this, pContactIds);
var emailObj = {};
for (let contactId in replacements)
{
if (this.type == DocumentTemplate.types.EML)
{
//use the special function for EML to also fill subject and sender
- emailObj[contactId] = this._getReplacedEML(replacements[contactId], true);
+ emailObj[contactId] = TemplateHelper._getReplacedEML(this, replacements[contactId], true);
}
else
{
@@ -292,18 +274,52 @@ DocumentTemplate.prototype.getReplacedEmailsByContactIds = function (pContactIds
return emailObj;
}
+/**
+ * Provides functions for the DocumentTemplate object that aren't accessible from outside
+ */
+function TemplateHelper () {}
+/**
+ * Replace function that works with strings instead of regular expressions
+ * so that control characters (for example '{', '}') don't have to be escaped.
+ */
+TemplateHelper._replaceText = function (pText, pReplacements)
+{
+ for (let placeholder in pReplacements)
+ pText = pText.replace(placeholder, pReplacements[placeholder], "ig");
+ return pText;
+}
+
+/**
+ * returns the 'simpleName' of all placeholders that are used in the template
+ *
+ * @private
+ */
+TemplateHelper._getRequiredPlaceholders = function (pTemplate)
+{
+ var allPlaceholders = PlaceholderUtils.getPlaceholders();
+ var plainText = pTemplate.toString();
+ var usedPlaceholders = [];
+ for (let i = 0, l = allPlaceholders.length; i < l; i++)
+ {
+ if (plainText.indexOf(allPlaceholders[i]) !== -1)
+ usedPlaceholders.push(allPlaceholders[i]);
+ }
+ return usedPlaceholders;
+}
+
/**
* Builds an object with the placeholder data for multiple contacts
*
+ * @param {DocumentTemplate} pTemplate document template
* @param {Array} pContactIds contact ids
*
* @return {Object} Object containing the data. The structure is like {contactId : {placeholderName : replacementValue, ...}, ...}
*
* @private
*/
-DocumentTemplate.prototype._getReplacementsByContactIds = function (pContactIds)
+TemplateHelper._getReplacementsByContactIds = function (pTemplate, pContactIds)
{
- var config = this._getRequiredPlaceholders();
+ var config = TemplateHelper._getRequiredPlaceholders(pTemplate);
var contactIdPlaceholder = new Placeholder("contactId", Placeholder.types.SQLPART, "CONTACT.CONTACTID");
config = [contactIdPlaceholder].concat(config);
var addressData = getAddressesData(pContactIds, config, EmployeeUtils.getCurrentContactId()); //TODO: add sender selection
@@ -326,6 +342,7 @@ DocumentTemplate.prototype._getReplacementsByContactIds = function (pContactIds)
/**
* Replaces placeholders for EML
*
+ * @param {DocumentTemplate} pTemplate document template
* @param {Object} pReplacements mapping with replacements for every placeholder
* @param {boolean} [pGetEmail] if true, return an Email object (use this if the sender and subject are required)
*
@@ -333,25 +350,23 @@ DocumentTemplate.prototype._getReplacementsByContactIds = function (pContactIds)
*
* @private
*/
-DocumentTemplate.prototype._getReplacedEML = function (pReplacements, pGetEmail)
+TemplateHelper._getReplacedEML = function (pTemplate, pReplacements, pGetEmail)
{
- var mailData = mail.parseRFC(util.decodeBase64String(this.content));
- var email;
- var body = DocumentTemplate._replaceText(mailData[mail.MAIL_HTMLTEXT], pReplacements);
- if (pGetEmail)
- {
- var sender = DocumentTemplate._replaceText(mailData[mail.MAIL_SENDER], pReplacements);
- var subject = DocumentTemplate._replaceText(mailData[mail.MAIL_SUBJECT], pReplacements);
- email = new Email(null, sender, subject, body);
- }
- else
- email = body;
+ var email = Email.fromRFC(pTemplate.content);
+ email.body = TemplateHelper._replaceText(email.body, pReplacements);
+ if (!pGetEmail)
+ return email.body;
+
+ email.sender = TemplateHelper._replaceText(email.sender, pReplacements);
+ email.subject = TemplateHelper._replaceText(email.subject, pReplacements);
+
return email;
}
/*
* replaces a given Odt-File on the server and returns the replaced base64-file
*
+ * @param {DocumentTemplate} pTemplate document template
* @param {Object} pReplacements map of placeholders and replacements
* @param {Array} pTableData
*
@@ -359,13 +374,13 @@ DocumentTemplate.prototype._getReplacedEML = function (pReplacements, pGetEmail)
*
* @private
*/
-DocumentTemplate.prototype._getReplacedODT = function (pReplacements, pTableData)
+TemplateHelper._getReplacedODT = function (pTemplate, pReplacements, pTableData)
{
//save the file on the server so it can be unzipped via pack.getFromZip
var serverFilePath = vars.get("$sys.servertemp") + "/clientid_" + vars.get("$sys.clientid")
- + "/" + util.getNewUUID() + "/" + this.filename.replace(/\\/g, "/");
+ + "/" + util.getNewUUID() + "/" + pTemplate.filename.replace(/\\/g, "/");
- fileIO.storeData(serverFilePath, this.content, util.DATA_BINARY, false);
+ fileIO.storeData(serverFilePath, pTemplate.content, util.DATA_BINARY, false);
if (!_replaceODTFile(pReplacements, serverFilePath, pTableData))
return null;
@@ -442,7 +457,7 @@ DocumentTemplate.prototype._getReplacedODT = function (pReplacements, pTableData
for (let rowIndex = 0; rowIndex < tableData.length; rowIndex++)
{
let tableRowData = tableData[rowIndex];
- currentBody += DocumentTemplate._replaceText(tableRow, tableRowData);
+ currentBody += TemplateHelper._replaceText(tableRow, tableRowData);
}
currentBody += afterTable;
}
@@ -469,32 +484,42 @@ DocumentTemplate.prototype._getReplacedODT = function (pReplacements, pTableData
/*
* This function is used to replace placeholders via DocXTemplater
*
+ * @param {DocumentTemplate} pTemplate document template
* @param {Object} pReplacements - Must contain an object, which holds the placeholders
*
* @return {String} returns the modified document in a BASE64 coded string
*
* @private
*/
-DocumentTemplate.prototype._getReplacedDOCX = function (pReplacements)
+TemplateHelper._getReplacedDOCX = function (pTemplate, pReplacements)
{
var replacements = {};
for (let placeholder in pReplacements) //removes the prefix and postfix, the process needs it like this
- replacements[placeholder.slice(3, -3)] = pReplacements[placeholder];
+ replacements[placeholder.slice(2, -2)] = pReplacements[placeholder];
//this is executed as a process because of better performance
var documentData = process.execute("getDocxDocument_serverProcess", {
- templateb64: this.content,
+ templateb64: pTemplate.content,
placeholderConfig: JSON.stringify(replacements) //process.execute is only able to handle strings
});
return documentData;
}
+ return DocumentTemplate;
+
+})();
+
/**
* functions for working with letters (mails)
*/
function LetterUtils () {}
+/**
+ * opens a new letter
+ *
+ * @param {String} pContactId id of the contact to fetch the data from
+ */
LetterUtils.openNewLetter = function (pContactId)
{
var params = {
diff --git a/process/Email_lib/process.js b/process/Email_lib/process.js
index bdaf02a758707629a40926757f069a3338674fe9..5bb71a3a699572a3336cd6913155d7c9eb7852b9 100644
--- a/process/Email_lib/process.js
+++ b/process/Email_lib/process.js
@@ -20,7 +20,6 @@ function EmailWritingUtils () {}
* @param {String} pSenderContactId contactId of the sender. the standard mailadress of the contact is used as sender-address
* @param {String} [pTemplateId] if a document-template shall be used, give the templateId here
* @param {String} [pRecipientContactId] contactId of the recipient, required to fill placeholders
- *
* @return {Array} the eml document as array with [filename, base64]
*/
EmailWritingUtils.openMailTemplate = function (pToRecipients, pSenderContactId, pTemplateId, pRecipientContactId)
@@ -59,7 +58,6 @@ EmailWritingUtils.openNewMail = function (pToContactId, pToEmailAddress)
* @param {String} [pBody=null] mail body
* @param {Array} [pCcRecipients=[]] array of recipient cc addresses
* @param {Array} [pBccRecipients=[]] array of recipient bcc addresses
- *
* @class
*/
function Email (pToRecipients, pSender, pSubject, pBody, pCcRecipients, pBccRecipients)
@@ -75,6 +73,22 @@ function Email (pToRecipients, pSender, pSubject, pBody, pCcRecipients, pBccReci
this.bccRecipients = pBccRecipients || [];
}
+/**
+ * makes an Email object from a RFC
+ *
+ * @param {String} pBase64RFC the RFC mail, base64 encoded
+ * @return {Email} a new Email object
+ */
+Email.fromRFC = function (pBase64RFC)
+{
+ var mailData = mail.parseRFC(util.decodeBase64String(pBase64RFC));
+ var body = mailData[mail.MAIL_HTMLTEXT];
+ var sender = mailData[mail.MAIL_SENDER];
+ var subject = mailData[mail.MAIL_SUBJECT];
+
+ return new Email(null, sender, subject, body);
+}
+
/**
* loads a document template into the mail body
*
@@ -173,7 +187,6 @@ Email.prototype.getRFCmail = function ()
//X-Uniform-Type-Identifier: com.apple.mail-draft
//this could be added later if needed
-
var mailObj = mail.getCachedMail(mailId);
return mail.toRFC(mailObj);
}
@@ -188,6 +201,8 @@ Email.prototype.openMail = function ()
/**
* ask for a download of the email
+ *
+ * @return {Array} array of [filename, EML (base64)]
*/
Email.prototype.downloadEML = function ()
{
@@ -198,7 +213,7 @@ Email.prototype.downloadEML = function ()
}
/**
- * returns a eml as (base64 encoded)
+ * @return {String} RFC mail (base64 encoded)
*/
Email.prototype.getEML = function()
{
diff --git a/process/JditoFilter_lib/process.js b/process/JditoFilter_lib/process.js
index f60e36bcc818353eb194b18d40dd624758c7288c..077e6c10ae51501eea5da69c6bf9aff375ad5715 100644
--- a/process/JditoFilter_lib/process.js
+++ b/process/JditoFilter_lib/process.js
@@ -1,10 +1,16 @@
import("Sql_lib");
+//private scope to make only JditoFilterUtils public
+var JditoFilterUtils = (function ()
+{
+
/**
* object for filtering records
*
* @param {Array} pColumns the column names
* @param {Object} pFilter the filter object
+ *
+ * @private
*/
function JditoFilterHelper (pColumns, pFilter)
{
@@ -230,4 +236,7 @@ JditoFilterUtils.getSqlCondition = function (pFilter, pTable, pTableAlias, pColu
return "# is not null";
}
}
-}
\ No newline at end of file
+}
+ return JditoFilterUtils; //return only functions that should be public
+
+})();
\ No newline at end of file
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index d2f616b53c0e5f39acbf4bf17523802821450438..12b84dc591b54f10fd9f8f3326697eb7353b17fa 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -889,8 +889,7 @@ SqlBuilder.prototype.build = function ()
this._where,
this._groupBy,
this._having,
- this._orderBy,
- this._unions
+ this._orderBy
]).concat(this._unions);
for (let i = 0, l = allParts.length; i < l; i++)
diff --git a/process/getDocxDocument_serverProcess/process.js b/process/getDocxDocument_serverProcess/process.js
index 4eca03e20fefab5ae808dbcb36e4dad08c282dbd..04ac1f5a52b5587d02fd137ba89ecf69f210611a 100644
--- a/process/getDocxDocument_serverProcess/process.js
+++ b/process/getDocxDocument_serverProcess/process.js
@@ -1,16 +1,31 @@
-import("system.res");
+import("system.result");
import("system.vars");
import("system.swing");
import("system.fileIO");
import("system.util");
-import("system.result");
/* This is a serverprocess to improve the performance
- * This Process has 13k lines of code since 2 js-libs are included (ress in about 420KB)
+ * This Process has 13k lines of code since 2 js-libs are included (results in about 420KB)
* The maximum size limit for pre-compiling is 64KB. If this process would be a "lib_" it'd cause every process where
* it's imported to be interpreted. As a serverprocess only this sp is interpreted
*/
+ /*
+ Override the definition of the IntegerArrays, because Rhino does not fully support these TypedArrays.
+ The zip- and tempalter- lib check if these TypedArrays are defined and then uses them or an alternative.
+ Therefor make them not existant so that the alternative is used.
+ This should not cause any problems in other situations since this is a serverProcess and not code that is imported somewhere else.
+ */
+Int8Array = undefined;
+Uint8Array = undefined;
+Uint8ClampedArray = undefined;
+Int16Array = undefined;
+Uint16Array = undefined;
+Uint16ClampedArray = undefined;
+Int32Array = undefined;
+Uint32Array = undefined;
+Uint32ClampedArray = undefined;
+
initTemplater();//automatically inits zipjs|no customizing is done in these two libraries
var fileContent;
@@ -680,7 +695,7 @@ Usage:
* @param {Object=} options the options for creating this objects (optional).
*/
function JSZip(data, options) {
- // if this constructor is used without `new`, it adds `new` before itself:
+ // if this constructor is used without `new`, it adds `new` before itself:
if(!(this instanceof JSZip)) return new JSZip(data, options);
// object containing the files :
diff --git a/process/sendBulkMail_serverProcess/process.js b/process/sendBulkMail_serverProcess/process.js
index 89c76bc2898eecb6a7e6772566e775a8e3eed78c..6a68f3deaaa3dc0b3ef04025b4d395920228145f 100644
--- a/process/sendBulkMail_serverProcess/process.js
+++ b/process/sendBulkMail_serverProcess/process.js
@@ -10,10 +10,10 @@ import("system.notification");
var startTime = datetime.date();
var bulkMailId = vars.get("$local.bulkMailId");
var user = vars.get("$local.user");
-var recipients = JSON.parse(vars.get("$local.recipients"));
-var res = BulkMailUtils.sendBulkMail(bulkMailId, recipients);
+var testRecipients = JSON.parse(vars.get("$local.testRecipients"));
+var res = BulkMailUtils.sendBulkMail(bulkMailId, testRecipients);
-if (user)
+if (user && !testRecipients)
{
var mailName = db.cell(SqlCondition.begin()
.andPrepare("BULKMAIL.BULKMAILID", bulkMailId)